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

Remove tcx.mk_const_var

Browse Source 
... `tcx.mk_const` can now be used instead
This commit is contained in:
Maybe Waffle
2022-11-28 11:27:18 +00:00
parent e20e506f7d
commit 7087d9b2a0
5 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_infer/src/infer/combine.rs
View File

@@ -753,7 +753,7 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
origin: var_value.origin,
val: ConstVariableValue::Unknown { universe: self.for_universe },
});
Ok(self.tcx().mk_const_var(new_var_id, c.ty()))
Ok(self.tcx().mk_const(new_var_id, c.ty()))
}
}
}
@@ -975,7 +975,7 @@ impl<'tcx> TypeRelation<'tcx> for ConstInferUnifier<'_, 'tcx> {
},
},
);
Ok(self.tcx().mk_const_var(new_var_id, c.ty()))
Ok(self.tcx().mk_const(new_var_id, c.ty()))
}
}
}

2
compiler/rustc_infer/src/infer/freshen.rs
View File

@@ -102,7 +102,7 @@ impl<'a, 'tcx> TypeFreshener<'a, 'tcx> {
Entry::Vacant(entry) => {
let index = self.const_freshen_count;
self.const_freshen_count += 1;
let ct = self.infcx.tcx.mk_const_infer(freshener(index), ty);
let ct = self.infcx.tcx.mk_const(freshener(index), ty);
entry.insert(ct);
ct
}

6
compiler/rustc_infer/src/infer/mod.rs
View File

@@ -1065,7 +1065,7 @@ impl<'tcx> InferCtxt<'tcx> {
}
pub fn next_const_var(&self, ty: Ty<'tcx>, origin: ConstVariableOrigin) -> ty::Const<'tcx> {
self.tcx.mk_const_var(self.next_const_var_id(origin), ty)
self.tcx.mk_const(self.next_const_var_id(origin), ty)
}
pub fn next_const_var_in_universe(
@@ -1079,7 +1079,7 @@ impl<'tcx> InferCtxt<'tcx> {
.borrow_mut()
.const_unification_table()
.new_key(ConstVarValue { origin, val: ConstVariableValue::Unknown { universe } });
self.tcx.mk_const_var(vid, ty)
self.tcx.mk_const(vid, ty)
}
pub fn next_const_var_id(&self, origin: ConstVariableOrigin) -> ConstVid<'tcx> {
@@ -1195,7 +1195,7 @@ impl<'tcx> InferCtxt<'tcx> {
origin,
val: ConstVariableValue::Unknown { universe: self.universe() },
});
self.tcx.mk_const_var(const_var_id, self.tcx.type_of(param.def_id)).into()
self.tcx.mk_const(const_var_id, self.tcx.type_of(param.def_id)).into()
}
}
}

2
compiler/rustc_infer/src/infer/nll_relate/mod.rs
View File

@@ -1087,7 +1087,7 @@ where
origin: var_value.origin,
val: ConstVariableValue::Unknown { universe: self.universe },
});
Ok(self.tcx().mk_const_var(new_var_id, a.ty()))
Ok(self.tcx().mk_const(new_var_id, a.ty()))
}
}
}