From 74c431866be8fd687d534c51f6bd3133ab2e5421 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 2 Feb 2022 14:38:39 -0300 Subject: [PATCH] Move FIXME text to the right place --- compiler/rustc_trait_selection/src/traits/coherence.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_trait_selection/src/traits/coherence.rs b/compiler/rustc_trait_selection/src/traits/coherence.rs index 89909914bc2..e474edb8dd1 100644 --- a/compiler/rustc_trait_selection/src/traits/coherence.rs +++ b/compiler/rustc_trait_selection/src/traits/coherence.rs @@ -280,9 +280,6 @@ fn implicit_negative<'cx, 'tcx>( }) .chain(obligations) .find(|o| loose_check(selcx, o)); - // FIXME: the call to `selcx.predicate_may_hold_fatal` above should be ported - // to the canonical trait query form, `infcx.predicate_may_hold`, once - // the new system supports intercrate mode (which coherence needs). if let Some(failing_obligation) = opt_failing_obligation { debug!("overlap: obligation unsatisfiable {:?}", failing_obligation); @@ -361,6 +358,9 @@ fn loose_check<'cx, 'tcx>( selcx: &mut SelectionContext<'cx, 'tcx>, o: &PredicateObligation<'tcx>, ) -> bool { + // FIXME: the call to `selcx.predicate_may_hold_fatal` below should be ported + // to the canonical trait query form, `infcx.predicate_may_hold`, once + // the new system supports intercrate mode (which coherence needs). !selcx.predicate_may_hold_fatal(o) }