rebase fun

lcnr · lcnr · commit fc488408c7ec · 2025-05-07T02:52:40.000Z
diff --git a/compiler/rustc_next_trait_solver/src/solve/assembly/mod.rs b/compiler/rustc_next_trait_solver/src/solve/assembly/mod.rs
@@ -897,7 +897,7 @@ where
             match G::consider_impl_candidate(self, goal, impl_def_id) {
                 Ok(mut candidate) => {
                     candidate.result.value.certainty =
-                        candidate.result.value.certainty.unify_with(Certainty::AMBIGUOUS);
+                        candidate.result.value.certainty.and(Certainty::AMBIGUOUS);
                     candidates.push(candidate);
                 }
                 Err(NoSolution) => (),

Original file line number	Diff line number	Diff line change
`@@ -897,7 +897,7 @@ where`
`897`	`897`	`match G::consider_impl_candidate(self, goal, impl_def_id) {`
`898`	`898`	`Ok(mut candidate) => {`
`899`	`899`	`candidate.result.value.certainty =`
`900`		`- candidate.result.value.certainty.unify_with(Certainty::AMBIGUOUS);`
	`900`	`+ candidate.result.value.certainty.and(Certainty::AMBIGUOUS);`
`901`	`901`	`candidates.push(candidate);`
`902`	`902`	`}`
`903`	`903`	`Err(NoSolution) => (),`