revert test and lint fixes

nix-community · Jan 27, 2025 · cb38ed3 · cb38ed3
1 parent 327d31e
commit cb38ed3
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 20 deletions.
diff --git a/crate2nix/src/config.rs b/crate2nix/src/config.rs
@@ -196,7 +196,14 @@ impl Display for Source {
                 sha256,
                 registry,
                 ..
-            } => write!(f, "{} {} from {}: {}", name, version, registry, sha256),
+            } => write!(
+                f,
+                "{} {} from {}: {}",
+                name,
+                version,
+                registry.to_string(),
+                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, &default_nix.crates)
+    default_nix.registries = prefetch::prefetch_registries(config, &mut 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
@@ -131,7 +131,12 @@ pub fn prefetch(
         let (sha256, hash_source) = if let Some(HashWithSource { sha256, source }) = hash {
             (sha256.trim().to_string(), source)
         } else {
-            eprintln!("Prefetching {:>4}/{}: {}", idx, without_hash_num, source);
+            eprintln!(
+                "Prefetching {:>4}/{}: {}",
+                idx,
+                without_hash_num,
+                source.to_string()
+            );
             idx += 1;
             (source.prefetch()?, HashSource::Prefetched)
         };
@@ -197,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/resolve.rs b/crate2nix/src/resolve.rs
@@ -633,14 +633,14 @@ impl ResolvedSource {
     }
 }
 
-impl Display for ResolvedSource {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+impl ToString for ResolvedSource {
+    fn to_string(&self) -> String {
         match self {
-            Self::CratesIo(source) => write!(f, "{}", source),
-            Self::Registry(source) => write!(f, "{}", source),
-            Self::Git(source) => write!(f, "{}", source),
-            Self::LocalDirectory(source) => write!(f, "{}", source),
-            Self::Nix(source) => write!(f, "{}", source),
+            Self::CratesIo(source) => source.to_string(),
+            Self::Registry(source) => source.to_string(),
+            Self::Git(source) => source.to_string(),
+            Self::LocalDirectory(source) => source.to_string(),
+            Self::Nix(source) => source.to_string(),
         }
     }
 }

diff --git a/crate2nix/src/test.rs b/crate2nix/src/test.rs
@@ -1,7 +1,4 @@
-//! Constructor functions for test data.
-
-#![allow(missing_docs)]
-
+///! Constructor functions for test data.
 use cargo_metadata::{Dependency, Metadata, Node, NodeDep, Package, PackageId, Resolve};
 use std::path::PathBuf;
 use tempdir::TempDir;
@@ -11,7 +8,6 @@ pub fn generate_config() -> crate::GenerateConfig {
     crate::GenerateConfig {
         cargo_toml: vec!["Cargo.toml".into()],
         crate_hashes_json: "crate-hashes.json".into(),
-        registry_hashes_json: "registry-hashes.json".into(),
         nixpkgs_path: "bogus-nixpkgs-path".into(),
         other_metadata_options: vec![],
         output: "Cargo.nix".into(),

diff --git a/crate2nix/tests/self_build_up_to_date.rs b/crate2nix/tests/self_build_up_to_date.rs
@@ -31,7 +31,6 @@ fn self_up_to_date() {
             output: PathBuf::from("./Cargo.nix"),
             nixpkgs_path: "../nix/nixpkgs.nix".to_string(),
             crate_hashes_json: PathBuf::from("./crate-hashes.json"),
-            registry_hashes_json: PathBuf::from("./registry-hashes.json"),
             other_metadata_options: vec![],
             use_cargo_lock_checksums: true,
             read_crate_hashes: true,
@@ -77,9 +76,6 @@ fn assert_up_to_date(project_dir: &Path) {
         crate_hashes_json: PathBuf::from("../")
             .join(project_dir)
             .join("./crate-hashes.json"),
-        registry_hashes_json: PathBuf::from("../")
-            .join(project_dir)
-            .join("./registry-hashes.json"),
         other_metadata_options: vec![],
         use_cargo_lock_checksums: true,
         read_crate_hashes: true,