Skip to content

Replace a DefiningOpaqueTypes::No with Yes by asserting that one side of the comparison is a type variable. #123888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 13, 2024
Merged

Replace a DefiningOpaqueTypes::No with Yes by asserting that one side of the comparison is a type variable. #123888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9889b0
fix coroutine witness doctest
oli-obk Apr 13, 2024
c6a4f81
Replace a `DefiningOpaqueTypes::No` with `Yes` by asserting that one …
oli-obk Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,9 +561,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {

// Unify `interior` with `witness` and collect all the resulting obligations.
let span = self.tcx.hir().body(body_id).value.span;
let ty::Infer(ty::InferTy::TyVar(_)) = interior.kind() else {
span_bug!(span, "coroutine interior witness not infer: {:?}", interior.kind())
};
let ok = self
.at(&self.misc(span), self.param_env)
.eq(DefineOpaqueTypes::No, interior, witness)
// Will never define opaque types, as all we do is instantiate a type variable.
.eq(DefineOpaqueTypes::Yes, interior, witness)
.expect("Failed to unify coroutine interior type");
let mut obligations = ok.obligations;

Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_type_ir/src/ty_kind.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ pub enum TyKind<I: Interner> {
/// Looking at the following example, the witness for this coroutine
/// may end up as something like `for<'a> [Vec<i32>, &'a Vec<i32>]`:
///
/// ```ignore UNSOLVED (ask @compiler-errors, should this error? can we just swap the yields?)
/// ```
/// #![feature(coroutines)]
/// |a| {
/// static |a| {
/// let x = &vec![3];
/// yield a;
/// yield x[0];
Expand Down
Loading