Skip to content

Commit 373c3b1

Browse files
committed
IndexedMetadata::new_from_merged doesn't consume MergedMetadata
So we can avoid a merge later
1 parent b053b51 commit 373c3b1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

crate2nix/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl BuildInfo {
6969
metadata::MergedMetadata::merge(metadatas)?
7070
};
7171

72-
let indexed_metadata = IndexedMetadata::new_from_merged(merged).map_err(|e| {
72+
let indexed_metadata = IndexedMetadata::new_from_merged(&merged).map_err(|e| {
7373
format_err!(
7474
"while indexing metadata for {:#?}: {}",
7575
config

crate2nix/src/metadata.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ pub struct IndexedMetadata {
8484
impl IndexedMetadata {
8585
pub fn new_from(metadata: Metadata) -> Result<IndexedMetadata, Error> {
8686
let merged = MergedMetadata::merge(vec![metadata])?;
87-
Self::new_from_merged(merged)
87+
Self::new_from_merged(&merged)
8888
}
8989

9090
pub fn new_from_merged(
@@ -93,7 +93,7 @@ impl IndexedMetadata {
9393
workspace_members,
9494
packages,
9595
nodes,
96-
}: MergedMetadata,
96+
}: &MergedMetadata,
9797
) -> Result<IndexedMetadata, Error> {
9898
let id_shortener = PackageIdShortener::new(packages.iter());
9999

0 commit comments

Comments
 (0)