IndexedMetadata::new_from_merged doesn't consume MergedMetadata

So we can avoid a merge later
nix-community · Apr 3, 2024 · 373c3b1 · 373c3b1
1 parent b053b51
commit 373c3b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/crate2nix/src/lib.rs b/crate2nix/src/lib.rs
@@ -69,7 +69,7 @@ impl BuildInfo {
             metadata::MergedMetadata::merge(metadatas)?
         };
 
-        let indexed_metadata = IndexedMetadata::new_from_merged(merged).map_err(|e| {
+        let indexed_metadata = IndexedMetadata::new_from_merged(&merged).map_err(|e| {
             format_err!(
                 "while indexing metadata for {:#?}: {}",
                 config

diff --git a/crate2nix/src/metadata.rs b/crate2nix/src/metadata.rs
@@ -84,7 +84,7 @@ pub struct IndexedMetadata {
 impl IndexedMetadata {
     pub fn new_from(metadata: Metadata) -> Result<IndexedMetadata, Error> {
         let merged = MergedMetadata::merge(vec![metadata])?;
-        Self::new_from_merged(merged)
+        Self::new_from_merged(&merged)
     }
 
     pub fn new_from_merged(
@@ -93,7 +93,7 @@ impl IndexedMetadata {
             workspace_members,
             packages,
             nodes,
-        }: MergedMetadata,
+        }: &MergedMetadata,
     ) -> Result<IndexedMetadata, Error> {
         let id_shortener = PackageIdShortener::new(packages.iter());