OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

always create a category, even it is just "boring"

Browse Source
This commit is contained in:
Niko Matsakis 2018-07-03 11:37:37 -04:00
parent aae177e005
commit 8b3ce9ca68
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc_mir/borrow_check/nll/region_infer/error_reporting/mod.rs
View File

@ -140,13 +140,13 @@ impl<'tcx> RegionInferenceContext<'tcx> {
&self,
index: ConstraintIndex,
mir: &Mir<'tcx>,
) -> Option<(ConstraintCategory, Span)> {
) -> (ConstraintCategory, Span) {
let constraint = self.constraints[index];
let span = constraint.locations.span(mir);
let location = constraint.locations.from_location()?;
let location = constraint.locations.from_location().unwrap_or(Location::START);
if !self.constraint_is_interesting(index) {
return Some((ConstraintCategory::Boring, span));
return (ConstraintCategory::Boring, span);
}
let data = &mir[location.block];
@ -178,7 +178,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
}
};
Some((category, span))
(category, span)
}
/// Report an error because the universal region `fr` was required to outlive
@ -231,7 +231,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
// Classify each of the constraints along the path.
let mut categorized_path: Vec<(ConstraintCategory, Span)> = path.iter()
.filter_map(|&index| self.classify_constraint(index, mir))
.map(|&index| self.classify_constraint(index, mir))
.collect();
debug!("report_error: categorized_path={:?}", categorized_path);