user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert one change from rustc_next_trait_solver

Browse source
This commit is contained in:
Esteban Küber 2025-12-12 17:55:26 +00:00
parent a49c175380
commit 97c7742151
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_next_trait_solver/src/lib.rs
View file

@ -8,7 +8,6 @@
#![allow(rustc::direct_use_of_rustc_type_ir)]
#![allow(rustc::usage_of_type_ir_inherent)]
#![allow(rustc::usage_of_type_ir_traits)]
#![deny(clippy::manual_let_else)]
// tidy-alphabetical-end
pub mod canonical;

14
compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs
View file

@ -810,16 +810,18 @@ where
pub(super) fn term_is_fully_unconstrained(&self, goal: Goal<I, ty::NormalizesTo<I>>) -> bool {
let universe_of_term = match goal.predicate.term.kind() {
ty::TermKind::Ty(ty) => {
let ty::Infer(ty::TyVar(vid)) = ty.kind() else {
if let ty::Infer(ty::TyVar(vid)) = ty.kind() {
self.delegate.universe_of_ty(vid).unwrap()
} else {
return false;
};
self.delegate.universe_of_ty(vid).unwrap()
}
}
ty::TermKind::Const(ct) => {
let ty::ConstKind::Infer(ty::InferConst::Var(vid)) = ct.kind() else {
if let ty::ConstKind::Infer(ty::InferConst::Var(vid)) = ct.kind() {
self.delegate.universe_of_ct(vid).unwrap()
} else {
return false;
};
self.delegate.universe_of_ct(vid).unwrap()
}
}
};