Use dns_common library (#818)

denisidoro · Apr 8, 2023 · b56d70a · b56d70a
1 parent 8cf9c96
commit b56d70a
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,6 +33,8 @@ edit = "0.1.4"
 remove_dir_all = "0.8.2"
 serde = { version = "1.0.159", features = ["derive"] }
 serde_yaml = "0.9.21"
+dns_common_derive = { version = "0.2.1" }
+dns_common = { version = "0.2.1", default-features = false, features = ["yaml", "json"] }
 
 [lib]
 name = "navi"

diff --git a/src/common/fs.rs b/src/common/fs.rs
@@ -1,4 +1,4 @@
-use super::prelude::*;
+use crate::prelude::*;
 use remove_dir_all::remove_dir_all;
 use std::ffi::OsStr;
 use std::fs::{self, create_dir_all, File};
@@ -21,14 +21,6 @@ impl ToStringExt for OsStr {
     }
 }
 
-// pub fn config_dir(project_name: &str) -> Result<PathBuf> {
-//     let base_dirs = BaseDirs::new().context("unable to get base dirs")?;
-//
-//     let mut pathbuf = PathBuf::from(base_dirs.config_dir());
-//     pathbuf.push(project_name);
-//     Ok(pathbuf)
-// }
-
 #[derive(Error, Debug)]
 #[error("Invalid path `{0}`")]
 pub struct InvalidPath(pub PathBuf);

diff --git a/src/common/mod.rs b/src/common/mod.rs
@@ -1,13 +1,7 @@
-// pub mod component;
-// pub mod deps;
-// pub mod deser;
 pub mod clipboard;
 pub mod fs;
 pub mod git;
 pub mod hash;
-pub mod prelude;
 pub mod shell;
 pub mod terminal;
 pub mod url;
-// pub mod system;
-// pub mod tracing;
diff --git a/src/common/prelude.rs b/src/common/prelude.rs
diff --git a/src/config/cli.rs b/src/config/cli.rs
@@ -1,6 +1,6 @@
 use crate::commands;
 use crate::finder::FinderChoice;
-use crate::prelude::*;
+
 use clap::{crate_version, Parser, Subcommand};
 
 #[derive(Debug, Parser)]

diff --git a/src/prelude.rs b/src/prelude.rs
@@ -1,8 +1,9 @@
-pub use crate::common::prelude::*;
 pub use crate::config::CONFIG; // TODO
+pub use dns_common::prelude::*;
 pub use regex::Regex;
-
-// pub use crate::common::fs::pathbuf_to_string; // TODO
+pub use std::io::{BufRead, BufReader};
+pub use std::process::Stdio;
+pub use std::str::FromStr;
 
 pub trait Runnable {
     fn run(&self) -> Result<()>;