Avoid code duplication

rust-lang · Feb 23, 2024 · f20a37d · f20a37d
1 parent ffc9e83
commit f20a37d
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/compiler/rustc_middle/src/ty/generics.rs b/compiler/rustc_middle/src/ty/generics.rs
@@ -372,17 +372,12 @@ impl<'tcx> Generics {
     ) -> bool {
         let mut default_param_seen = false;
         for param in self.params.iter() {
-            if param
-                .default_value(tcx)
-                .is_some_and(|default| default.instantiate(tcx, args) == args[param.index as usize])
-            {
-                default_param_seen = true;
-            } else if default_param_seen
-                && param.default_value(tcx).is_some_and(|default| {
-                    default.instantiate(tcx, args) != args[param.index as usize]
-                })
-            {
-                return true;
+            if let Some(inst) = param.default_value(tcx).map(|default| default.instantiate(tcx, args)) {
+                if inst == args[param.index as usize] {
+                    default_param_seen = true;
+                } else if default_param_seen {
+                    return true;
+                }
             }
         }
         false