Mercurial > hg-stable

diff rust/hg-core/src/copy_tracing.rs @ 50007:83437ad8fe3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-clippy: remove redundant suffix from enum Same as last time, this makes the code clearer in this instance.
author Raphaël Gomès <rgomes@octobus.net>
date Tue, 10 Jan 2023 10:41:52 +0100
parents e98fd81bb151
children
line wrap: on
line diff
--- a/rust/hg-core/src/copy_tracing.rs	Mon Jan 09 19:37:05 2023 +0100
+++ b/rust/hg-core/src/copy_tracing.rs	Tue Jan 10 10:41:52 2023 +0100
@@ -562,15 +562,15 @@
                 MergePick::Major | MergePick::Any => (src_major, src_minor),
                 MergePick::Minor => (src_minor, src_major),
             };
-            MergeResult::NewValue(CopySource::new_from_merge(
+            MergeResult::New(CopySource::new_from_merge(
                 current_merge,
                 winner,
                 loser,
             ))
         } else {
             match pick {
-                MergePick::Any | MergePick::Major => MergeResult::RightValue,
-                MergePick::Minor => MergeResult::LeftValue,
+                MergePick::Any | MergePick::Major => MergeResult::Right,
+                MergePick::Minor => MergeResult::Left,
             }
         }
     })