Migrate to directories-next

directories is no longer being maintained and the final released version causes a dependency conflict (cfg-if, versus tracing).
quinn-rs · Jun 22, 2020 · 5484d37 · 5484d37
1 parent 541448f
commit 5484d37
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/quinn-h3/Cargo.toml b/quinn-h3/Cargo.toml
@@ -45,7 +45,7 @@ webpki = "0.21"
 anyhow = "1.0.22"
 assert_matches = "1.1"
 bencher = "0.1.5"
-directories = "2.0.1"
+directories-next = "1.0.1"
 proptest = "0.10.0"
 rand = "0.7.0"
 rcgen = "0.8"

diff --git a/quinn-h3/examples/h3_client.rs b/quinn-h3/examples/h3_client.rs
@@ -81,7 +81,7 @@ fn read_cert(ca: &Option<PathBuf>) -> Option<quinn::Certificate> {
         return Some(quinn::Certificate::from_der(&fs::read(&ca_path).ok()?).ok()?);
     }
 
-    let dirs = directories::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
+    let dirs = directories_next::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
     match fs::read(dirs.data_local_dir().join("cert.der")) {
         Ok(cert) => return Some(quinn::Certificate::from_der(&cert).ok()?),
         Err(ref e) if e.kind() == io::ErrorKind::NotFound => {

diff --git a/quinn-h3/examples/h3_server.rs b/quinn-h3/examples/h3_server.rs
@@ -106,7 +106,7 @@ pub fn build_certs(
         let cert_chain = quinn::CertificateChain::from_certs(vec![cert]);
         Ok((cert_chain, key))
     } else {
-        let dirs = directories::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
+        let dirs = directories_next::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
         let path = dirs.data_local_dir();
         let cert_path = path.join("cert.der");
         let key_path = path.join("key.der");

diff --git a/quinn-h3/src/tests/helpers.rs b/quinn-h3/src/tests/helpers.rs
@@ -245,7 +245,7 @@ lazy_static! {
 }
 
 fn build_certs() -> Result<Certs> {
-    let dirs = directories::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
+    let dirs = directories_next::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
     let path = dirs.data_local_dir();
     let cert_path = path.join("cert.der");
     let key_path = path.join("key.der");

diff --git a/quinn/Cargo.toml b/quinn/Cargo.toml
@@ -42,7 +42,7 @@ webpki = { version = "0.21", optional = true }
 anyhow = "1.0.22"
 crc = "1.8.1"
 bencher = "0.1.5"
-directories = "2.0.0"
+directories-next = "1.0.1"
 rand = "0.7"
 rcgen = "0.8"
 structopt = "0.3.0"

diff --git a/quinn/examples/client.rs b/quinn/examples/client.rs
@@ -73,7 +73,7 @@ async fn run(options: Opt) -> Result<()> {
         client_config
             .add_certificate_authority(quinn::Certificate::from_der(&fs::read(&ca_path)?)?)?;
     } else {
-        let dirs = directories::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
+        let dirs = directories_next::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
         match fs::read(dirs.data_local_dir().join("cert.der")) {
             Ok(cert) => {
                 client_config.add_certificate_authority(quinn::Certificate::from_der(&cert)?)?;

diff --git a/quinn/examples/server.rs b/quinn/examples/server.rs
@@ -104,7 +104,7 @@ async fn run(options: Opt) -> Result<()> {
         };
         server_config.certificate(cert_chain, key)?;
     } else {
-        let dirs = directories::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
+        let dirs = directories_next::ProjectDirs::from("org", "quinn", "quinn-examples").unwrap();
         let path = dirs.data_local_dir();
         let cert_path = path.join("cert.der");
         let key_path = path.join("key.der");