bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

adopt longer and shorter rather than fr and outlived_fr

Browse source
This commit is contained in:
Niko Matsakis 2017-12-04 10:49:40 -05:00
parent ab2bc9f073
commit a6adc74e87
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -322,37 +322,39 @@ impl<'tcx> RegionInferenceContext<'tcx> {
fn check_free_region( fn check_free_region(
&self, &self,
infcx: &InferCtxt<'_, '_, 'tcx>, infcx: &InferCtxt<'_, '_, 'tcx>,
fr: RegionVid, longer_fr: RegionVid,
fr_definition: &RegionDefinition<'tcx>, longer_definition: &RegionDefinition<'tcx>,
) { ) {
let inferred_values = self.inferred_values.as_ref().unwrap(); let inferred_values = self.inferred_values.as_ref().unwrap();
let fr_name = fr_definition.name.unwrap(); let longer_name = longer_definition.name.unwrap();
let fr_value = inferred_values.iter(fr.index()); let longer_value = inferred_values.iter(longer_fr.index());
// Find every region `shorter` such that `longer: shorter`
// (because `longer` includes `end(shorter)`).
for shorter_fr in longer_value.take_while(|&i| i < self.num_universal_regions) {
let shorter_fr = RegionVid::new(shorter_fr);
// Find every region `o` such that `fr: o`
// (because `fr` includes `end(o)`).
for outlived_fr in fr_value.take_while(|&i| i < self.num_universal_regions) {
// `fr` includes `end(fr)`, that's not especially // `fr` includes `end(fr)`, that's not especially
// interesting. // interesting.
if fr.index() == outlived_fr { if longer_fr == shorter_fr {
continue; continue;
} }
let outlived_fr_definition = &self.definitions[RegionVid::new(outlived_fr)]; let shorter_definition = &self.definitions[shorter_fr];
let outlived_fr_name = outlived_fr_definition.name.unwrap(); let shorter_name = shorter_definition.name.unwrap();
// Check that `o <= fr`. If not, report an error. // Check that `o <= fr`. If not, report an error.
if !self.free_region_map if !self.free_region_map
.sub_free_regions(outlived_fr_name, fr_name) .sub_free_regions(shorter_name, longer_name)
{ {
// FIXME: worst error msg ever // FIXME: worst error msg ever
let blame_span = self.blame_span(fr, RegionVid::new(outlived_fr)); let blame_span = self.blame_span(longer_fr, shorter_fr);
infcx.tcx.sess.span_err( infcx.tcx.sess.span_err(
blame_span, blame_span,
&format!( &format!(
"free region `{}` does not outlive `{}`", "free region `{}` does not outlive `{}`",
fr_name, longer_name,
outlived_fr_name shorter_name
), ),
); );
} }