Replace dirs with dirs-next

diff --git a/Cargo.lock b/Cargo.lock
index a4ee6d4c0a4c60a3b603857c0fad262b001d01b2..0b2ca779edd253f425538af9a36b9262007e7d48 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -267,21 +267,21 @@ dependencies = [
 
 [[package]]
 name = "dirs"
-version = "2.0.2"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
+checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff"
 dependencies = [
- "cfg-if 0.1.10",
  "dirs-sys",
 ]
 
 [[package]]
-name = "dirs"
-version = "3.0.1"
+name = "dirs-next"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "dirs-sys",
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
 ]
 
 [[package]]
@@ -295,6 +295,17 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "divrem"
 version = "0.1.0"
@@ -1220,7 +1231,7 @@ checksum = "1a5f54deba50e65ee4cf786dbc37e8b3c63bdccccbcf9d3a8a9fd0c1bb7e1984"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
- "dirs 3.0.1",
+ "dirs",
  "fs2",
  "libc",
  "log",
@@ -1264,7 +1275,7 @@ dependencies = [
  "chrono",
  "cpu-time",
  "crossterm",
- "dirs 2.0.2",
+ "dirs-next",
  "divrem",
  "downcast",
  "git-version",

diff --git a/Cargo.toml b/Cargo.toml
index 2b834096a3d07b587c3d189010fd4a7ce84d1eb1..6d10a3ae3be5767b08cc50c3e4aa7d22ae60b1d2 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ num = ["num-rug-adapter", "prolog_parser/num"]
 [dependencies]
 cpu-time = "1.0.0"
 crossterm = "0.16.0"
-dirs = "2.0.2"
+dirs-next = "2.0.0"
 divrem = "0.1.0"
 downcast = "0.10.0"
 git-version = "0.3.4"

diff --git a/src/machine/mod.rs b/src/machine/mod.rs
index 365b201e50f47798795976719162a9508675822f..daaf4e813ae2454b5b816415d33907c98476f073 100644 (file)
--- a/src/machine/mod.rs
+++ b/src/machine/mod.rs
@@ -281,7 +281,7 @@ impl Machine {
     }
 
     fn compile_scryerrc(&mut self) {
-        let mut path = match dirs::home_dir() {
+        let mut path = match dirs_next::home_dir() {
             Some(path) => path,
             None => return,
         };

diff --git a/src/read.rs b/src/read.rs
index f879e511539c8802d03d77e754258787f74ec2fe..5e972a0863b7c6323b664f19dce43d8b371867ed 100644 (file)
--- a/src/read.rs
+++ b/src/read.rs
@@ -47,7 +47,7 @@ pub mod readline {
         #[inline]
         pub fn new(pending_input: String) -> Self {
             let mut rl = Editor::<()>::new();
-            if let Some(mut path) = dirs::home_dir() {
+            if let Some(mut path) = dirs_next::home_dir() {
                 path.push(HISTORY_FILE);
                 if path.exists() {
                     if rl.load_history(&path).is_err() {
@@ -55,7 +55,7 @@ pub mod readline {
                     }
                 }
             }
-            
+
             rl.bind_sequence(KeyEvent::from('\t'), Cmd::Insert(1, "\t".to_string()));
             ReadlineStream { rl, pending_input: Cursor::new(pending_input) }
         }
@@ -95,7 +95,7 @@ pub mod readline {
         }
 
         fn save_history(&mut self) {
-            if let Some(mut path) = dirs::home_dir() {
+            if let Some(mut path) = dirs_next::home_dir() {
                 path.push(HISTORY_FILE);
                 if path.exists() {
                     if self.rl.append_history(&path).is_err() {