bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove expect_anon and expect_anon_placeholder in favor of var

Browse source
This commit is contained in:
Jack Huey 2023-04-06 21:26:38 -04:00
parent 4646b3df6a
commit 167b70692b
4 changed files with 12 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_traits/src/chalk/lowering.rs
View file

@ -1168,13 +1168,12 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ReverseParamsSubstitutor<'tcx> {
fn fold_ty(&mut self, t: Ty<'tcx>) -> Ty<'tcx> {
match *t.kind() {
ty::Placeholder(ty::PlaceholderType {
universe: ty::UniverseIndex::ROOT,
bound: ty::BoundTy { kind: name, .. },
}) => match self.params.get(&name.expect_anon()) {
Some(&ty::ParamTy { index, name }) => self.tcx.mk_ty_param(index, name),
None => t,
},
ty::Placeholder(ty::PlaceholderType { universe: ty::UniverseIndex::ROOT, bound }) => {
match self.params.get(&bound.var.as_u32()) {
Some(&ty::ParamTy { index, name }) => self.tcx.mk_ty_param(index, name),
None => t,
}
}
_ => t.super_fold_with(self),
}
@ -1202,8 +1201,7 @@ impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for PlaceholdersCollector {
fn visit_ty(&mut self, t: Ty<'tcx>) -> ControlFlow<Self::BreakTy> {
match t.kind() {
ty::Placeholder(p) if p.universe == self.universe_index => {
self.next_ty_placeholder =
self.next_ty_placeholder.max(p.bound.kind.expect_anon() as usize + 1);
self.next_ty_placeholder = self.next_ty_placeholder.max(p.bound.var.as_usize() + 1);
}
_ => (),