bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Tweek best_blame_constraint to slightly prefer specific explanations

Browse source
This commit is contained in:
Matthew Jasper 2018-08-07 21:33:27 +01:00
parent 7710d959f4
commit 372e4aee1d
1 changed files with 6 additions and 4 deletions
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

@ -124,13 +124,15 @@ impl<'tcx> RegionInferenceContext<'tcx> {
let constraint = &self.constraints[path[i]];
let constraint_sup_scc = self.constraint_sccs.scc(constraint.sup);
if constraint_sup_scc == target_scc {
return false;
}
match categorized_path[i].0 {
ConstraintCategory::Boring => false,
_ => true,
ConstraintCategory::Other => {
// other isn't interesting when the two lifetimes
// are unified.
constraint_sup_scc != self.constraint_sccs.scc(constraint.sub)
}
_ => constraint_sup_scc != target_scc,
}
});
if let Some(i) = best_choice {