chore: Last big refactoring

2 files changed, 13 insertions, 23 deletions

diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
index b79932ff..e25dd3d3 100644
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -12,15 +12,15 @@ homepage = { workspace = true }
 repository = { workspace = true }
 
 [dependencies]
-directories = "6.0.0"
-eyre = "0.6"
-semver = "1.0.20"
-serde = { version = "1.0.202", features = ["derive"] }
-sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "time", "postgres", "uuid", "sqlite", "regexp"] }
-time = { version = "0.3.47", features = [ "serde-human-readable", "macros", "local-offset", "macros", "formatting", "parsing"] }
-typed-builder = "0.18.2"
-uuid = { version = "1.9", features = ["v4", "v7", "serde"] }
-whoami = "2.1.0"
+directories = { workspace = true }
+eyre = { workspace = true }
+semver = { workspace = true }
+serde = { workspace = true }
+sqlx = { workspace = true }
+time = { workspace = true }
+typed-builder = { workspace = true }
+uuid = { workspace = true }
+whoami = { workspace = true }
 
 [dev-dependencies]
 
diff --git a/crates/common/src/utils.rs b/crates/common/src/utils.rs
index 4451140b..7f46f223 100644
--- a/crates/common/src/utils.rs
+++ b/crates/common/src/utils.rs
@@ -110,14 +110,17 @@ pub fn data_dir() -> PathBuf {
     data_dir.join("atuin")
 }
 
+#[must_use]
 pub fn runtime_dir() -> PathBuf {
     env::var("XDG_RUNTIME_DIR").map_or_else(|_| data_dir(), PathBuf::from)
 }
 
+#[must_use]
 pub fn logs_dir() -> PathBuf {
     home_dir().join(".atuin").join("logs")
 }
 
+#[must_use]
 pub fn get_current_dir() -> String {
     // Prefer PWD environment variable over cwd if available to better support symbolic links
     env::var("PWD").unwrap_or_else(|_| {
@@ -164,7 +167,7 @@ impl<T: AsRef<str>> Escapable for T {}
 
 #[cfg(test)]
 mod tests {
-    use super::{Cow, Escapable, Uuid, env, in_git_repo, uuid_v7};
+    use super::{Cow, Uuid, env, in_git_repo, uuid_v7};
 
     use std::collections::HashSet;
 
@@ -259,17 +262,4 @@ mod tests {
 
         std::fs::remove_dir_all(&tmp).unwrap();
     }
-
-    #[test]
-    fn dumb_random_test() {
-        // Obviously not a test of randomness, but make sure we haven't made some
-        // catastrophic error
-
-        assert_ne!(crypto_random_string::<1>(), crypto_random_string::<1>());
-        assert_ne!(crypto_random_string::<2>(), crypto_random_string::<2>());
-        assert_ne!(crypto_random_string::<4>(), crypto_random_string::<4>());
-        assert_ne!(crypto_random_string::<8>(), crypto_random_string::<8>());
-        assert_ne!(crypto_random_string::<16>(), crypto_random_string::<16>());
-        assert_ne!(crypto_random_string::<32>(), crypto_random_string::<32>());
-    }
 }