diff -r 5f1cd6839c69 -r e98fd81bb151 rust/hg-core/src/utils.rs
--- a/rust/hg-core/src/utils.rs	Mon Jan 09 19:14:14 2023 +0100
+++ b/rust/hg-core/src/utils.rs	Mon Jan 09 19:18:43 2023 +0100
@@ -137,11 +137,8 @@
     }
 
     fn split_2_by_slice(&self, separator: &[u8]) -> Option<(&[u8], &[u8])> {
-        if let Some(pos) = find_slice_in_slice(self, separator) {
-            Some((&self[..pos], &self[pos + separator.len()..]))
-        } else {
-            None
-        }
+        find_slice_in_slice(self, separator)
+            .map(|pos| (&self[..pos], &self[pos + separator.len()..]))
     }
 }
 
@@ -369,7 +366,7 @@
                 MergeResult::RightValue => {
                     left.insert(key, right_value);
                 }
-                MergeResult::UseNewValue(new_value) => {
+                MergeResult::NewValue(new_value) => {
                     left.insert(key, new_value);
                 }
             },