From 8a3272985b2c9bcd764d72ecf78e9c321b710e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Wed, 4 Mar 2020 13:59:51 -0800 Subject: [PATCH] Correctly reject `TraitCandidate` in all cases Follow up to #69255, fix #69629. --- src/librustc_typeck/check/method/probe.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs index a52cabd889477..4f65b0e87a18c 100644 --- a/src/librustc_typeck/check/method/probe.rs +++ b/src/librustc_typeck/check/method/probe.rs @@ -1403,6 +1403,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> { let predicate = trait_ref.without_const().to_predicate(); let obligation = traits::Obligation::new(cause, self.param_env, predicate); if !self.predicate_may_hold(&obligation) { + result = ProbeResult::NoMatch; if self.probe(|_| { match self.select_trait_candidate(trait_ref) { Err(_) => return true, @@ -1413,7 +1414,6 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> { // Determine exactly which obligation wasn't met, so // that we can give more context in the error. if !self.predicate_may_hold(&obligation) { - result = ProbeResult::NoMatch; let o = self.resolve_vars_if_possible(obligation); let predicate = self.resolve_vars_if_possible(&predicate); @@ -1431,7 +1431,6 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> { _ => { // Some nested subobligation of this predicate // failed. - result = ProbeResult::NoMatch; let predicate = self.resolve_vars_if_possible(&predicate); possibly_unsatisfied_predicates.push((predicate, None)); }