Skip to content

Commit 234b930

Browse files
mark-i-mmark-i-m
committed
rename nonlexical_regioncx -> regioncx
1 parent 66c5d5b commit 234b930

File tree

4 files changed

+34
-48
lines changed

4 files changed

+34
-48
lines changed

‎src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs

+4-11
Original file line numberDiff line numberDiff line change
@@ -260,17 +260,11 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
260260
borrow_region: RegionVid,
261261
outlived_region: RegionVid,
262262
) -> (ConstraintCategory, bool, Span, Option<RegionName>) {
263-
let (category, from_closure, span) = self.nonlexical_regioncx.best_blame_constraint(
263+
let (category, from_closure, span) = self.regioncx.best_blame_constraint(
264264
&self.body,
265265
borrow_region,
266266
NLLRegionVariableOrigin::FreeRegion,
267-
|r| {
268-
self.nonlexical_regioncx.provides_universal_region(
269-
r,
270-
borrow_region,
271-
outlived_region,
272-
)
273-
},
267+
|r| self.regioncx.provides_universal_region(r, borrow_region, outlived_region),
274268
);
275269

276270
let mut renctx = RegionErrorNamingCtx::new();
@@ -303,15 +297,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
303297
location, borrow, kind_place
304298
);
305299

306-
let regioncx = &self.nonlexical_regioncx;
300+
let regioncx = &self.regioncx;
307301
let body: &Body<'_> = &self.body;
308302
let tcx = self.infcx.tcx;
309303

310304
let borrow_region_vid = borrow.region;
311305
debug!("explain_why_borrow_contains_point: borrow_region_vid={:?}", borrow_region_vid);
312306

313-
let region_sub =
314-
self.nonlexical_regioncx.find_sub_region_live_at(borrow_region_vid, location);
307+
let region_sub = self.regioncx.find_sub_region_live_at(borrow_region_vid, location);
315308
debug!("explain_why_borrow_contains_point: region_sub={:?}", region_sub);
316309

317310
match find_use::find(body, regioncx, tcx, region_sub, location) {

‎src/librustc_mir/borrow_check/diagnostics/region_errors.rs

+15-17
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,18 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
112112
/// to find a good name from that. Returns `None` if we can't find
113113
/// one (e.g., this is just some random part of the CFG).
114114
pub(super) fn to_error_region(&self, r: RegionVid) -> Option<ty::Region<'tcx>> {
115-
self.to_error_region_vid(r)
116-
.and_then(|r| self.nonlexical_regioncx.region_definition(r).external_name)
115+
self.to_error_region_vid(r).and_then(|r| self.regioncx.region_definition(r).external_name)
117116
}
118117

119118
/// Returns the `RegionVid` corresponding to the region returned by
120119
/// `to_error_region`.
121120
pub(super) fn to_error_region_vid(&self, r: RegionVid) -> Option<RegionVid> {
122-
if self.nonlexical_regioncx.universal_regions().is_universal_region(r) {
121+
if self.regioncx.universal_regions().is_universal_region(r) {
123122
Some(r)
124123
} else {
125-
let upper_bound = self.nonlexical_regioncx.universal_upper_bound(r);
124+
let upper_bound = self.regioncx.universal_upper_bound(r);
126125

127-
if self.nonlexical_regioncx.upper_bound_in_region_scc(r, upper_bound) {
126+
if self.regioncx.upper_bound_in_region_scc(r, upper_bound) {
128127
self.to_error_region_vid(upper_bound)
129128
} else {
130129
None
@@ -137,7 +136,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
137136
if let Some(ty::ReFree(free_region)) = self.to_error_region(fr) {
138137
if let ty::BoundRegion::BrEnv = free_region.bound_region {
139138
if let DefiningTy::Closure(def_id, substs) =
140-
self.nonlexical_regioncx.universal_regions().defining_ty
139+
self.regioncx.universal_regions().defining_ty
141140
{
142141
let closure_kind_ty = substs.as_closure().kind_ty(def_id, self.infcx.tcx);
143142
return Some(ty::ClosureKind::FnMut) == closure_kind_ty.to_opt_closure_kind();
@@ -219,11 +218,10 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
219218
fr_origin,
220219
error_element,
221220
} => {
222-
let error_region =
223-
self.nonlexical_regioncx.region_from_element(longer_fr, error_element);
221+
let error_region = self.regioncx.region_from_element(longer_fr, error_element);
224222

225223
// Find the code to blame for the fact that `longer_fr` outlives `error_fr`.
226-
let (_, span) = self.nonlexical_regioncx.find_outlives_blame_span(
224+
let (_, span) = self.regioncx.find_outlives_blame_span(
227225
&self.body,
228226
longer_fr,
229227
fr_origin,
@@ -286,8 +284,8 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
286284
debug!("report_error(fr={:?}, outlived_fr={:?})", fr, outlived_fr);
287285

288286
let (category, _, span) =
289-
self.nonlexical_regioncx.best_blame_constraint(&self.body, fr, fr_origin, |r| {
290-
self.nonlexical_regioncx.provides_universal_region(r, fr, outlived_fr)
287+
self.regioncx.best_blame_constraint(&self.body, fr, fr_origin, |r| {
288+
self.regioncx.provides_universal_region(r, fr, outlived_fr)
291289
});
292290

293291
debug!("report_error: category={:?} {:?}", category, span);
@@ -302,8 +300,8 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
302300
}
303301

304302
let (fr_is_local, outlived_fr_is_local): (bool, bool) = (
305-
self.nonlexical_regioncx.universal_regions().is_local_free_region(fr),
306-
self.nonlexical_regioncx.universal_regions().is_local_free_region(outlived_fr),
303+
self.regioncx.universal_regions().is_local_free_region(fr),
304+
self.regioncx.universal_regions().is_local_free_region(outlived_fr),
307305
);
308306

309307
debug!(
@@ -378,7 +376,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
378376
// We should check if the return type of this closure is in fact a closure - in that
379377
// case, we can special case the error further.
380378
let return_type_is_closure =
381-
self.nonlexical_regioncx.universal_regions().unnormalized_output_ty.is_closure();
379+
self.regioncx.universal_regions().unnormalized_output_ty.is_closure();
382380
let message = if return_type_is_closure {
383381
"returns a closure that contains a reference to a captured variable, which then \
384382
escapes the closure body"
@@ -430,22 +428,22 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
430428
) -> DiagnosticBuilder<'tcx> {
431429
let ErrorConstraintInfo { span, category, .. } = errci;
432430

433-
let fr_name_and_span = self.nonlexical_regioncx.get_var_name_and_span_for_region(
431+
let fr_name_and_span = self.regioncx.get_var_name_and_span_for_region(
434432
self.infcx.tcx,
435433
&self.body,
436434
&self.local_names,
437435
&self.upvars,
438436
errci.fr,
439437
);
440-
let outlived_fr_name_and_span = self.nonlexical_regioncx.get_var_name_and_span_for_region(
438+
let outlived_fr_name_and_span = self.regioncx.get_var_name_and_span_for_region(
441439
self.infcx.tcx,
442440
&self.body,
443441
&self.local_names,
444442
&self.upvars,
445443
errci.outlived_fr,
446444
);
447445

448-
let escapes_from = match self.nonlexical_regioncx.universal_regions().defining_ty {
446+
let escapes_from = match self.regioncx.universal_regions().defining_ty {
449447
DefiningTy::Closure(..) => "closure",
450448
DefiningTy::Generator(..) => "generator",
451449
DefiningTy::FnDef(..) => "function",

‎src/librustc_mir/borrow_check/diagnostics/region_name.rs

+12-16
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
191191
) -> Option<RegionName> {
192192
debug!("give_region_a_name(fr={:?}, counter={:?})", fr, renctx.counter);
193193

194-
assert!(self.nonlexical_regioncx.universal_regions().is_universal_region(fr));
194+
assert!(self.regioncx.universal_regions().is_universal_region(fr));
195195

196196
if let Some(value) = renctx.get(&fr) {
197197
return Some(value.clone());
@@ -277,7 +277,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
277277
.hir()
278278
.as_local_hir_id(self.mir_def_id)
279279
.expect("non-local mir");
280-
let def_ty = self.nonlexical_regioncx.universal_regions().defining_ty;
280+
let def_ty = self.regioncx.universal_regions().defining_ty;
281281

282282
if let DefiningTy::Closure(def_id, substs) = def_ty {
283283
let args_span = if let hir::ExprKind::Closure(_, _, _, span, _) =
@@ -344,12 +344,10 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
344344
fr: RegionVid,
345345
renctx: &mut RegionErrorNamingCtx,
346346
) -> Option<RegionName> {
347-
let implicit_inputs =
348-
self.nonlexical_regioncx.universal_regions().defining_ty.implicit_inputs();
349-
let argument_index =
350-
self.nonlexical_regioncx.get_argument_index_for_region(self.infcx.tcx, fr)?;
347+
let implicit_inputs = self.regioncx.universal_regions().defining_ty.implicit_inputs();
348+
let argument_index = self.regioncx.get_argument_index_for_region(self.infcx.tcx, fr)?;
351349

352-
let arg_ty = self.nonlexical_regioncx.universal_regions().unnormalized_input_tys
350+
let arg_ty = self.regioncx.universal_regions().unnormalized_input_tys
353351
[implicit_inputs + argument_index];
354352
if let Some(region_name) =
355353
self.give_name_if_we_can_match_hir_ty_from_argument(fr, arg_ty, argument_index, renctx)
@@ -415,10 +413,9 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
415413
);
416414
let assigned_region_name = if type_name.find(&format!("'{}", counter)).is_some() {
417415
// Only add a label if we can confirm that a region was labelled.
418-
let argument_index = self
419-
.nonlexical_regioncx
420-
.get_argument_index_for_region(self.infcx.tcx, needle_fr)?;
421-
let (_, span) = self.nonlexical_regioncx.get_argument_name_and_span_for_region(
416+
let argument_index =
417+
self.regioncx.get_argument_index_for_region(self.infcx.tcx, needle_fr)?;
418+
let (_, span) = self.regioncx.get_argument_name_and_span_for_region(
422419
&self.body,
423420
&self.local_names,
424421
argument_index,
@@ -658,9 +655,8 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
658655
fr: RegionVid,
659656
renctx: &mut RegionErrorNamingCtx,
660657
) -> Option<RegionName> {
661-
let upvar_index =
662-
self.nonlexical_regioncx.get_upvar_index_for_region(self.infcx.tcx, fr)?;
663-
let (upvar_name, upvar_span) = self.nonlexical_regioncx.get_upvar_name_and_span_for_region(
658+
let upvar_index = self.regioncx.get_upvar_index_for_region(self.infcx.tcx, fr)?;
659+
let (upvar_name, upvar_span) = self.regioncx.get_upvar_name_and_span_for_region(
664660
self.infcx.tcx,
665661
&self.upvars,
666662
upvar_index,
@@ -684,7 +680,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
684680
) -> Option<RegionName> {
685681
let tcx = self.infcx.tcx;
686682

687-
let return_ty = self.nonlexical_regioncx.universal_regions().unnormalized_output_ty;
683+
let return_ty = self.regioncx.universal_regions().unnormalized_output_ty;
688684
debug!("give_name_if_anonymous_region_appears_in_output: return_ty = {:?}", return_ty);
689685
if !tcx.any_free_region_meets(&return_ty, |r| r.to_region_vid() == fr) {
690686
return None;
@@ -734,7 +730,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
734730
) -> Option<RegionName> {
735731
// Note: generators from `async fn` yield `()`, so we don't have to
736732
// worry about them here.
737-
let yield_ty = self.nonlexical_regioncx.universal_regions().yield_ty?;
733+
let yield_ty = self.regioncx.universal_regions().yield_ty?;
738734
debug!("give_name_if_anonymous_region_appears_in_yield_ty: yield_ty = {:?}", yield_ty,);
739735

740736
let tcx = self.infcx.tcx;

‎src/librustc_mir/borrow_check/mod.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ fn do_mir_borrowck<'a, 'tcx>(
283283
move_error_reported: BTreeMap::new(),
284284
uninitialized_error_reported: Default::default(),
285285
errors_buffer,
286-
nonlexical_regioncx: regioncx,
286+
regioncx,
287287
used_mut: Default::default(),
288288
used_mut_upvars: SmallVec::new(),
289289
borrow_set,
@@ -474,10 +474,9 @@ crate struct MirBorrowckCtxt<'cx, 'tcx> {
474474
/// If the function we're checking is a closure, then we'll need to report back the list of
475475
/// mutable upvars that have been used. This field keeps track of them.
476476
used_mut_upvars: SmallVec<[Field; 8]>,
477-
/// Non-lexical region inference context, if NLL is enabled. This
478-
/// contains the results from region inference and lets us e.g.
477+
/// Region inference context. This contains the results from region inference and lets us e.g.
479478
/// find out which CFG points are contained in each borrow region.
480-
nonlexical_regioncx: Rc<RegionInferenceContext<'tcx>>,
479+
regioncx: Rc<RegionInferenceContext<'tcx>>,
481480

482481
/// The set of borrows extracted from the MIR
483482
borrow_set: Rc<BorrowSet<'tcx>>,

0 commit comments

Comments
 (0)