update hakari.yml to be more modern + switch to AHashMap

.github/workflows/hakari.yml

@@ -18,20 +18,12 @@ jobs:
       RUSTFLAGS: -D warnings
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
-        with:
-          toolchain: stable
+      - uses: dtolnay/rust-toolchain@stable
       - name: Install cargo-hakari
         uses: taiki-e/install-action@4d8504289abd3a644c6237dea6005f9f28fba01b # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date
-        uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
-        with:
-          command: hakari
-          args: generate --diff
+        run: cargo hakari generate --diff
       - name: Check all crates depend on workspace-hack
-        uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
-        with:
-          command: hakari
-          args: manage-deps --dry-run
+        run: cargo hakari manage-deps --dry-run

Cargo.toml

@@ -19,6 +19,7 @@ members = [
 ]
 
 [workspace.dependencies]
+ahash = "0.8.6"
 guppy-workspace-hack = "0.1.0"
 
 [patch.crates-io.guppy-workspace-hack]

cargo-guppy/Cargo.toml

@@ -6,6 +6,7 @@ license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [dependencies]
+ahash.workspace = true
 camino = "1.1.6"
 # disable tracing integration since we don't use it
 color-eyre = { version = "0.6.2", default-features = false }

cargo-guppy/src/lib.rs

@@ -42,6 +42,7 @@ mod mv;
 
 pub use crate::{core::*, mv::*};
 
+use ahash::AHashMap;
 use camino::Utf8PathBuf;
 use clap::{ArgEnum, Parser};
 use color_eyre::eyre::{bail, Result, WrapErr};
@@ -58,15 +59,7 @@ use guppy::{
 use guppy_cmdlib::{
     string_to_platform_spec, CargoMetadataOptions, CargoResolverOpts, PackagesAndFeatures,
 };
-use std::{
-    borrow::Cow,
-    cmp,
-    collections::{HashMap, HashSet},
-    fmt, fs,
-    io::Write,
-    iter,
-    path::PathBuf,
-};
+use std::{borrow::Cow, cmp, collections::HashSet, fmt, fs, io::Write, iter, path::PathBuf};
 
 pub fn cmd_diff(json: bool, old: &str, new: &str) -> Result<()> {
     let old_json = fs::read_to_string(old)?;
@@ -140,7 +133,7 @@ pub fn cmd_dups(opts: &DupsOptions) -> Result<()> {
     let resolver = opts.filter_opts.make_resolver(&pkg_graph)?;
     let selection = pkg_graph.query_workspace();
 
-    let mut dupe_map: HashMap<_, Vec<_>> = HashMap::new();
+    let mut dupe_map: AHashMap<_, Vec<_>> = AHashMap::new();
     for package in selection
         .resolve_with_fn(resolver)
         .packages(DependencyDirection::Forward)
@@ -387,7 +380,7 @@ pub fn cmd_subtree_size(options: &SubtreeSizeOptions) -> Result<()> {
         pkg_graph.query_workspace()
     };
 
-    let mut unique_deps: HashMap<&PackageId, HashSet<&PackageId>> = HashMap::new();
+    let mut unique_deps: AHashMap<&PackageId, HashSet<&PackageId>> = AHashMap::new();
     for package_id in selection
         .resolve_with_fn(&resolver)
         .package_ids(DependencyDirection::Forward)

clippy.toml

@@ -0,0 +1,5 @@
+disallowed-methods = [
+    # use ahash everywhere instead
+    "std::collections::hash::map::HashMap::new",
+    "std::collections::hash::map::HashMap::with_capacity",
+]

fixtures/Cargo.toml

@@ -6,6 +6,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
+ahash.workspace = true
 camino = "1.1.6"
 guppy = { path = "../guppy" }
 once_cell = "1.18.0"

fixtures/src/details.rs

@@ -8,6 +8,7 @@ use crate::{
     },
     package_id,
 };
+use ahash::AHashMap;
 use camino::Utf8PathBuf;
 use guppy::{
     errors::FeatureGraphWarning,
@@ -19,24 +20,24 @@ use guppy::{
     DependencyKind, PackageId, Version,
 };
 use pretty_assertions::assert_eq;
-use std::collections::{BTreeMap, HashMap};
+use std::collections::BTreeMap;
 
 /// This captures metadata fields that are relevant for tests. They are meant to be written out
 /// lazily as tests are filled out -- feel free to add more details as necessary!
 pub struct FixtureDetails {
     workspace_members: Option<BTreeMap<Utf8PathBuf, PackageId>>,
-    package_details: HashMap<PackageId, PackageDetails>,
-    link_details: HashMap<(PackageId, PackageId), LinkDetails>,
+    package_details: AHashMap<PackageId, PackageDetails>,
+    link_details: AHashMap<(PackageId, PackageId), LinkDetails>,
     feature_graph_warnings: Vec<FeatureGraphWarning>,
     cycles: Vec<Vec<PackageId>>,
 }
 
 impl FixtureDetails {
-    pub fn new(package_details: HashMap<PackageId, PackageDetails>) -> Self {
+    pub fn new(package_details: AHashMap<PackageId, PackageDetails>) -> Self {
         Self {
             workspace_members: None,
             package_details,
-            link_details: HashMap::new(),
+            link_details: AHashMap::new(),
             feature_graph_warnings: vec![],
             cycles: vec![],
         }
@@ -57,7 +58,7 @@ impl FixtureDetails {
 
     pub fn with_link_details(
         mut self,
-        link_details: HashMap<(PackageId, PackageId), LinkDetails>,
+        link_details: AHashMap<(PackageId, PackageId), LinkDetails>,
     ) -> Self {
         self.link_details = link_details;
         self
@@ -456,7 +457,7 @@ impl PackageDetails {
         self
     }
 
-    pub fn insert_into(self, map: &mut HashMap<PackageId, PackageDetails>) {
+    pub fn insert_into(self, map: &mut AHashMap<PackageId, PackageDetails>) {
         map.insert(self.id.clone(), self);
     }
 
@@ -543,7 +544,7 @@ impl LinkDetails {
         self
     }
 
-    pub fn insert_into(self, map: &mut HashMap<(PackageId, PackageId), Self>) {
+    pub fn insert_into(self, map: &mut AHashMap<(PackageId, PackageId), Self>) {
         map.insert((self.from.clone(), self.to.clone()), self);
     }
 
@@ -601,7 +602,7 @@ pub struct PlatformResults {
     // Each pair stands for (required on, enabled on).
     status: (EnabledTernary, EnabledTernary),
     default_features: (EnabledTernary, EnabledTernary),
-    feature_statuses: HashMap<String, (EnabledTernary, EnabledTernary)>,
+    feature_statuses: AHashMap<String, (EnabledTernary, EnabledTernary)>,
 }
 
 impl PlatformResults {
@@ -612,7 +613,7 @@ impl PlatformResults {
         Self {
             status,
             default_features,
-            feature_statuses: HashMap::new(),
+            feature_statuses: AHashMap::new(),
         }
     }