##// END OF EJS Templates
copies-rust: pass `PathToken` around by value...
Simon Sapin -
r47355:1fce35fc default
parent child Browse files
Show More
@@ -617,7 +617,7 b' fn merge_copies_dict('
617 ) -> InternalPathCopies {
617 ) -> InternalPathCopies {
618 use crate::utils::{ordmap_union_with_merge, MergeResult};
618 use crate::utils::{ordmap_union_with_merge, MergeResult};
619
619
620 ordmap_union_with_merge(minor, major, |dest, src_minor, src_major| {
620 ordmap_union_with_merge(minor, major, |&dest, src_minor, src_major| {
621 let (pick, overwrite) = compare_value(
621 let (pick, overwrite) = compare_value(
622 path_map,
622 path_map,
623 current_merge,
623 current_merge,
@@ -664,7 +664,7 b' fn compare_value('
664 path_map: &TwoWayPathMap,
664 path_map: &TwoWayPathMap,
665 current_merge: Revision,
665 current_merge: Revision,
666 changes: &ChangedFiles,
666 changes: &ChangedFiles,
667 dest: &PathToken,
667 dest: PathToken,
668 src_minor: &CopySource,
668 src_minor: &CopySource,
669 src_major: &CopySource,
669 src_major: &CopySource,
670 ) -> (MergePick, bool) {
670 ) -> (MergePick, bool) {
@@ -693,7 +693,7 b' fn compare_value('
693 }
693 }
694 } else {
694 } else {
695 debug_assert!(src_major.rev != src_major.rev);
695 debug_assert!(src_major.rev != src_major.rev);
696 let dest_path = path_map.untokenize(*dest);
696 let dest_path = path_map.untokenize(dest);
697 let action = changes.get_merge_case(dest_path);
697 let action = changes.get_merge_case(dest_path);
698 if src_minor.path.is_some()
698 if src_minor.path.is_some()
699 && src_major.path.is_none()
699 && src_major.path.is_none()
General Comments 0
You need to be logged in to leave comments. Login now