bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

address nits

Browse source
This commit is contained in:
Lukas Markeffsky 2024-03-18 22:28:29 +01:00
parent ee66acbea8
commit 99efae342e
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_trait_selection/src/solve/assembly/structural_traits.rs
View file

@ -168,10 +168,11 @@ pub(in crate::solve) fn instantiate_constituent_tys_for_sized_trait<'tcx>(
// "best effort" optimization and `sized_constraint` may return `Some`, even
// if the ADT is sized for all possible args.
ty::Adt(def, args) => {
let sized_crit = def.sized_constraint(ecx.tcx());
Ok(sized_crit.map_or_else(Vec::new, |ty| {
vec![ty::Binder::dummy(ty.instantiate(ecx.tcx(), args))]
}))
if let Some(sized_crit) = def.sized_constraint(ecx.tcx()) {
Ok(vec![ty::Binder::dummy(sized_crit.instantiate(ecx.tcx(), args))])
} else {
Ok(vec![])
}
}
}
}

13
compiler/rustc_trait_selection/src/traits/select/mod.rs
View file

@ -2118,11 +2118,14 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
),
ty::Adt(def, args) => {
let sized_crit = def.sized_constraint(self.tcx());
// (*) binder moved here
Where(obligation.predicate.rebind(
sized_crit.map_or_else(Vec::new, |ty| vec![ty.instantiate(self.tcx(), args)]),
))
if let Some(sized_crit) = def.sized_constraint(self.tcx()) {
// (*) binder moved here
Where(
obligation.predicate.rebind(vec![sized_crit.instantiate(self.tcx(), args)]),
)
} else {
Where(ty::Binder::dummy(Vec::new()))
}
}
ty::Alias(..) | ty::Param(_) | ty::Placeholder(..) => None,