bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Pick one possible lifetime in case there are multiple choices

Browse source
This commit is contained in:
Oli Scherer 2021-09-28 16:24:13 +00:00
parent 83f147b3ba
commit 87a4a79554
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_borrowck/src/region_infer/opaque_types.rs
View file

@ -124,7 +124,22 @@ impl<'tcx> RegionInferenceContext<'tcx> {
ty::ReVar(vid) => {
// Find something that we can name
let upper_bound = self.approx_universal_upper_bound(vid);
self.definitions[upper_bound].external_name.unwrap_or(region)
let upper_bound = &self.definitions[upper_bound];
match upper_bound.external_name {
Some(reg) => reg,
None => {
// Nothing exact found, so we pick the first one that we find.
let scc = self.constraint_sccs.scc(vid);
for vid in self.rev_scc_graph.as_ref().unwrap().upper_bounds(scc) {
match self.definitions[vid].external_name {
None => {}
Some(&ty::ReStatic) => {}
Some(region) => return region,
}
}
region
}
}
}
_ => region,
})