Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit dbfa01c

Browse files
lcnrcompiler-errors
authored andcommitted
using opt_values may mean we don't have infer vars
1 parent 0010bd5 commit dbfa01c

File tree

1 file changed

+8
-7
lines changed
  • compiler/rustc_next_trait_solver/src/solve/eval_ctxt

1 file changed

+8
-7
lines changed

‎compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,14 @@ where
371371
if let Some(v) = opt_values[ty::BoundVar::from_usize(index)] {
372372
if let CanonicalVarKind::Ty { universe: _, sub_root } = info.kind {
373373
if let Some(prev) = var_values.get(sub_root.as_usize()) {
374-
let ty::Infer(ty::TyVar(vid)) = v.expect_ty().kind() else {
375-
unreachable!("expected `sub_root` to be an inference variable");
376-
};
377-
let ty::Infer(ty::TyVar(sub_root)) = prev.expect_ty().kind() else {
378-
unreachable!("expected `sub_root` to be an inference variable");
379-
};
380-
delegate.sub_ty_vids_raw(vid, sub_root);
374+
let v = delegate.shallow_resolve(v.expect_ty());
375+
let prev = delegate.shallow_resolve(prev.expect_ty());
376+
match (v.kind(), prev.kind()) {
377+
(ty::Infer(ty::TyVar(vid)), ty::Infer(ty::TyVar(sub_root))) => {
378+
delegate.sub_ty_vids_raw(vid, sub_root)
379+
}
380+
_ => {}
381+
}
381382
}
382383
}
383384
v

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /