Merge pull request #375 from pnmadelaine/fix-cargo-test

Fix cargo tests & clippy warnings
nix-community · Feb 13, 2025 · be31fea · be31fea
2 parents a308f26 + 04ffee4
commit be31fea
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/crate2nix/src/config.rs b/crate2nix/src/config.rs
@@ -196,14 +196,7 @@ impl Display for Source {
                 sha256,
                 registry,
                 ..
-            } => write!(
-                f,
-                "{} {} from {}: {}",
-                name,
-                version,
-                registry.to_string(),
-                sha256
-            ),
+            } => write!(f, "{} {} from {}: {}", name, version, registry, sha256),
             Source::Git { url, rev, sha256 } => write!(f, "{}#{} via git: {}", url, rev, sha256),
             Source::Nix { file, attr: None } => write!(f, "{}", file),
             Source::Nix {

diff --git a/crate2nix/src/lib.rs b/crate2nix/src/lib.rs
@@ -225,7 +225,7 @@ fn prefetch_and_fill_registries(
     config: &GenerateConfig,
     default_nix: &mut BuildInfo,
 ) -> Result<(), Error> {
-    default_nix.registries = prefetch::prefetch_registries(config, &mut default_nix.crates)
+    default_nix.registries = prefetch::prefetch_registries(config, &default_nix.crates)
         .map_err(|e| format_err!("while prefetching crates for calculating sha256: {}", e))?;
 
     Ok(())

diff --git a/crate2nix/src/prefetch.rs b/crate2nix/src/prefetch.rs
@@ -202,7 +202,7 @@ pub fn prefetch_registries(
                 &[&format!(
                     "{}{}config.json",
                     e.key(),
-                    if e.key().ends_with("/") { "" } else { "/" }
+                    if e.key().ends_with('/') { "" } else { "/" }
                 )],
             )?;
             e.insert(out);

diff --git a/crate2nix/src/test.rs b/crate2nix/src/test.rs
@@ -13,6 +13,7 @@ pub fn generate_config() -> crate::GenerateConfig {
         output: "Cargo.nix".into(),
         use_cargo_lock_checksums: true,
         read_crate_hashes: true,
+        registry_hashes_json: "registry-hashes.json".into(),
     }
 }
 

diff --git a/crate2nix/tests/self_build_up_to_date.rs b/crate2nix/tests/self_build_up_to_date.rs
@@ -34,6 +34,7 @@ fn self_up_to_date() {
             other_metadata_options: vec![],
             use_cargo_lock_checksums: true,
             read_crate_hashes: true,
+            registry_hashes_json: PathBuf::from("./registry-hashes.json"),
         },
     )
     .unwrap();
@@ -79,6 +80,9 @@ fn assert_up_to_date(project_dir: &Path) {
         other_metadata_options: vec![],
         use_cargo_lock_checksums: true,
         read_crate_hashes: true,
+        registry_hashes_json: PathBuf::from("../")
+            .join(project_dir)
+            .join("./registry-hashes.json"),
     };
     let metadata = BuildInfo::for_config(
         &GenerateInfo {