rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

review

Browse Source
This commit is contained in:
lcnr
2025-09-08 11:41:43 +02:00
parent f514586408
commit b51a3a565a
12 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs
View File

@@ -894,7 +894,8 @@ impl<'a, 'tcx> FindInferSourceVisitor<'a, 'tcx> {
use ty::{Infer, TyVar};
match (inner_ty.kind(), target_ty.kind()) {
(&Infer(TyVar(a_vid)), &Infer(TyVar(b_vid))) => {
self.tecx.sub_root_var(a_vid) == self.tecx.sub_root_var(b_vid)
self.tecx.sub_unification_table_root_var(a_vid)
== self.tecx.sub_unification_table_root_var(b_vid)
}
_ => false,
}

2
compiler/rustc_trait_selection/src/solve/delegate.rs
View File

@@ -128,7 +128,7 @@ impl<'tcx> rustc_next_trait_solver::delegate::SolverDelegate for SolverDelegate<
| ty::PredicateKind::Coerce(ty::CoercePredicate { a, b }) => {
match (self.shallow_resolve(a).kind(), self.shallow_resolve(b).kind()) {
(&ty::Infer(ty::TyVar(a_vid)), &ty::Infer(ty::TyVar(b_vid))) => {
self.sub_ty_vids_raw(a_vid, b_vid);
self.sub_unify_ty_vids_raw(a_vid, b_vid);
Some(Certainty::AMBIGUOUS)
}
_ => None,