Skip to content

Commit e2230a4

Browse files
committed
appease the vociferous tidy
1 parent 720716f commit e2230a4

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

src/librustc_mir/borrow_check/nll/mod.rs

+13-3
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,10 @@ pub(in crate::borrow_check) fn compute_regions<'cx, 'tcx>(
235235
// `known_subset` facts.
236236
for (fr1, fr2) in universal_region_relations.known_outlives() {
237237
if fr1 != fr2 {
238-
debug!("compute_regions: emitting polonius `known_subset` fr1={:?}, fr2={:?}", fr1, fr2);
238+
debug!(
239+
"compute_regions: emitting polonius `known_subset` fr1={:?}, fr2={:?}",
240+
fr1, fr2
241+
);
239242
all_facts.known_subset.push((*fr1, *fr2));
240243
}
241244
}
@@ -314,8 +317,15 @@ pub(in crate::borrow_check) fn compute_regions<'cx, 'tcx>(
314317
});
315318

316319
// Solve the region constraints.
317-
let closure_region_requirements =
318-
regioncx.solve(infcx, &body, local_names, upvars, def_id, errors_buffer, polonius_output.clone());
320+
let closure_region_requirements = regioncx.solve(
321+
infcx,
322+
&body,
323+
local_names,
324+
upvars,
325+
def_id,
326+
errors_buffer,
327+
polonius_output.clone(),
328+
);
319329

320330
// Dump MIR results into a file, if that is enabled. This let us
321331
// write unit-tests, as well as helping with debugging.

src/librustc_mir/borrow_check/nll/region_infer/mod.rs

+9-4
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,10 @@ impl<'tcx> RegionInferenceContext<'tcx> {
14261426
region_naming: &mut RegionErrorNamingCtx,
14271427
polonius_output: Rc<PoloniusOutput>,
14281428
) {
1429-
debug!("check_polonius_subset_errors: {} subset_errors", polonius_output.subset_errors.len());
1429+
debug!(
1430+
"check_polonius_subset_errors: {} subset_errors",
1431+
polonius_output.subset_errors.len()
1432+
);
14301433

14311434
let mut outlives_suggestion = OutlivesSuggestionBuilder::new(mir_def_id, local_names);
14321435

@@ -1647,10 +1650,12 @@ impl<'tcx> RegionInferenceContext<'tcx> {
16471650
// Grow `shorter_fr` until we find some non-local regions. (We
16481651
// always will.) We'll call them `shorter_fr+` -- they're ever
16491652
// so slightly larger than `shorter_fr`.
1650-
let shorter_fr_plus =
1651-
self.universal_region_relations.non_local_upper_bounds(&shorter_fr);
1653+
let shorter_fr_plus = self
1654+
.universal_region_relations
1655+
.non_local_upper_bounds(&shorter_fr);
16521656
debug!(
1653-
"report_or_propagate_universal_region_error: shorter_fr_plus={:?}", shorter_fr_plus
1657+
"report_or_propagate_universal_region_error: shorter_fr_plus={:?}",
1658+
shorter_fr_plus
16541659
);
16551660
for &&fr in &shorter_fr_plus {
16561661
// Push the constraint `fr-: shorter_fr+`

0 commit comments

Comments
 (0)