diff --git a/Cargo.lock b/Cargo.lock index 6a2360b..99a90c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,7 +190,6 @@ dependencies = [ "ref-cast", "regex", "rusqlite", - "rustc-hash", "size", "unicode-width", "yansi", @@ -460,12 +459,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - [[package]] name = "serde" version = "1.0.219" diff --git a/Cargo.toml b/Cargo.toml index 2973324..6913094 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,6 @@ log = "0.4.20" ref-cast = "1.0.24" regex = "1.11.1" rusqlite = { version = "0.35.0", features = [ "bundled" ] } -rustc-hash = "2.1.1" size = "0.5.0" unicode-width = "0.2.0" yansi = { version = "1.0.1", features = [ "detect-env", "detect-tty" ] } diff --git a/src/diff.rs b/src/diff.rs index 9dd5ff8..932be08 100644 --- a/src/diff.rs +++ b/src/diff.rs @@ -1,6 +1,9 @@ -use std::fmt::{ - self, - Write as _, +use std::{ + collections::HashMap, + fmt::{ + self, + Write as _, + }, }; use itertools::{ @@ -8,10 +11,6 @@ use itertools::{ Itertools, }; use ref_cast::RefCast as _; -use rustc_hash::{ - FxBuildHasher, - FxHashMap, -}; use unicode_width::UnicodeWidthStr as _; use yansi::Paint as _; @@ -48,8 +47,7 @@ pub fn write_diffln<'a>( paths_old: impl Iterator, paths_new: impl Iterator, ) -> Result { - let mut paths = - FxHashMap::<&str, Diff>>>::with_hasher(FxBuildHasher); + let mut paths = HashMap::<&str, Diff>>>::new(); for path in paths_old { match path.parse_name_and_version() { diff --git a/src/store.rs b/src/store.rs index a0d9422..25bcce7 100644 --- a/src/store.rs +++ b/src/store.rs @@ -1,4 +1,5 @@ use std::{ + collections::HashMap, path::Path, result, }; @@ -8,10 +9,6 @@ use anyhow::{ Result, }; use derive_more::Deref; -use rustc_hash::{ - FxBuildHasher, - FxHashMap, -}; use crate::{ DerivationId, @@ -120,7 +117,7 @@ impl Connection { pub fn query_dependency_graph( &mut self, path: &StorePath, - ) -> Result>> { + ) -> Result>> { const QUERY: &str = " WITH RECURSIVE graph(p, c) AS ( @@ -137,8 +134,7 @@ impl Connection { path_to_str!(path); - let mut adj = - FxHashMap::>::with_hasher(FxBuildHasher); + let mut adj = HashMap::>::new(); let mut statement = self.prepare_cached(QUERY)?;