rename RegionVariableOrigin::MiscVariable to RegionVariableOrigin::Misc · rust-lang/rust@9b07e2d (original) (raw)

File tree

13 files changed

lines changed

13 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -66,10 +66,9 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
66 66 Ty::new_tup(self.tcx(), user_provided_sig.inputs()),
67 67 args.tupled_upvars_ty(),
68 68 args.coroutine_captures_by_ref_ty(),
69 -self.infcx
70 -.next_region_var(RegionVariableOrigin::MiscVariable(self.body.span), |
71 -RegionCtxt::Unknown
72 -}),
69 +self.infcx.next_region_var(RegionVariableOrigin::Misc(self.body.span), |
70 +RegionCtxt::Unknown
71 +}),
73 72 );
74 73
75 74 let next_ty_var = |
Original file line number Diff line number Diff line change
@@ -339,7 +339,7 @@ fn check_opaque_meets_bounds<'tcx>(
339 339 // here rather than using ReErased.
340 340 let hidden_ty = tcx.type_of(def_id.to_def_id()).instantiate(tcx, args);
341 341 let hidden_ty = fold_regions(tcx, hidden_ty, |re, _dbi
342 - ty::ReErased => infcx.next_region_var(RegionVariableOrigin::MiscVariable(span)),
342 + ty::ReErased => infcx.next_region_var(RegionVariableOrigin::Misc(span)),
343 343 _ => re,
344 344 });
345 345
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ pub(super) fn check_fn<'a, 'tcx>(
58 58 let maybe_va_list = fn_sig.c_variadic.then(|
59 59 let span = body.params.last().unwrap().span;
60 60 let va_list_did = tcx.require_lang_item(LangItem::VaList, span);
61 -let region = fcx.next_region_var(RegionVariableOrigin::MiscVariable(span));
61 +let region = fcx.next_region_var(RegionVariableOrigin::Misc(span));
62 62
63 63 tcx.type_of(va_list_did).instantiate(tcx, &[region.into()])
64 64 });
Original file line number Diff line number Diff line change
@@ -243,7 +243,7 @@ impl<'tcx> HirTyLowerer<'tcx> for FnCtxt<'_, 'tcx> {
243 243 RegionInferReason::Param(def) => {
244 244 RegionVariableOrigin::RegionParameterDefinition(span, def.name)
245 245 }
246 - _ => RegionVariableOrigin::MiscVariable(span),
246 + _ => RegionVariableOrigin::Misc(span),
247 247 };
248 248 self.next_region_var(v)
249 249 }
Original file line number Diff line number Diff line change
@@ -2350,9 +2350,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
2350 2350 if !arg.is_suggestable(self.tcx, true) {
2351 2351 has_unsuggestable_args = true;
2352 2352 match arg.kind() {
2353 -GenericArgKind::Lifetime(_) => self
2354 -.next_region_var(RegionVariableOrigin::MiscVariable(DUMMY_SP))
2355 - .into(),
2353 +GenericArgKind::Lifetime(_) => {
2354 +self.next_region_var(RegionVariableOrigin::Misc(DUMMY_SP)).into()
2355 +}
2356 2356 GenericArgKind::Type(_) => self.next_ty_var(DUMMY_SP).into(),
2357 2357 GenericArgKind::Const(_) => self.next_const_var(DUMMY_SP).into(),
2358 2358 }
Original file line number Diff line number Diff line change
@@ -128,10 +128,7 @@ impl<'tcx> InferCtxt<'tcx> {
128 128 }
129 129
130 130 CanonicalVarKind::Region(ui) => self
131 -.next_region_var_in_universe(
132 -RegionVariableOrigin::MiscVariable(span),
133 -universe_map(ui),
134 -)
131 +.next_region_var_in_universe(RegionVariableOrigin::Misc(span), universe_map(ui))
135 132 .into(),
136 133
137 134 CanonicalVarKind::PlaceholderRegion(ty::PlaceholderRegion { universe, bound }) => {
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ impl<'tcx> rustc_type_ir::InferCtxtLike for InferCtxt<'tcx> {
141 141 }
142 142
143 143 fn next_region_infer(&self) -> ty::Region<'tcx> {
144 -self.next_region_var(RegionVariableOrigin::MiscVariable(DUMMY_SP))
144 +self.next_region_var(RegionVariableOrigin::Misc(DUMMY_SP))
145 145 }
146 146
147 147 fn next_ty_infer(&self) -> Ty<'tcx> {
Original file line number Diff line number Diff line change
@@ -400,7 +400,7 @@ pub enum RegionVariableOrigin {
400 400 /// Region variables created for ill-categorized reasons.
401 401 ///
402 402 /// They mostly indicate places in need of refactoring.
403 - MiscVariable(Span),
403 + Misc(Span),
404 404
405 405 /// Regions created by a `&P` or `[...]` pattern.
406 406 PatternRegion(Span),
@@ -1526,7 +1526,7 @@ impl<'tcx> SubregionOrigin<'tcx> {
1526 1526 impl RegionVariableOrigin {
1527 1527 pub fn span(&self) -> Span {
1528 1528 match *self {
1529 -RegionVariableOrigin::MiscVariable(a)
1529 +RegionVariableOrigin::Misc(a)
1530 1530 | RegionVariableOrigin::PatternRegion(a)
1531 1531 | RegionVariableOrigin::BorrowRegion(a)
1532 1532 | RegionVariableOrigin::Autoref(a)
Original file line number Diff line number Diff line change
@@ -262,9 +262,7 @@ impl<'tcx> InferCtxt<'tcx> {
262 262 .type_of_opaque_hir_typeck(opaque_type_key.def_id)
263 263 .instantiate(self.tcx, opaque_type_key.args);
264 264 let actual = ty::fold_regions(tcx, actual, |re, _dbi
265 - ty::ReErased => {
266 -self.next_region_var(RegionVariableOrigin::MiscVariable(span))
267 -}
265 + ty::ReErased => self.next_region_var(RegionVariableOrigin::Misc(span)),
268 266 _ => re,
269 267 });
270 268 actual
Original file line number Diff line number Diff line change
@@ -580,7 +580,7 @@ impl<'tcx> RegionConstraintCollector<'_, 'tcx> {
580 580 let a_universe = self.universe(a);
581 581 let b_universe = self.universe(b);
582 582 let c_universe = cmp::max(a_universe, b_universe);
583 -let c = self.new_region_var(c_universe, RegionVariableOrigin::MiscVariable(origin.span()));
583 +let c = self.new_region_var(c_universe, RegionVariableOrigin::Misc(origin.span()));
584 584 self.combine_map(t).insert(vars, c);
585 585 self.undo_log.push(AddCombination(t, vars));
586 586 let new_r = ty::Region::new_var(tcx, c);