Skip to content

Commit

Permalink
Rollup merge of rust-lang#118736 - aliemjay:revert-ice-on-ambig, r=co…
Browse files Browse the repository at this point in the history
…mpiler-errors

temporarily revert "ice on ambguity in mir typeck"

Reverts rust-lang#116530 as a temporary measure to fix rust-lang#117577. That issue should be ultimately fixed by checking WF of type annotations prior to normalization, which is implemented in rust-lang#104098 but this PR is intended to be backported to beta.

r? `@compiler-errors` (the reviewer of the reverted PR)
  • Loading branch information
matthiaskrgr authored Dec 8, 2023
2 parents 68c5438 + 5fdb648 commit a720b77
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 12 deletions.
16 changes: 4 additions & 12 deletions compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,10 @@ where
}

let mut region_constraints = QueryRegionConstraints::default();
let (output, error_info, mut obligations) =
Q::fully_perform_into(self, infcx, &mut region_constraints)
.map_err(|_| {
infcx.tcx.sess.span_delayed_bug(span, format!("error performing {self:?}"))
})
.and_then(|(output, error_info, obligations, certainty)| match certainty {
Certainty::Proven => Ok((output, error_info, obligations)),
Certainty::Ambiguous => Err(infcx
.tcx
.sess
.span_delayed_bug(span, format!("ambiguity performing {self:?}"))),
})?;
let (output, error_info, mut obligations, _) =
Q::fully_perform_into(self, infcx, &mut region_constraints).map_err(|_| {
infcx.tcx.sess.span_delayed_bug(span, format!("error performing {self:?}"))
})?;

// Typically, instantiating NLL query results does not
// create obligations. However, in some cases there
Expand Down
24 changes: 24 additions & 0 deletions tests/ui/wf/unnormalized-projection-guides-inference.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// The WF requirements of the *unnormalized* form of type annotations
// can guide inference.
// check-pass

pub trait EqualTo {
type Ty;
}
impl<X> EqualTo for X {
type Ty = X;
}

trait MyTrait<U: EqualTo<Ty = Self>> {
type Out;
}
impl<T, U: EqualTo<Ty = T>> MyTrait<U> for T {
type Out = ();
}

fn main() {
let _: <_ as MyTrait<u8>>::Out;
// We shoud be able to infer a value for the inference variable above.
// The WF of the unnormalized projection requires `u8: EqualTo<Ty = _>`,
// which is sufficient to guide inference.
}

0 comments on commit a720b77

Please sign in to comment.