user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

appease the vociferous tidy

Browse source
This commit is contained in:
Remy Rakic 2019-12-02 19:37:24 +01:00
parent 720716f9d0
commit e2230a4366
2 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/librustc_mir/borrow_check/nll/mod.rs
View file

@ -235,7 +235,10 @@ pub(in crate::borrow_check) fn compute_regions<'cx, 'tcx>(
// `known_subset` facts.
for (fr1, fr2) in universal_region_relations.known_outlives() {
if fr1 != fr2 {
debug!("compute_regions: emitting polonius `known_subset` fr1={:?}, fr2={:?}", fr1, fr2);
debug!(
"compute_regions: emitting polonius `known_subset` fr1={:?}, fr2={:?}",
fr1, fr2
);
all_facts.known_subset.push((*fr1, *fr2));
}
}
@ -314,8 +317,15 @@ pub(in crate::borrow_check) fn compute_regions<'cx, 'tcx>(
});
// Solve the region constraints.
let closure_region_requirements =
regioncx.solve(infcx, &body, local_names, upvars, def_id, errors_buffer, polonius_output.clone());
let closure_region_requirements = regioncx.solve(
infcx,
&body,
local_names,
upvars,
def_id,
errors_buffer,
polonius_output.clone(),
);
// Dump MIR results into a file, if that is enabled. This let us
// write unit-tests, as well as helping with debugging.

13
src/librustc_mir/borrow_check/nll/region_infer/mod.rs
View file

@ -1426,7 +1426,10 @@ impl<'tcx> RegionInferenceContext<'tcx> {
region_naming: &mut RegionErrorNamingCtx,
polonius_output: Rc<PoloniusOutput>,
) {
debug!("check_polonius_subset_errors: {} subset_errors", polonius_output.subset_errors.len());
debug!(
"check_polonius_subset_errors: {} subset_errors",
polonius_output.subset_errors.len()
);
let mut outlives_suggestion = OutlivesSuggestionBuilder::new(mir_def_id, local_names);
@ -1647,10 +1650,12 @@ impl<'tcx> RegionInferenceContext<'tcx> {
// Grow `shorter_fr` until we find some non-local regions. (We
// always will.) We'll call them `shorter_fr+` -- they're ever
// so slightly larger than `shorter_fr`.
let shorter_fr_plus =
self.universal_region_relations.non_local_upper_bounds(&shorter_fr);
let shorter_fr_plus = self
.universal_region_relations
.non_local_upper_bounds(&shorter_fr);
debug!(
"report_or_propagate_universal_region_error: shorter_fr_plus={:?}", shorter_fr_plus
"report_or_propagate_universal_region_error: shorter_fr_plus={:?}",
shorter_fr_plus
);
for &&fr in &shorter_fr_plus {
// Push the constraint `fr-: shorter_fr+`