Skip to content

Commit 1c185a6

Browse files
committed
merge: avoid matching borrow_tree_value() result against reference
By matching against `&TreeValue`, we move the value out, which currently works because we only move the boolean value which is Copy.
1 parent 33aa940 commit 1c185a6

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

lib/src/merge.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,8 +634,11 @@ where
634634
let values = zip(self.iter(), file_ids.iter().cloned())
635635
.map(
636636
|(tree_value, file_id)| match (borrow_tree_value(tree_value.as_ref()), file_id) {
637-
(Some(&TreeValue::File { id: _, executable }), Some(id)) => {
638-
Some(TreeValue::File { id, executable })
637+
(Some(TreeValue::File { id: _, executable }), Some(id)) => {
638+
Some(TreeValue::File {
639+
id,
640+
executable: *executable,
641+
})
639642
}
640643
(None, None) => None,
641644
(old, new) => panic!("incompatible update: {old:?} to {new:?}"),

0 commit comments

Comments
 (0)