# HG changeset patch # User Simon Sapin # Date 1610103496 -3600 # Node ID 1fce35fcb4db0194edb2bd2ee471692ed9a90612 # Parent d7d64b8c8229e47073634ca8860c060ac5949a5e copies-rust: pass `PathToken` around by value It’s just a `usize`. Differential Revision: https://phab.mercurial-scm.org/D10069 diff -r d7d64b8c8229 -r 1fce35fcb4db rust/hg-core/src/copy_tracing.rs --- a/rust/hg-core/src/copy_tracing.rs Wed Feb 24 09:27:33 2021 -0800 +++ b/rust/hg-core/src/copy_tracing.rs Fri Jan 08 11:58:16 2021 +0100 @@ -617,7 +617,7 @@ ) -> InternalPathCopies { use crate::utils::{ordmap_union_with_merge, MergeResult}; - ordmap_union_with_merge(minor, major, |dest, src_minor, src_major| { + ordmap_union_with_merge(minor, major, |&dest, src_minor, src_major| { let (pick, overwrite) = compare_value( path_map, current_merge, @@ -664,7 +664,7 @@ path_map: &TwoWayPathMap, current_merge: Revision, changes: &ChangedFiles, - dest: &PathToken, + dest: PathToken, src_minor: &CopySource, src_major: &CopySource, ) -> (MergePick, bool) { @@ -693,7 +693,7 @@ } } else { debug_assert!(src_major.rev != src_major.rev); - let dest_path = path_map.untokenize(*dest); + let dest_path = path_map.untokenize(dest); let action = changes.get_merge_case(dest_path); if src_minor.path.is_some() && src_major.path.is_none()