bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use Set1<Region> instead of Option<Region>

Browse source
This commit is contained in:
Taiki Endo 2019-05-29 18:50:24 +09:00
parent 7b9a65ea6a
commit 2f64404ba3
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/librustc/middle/resolve_lifetime.rs
View file

@ -2149,7 +2149,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
struct SelfVisitor<'a> {
map: &'a NamedRegionMap,
impl_self: Option<&'a hir::TyKind>,
lifetime: Option<Region>,
lifetime: Set1<Region>,
}
impl SelfVisitor<'_> {
@ -2193,8 +2193,9 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
if let hir::TyKind::Path(hir::QPath::Resolved(None, ref path)) = mt.ty.node
{
if self.is_self_ty(path.res) {
self.lifetime = self.map.defs.get(&lifetime_ref.hir_id).copied();
return;
if let Some(lifetime) = self.map.defs.get(&lifetime_ref.hir_id) {
self.lifetime.insert(*lifetime);
}
}
}
}
@ -2205,10 +2206,10 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
let mut visitor = SelfVisitor {
map: self.map,
impl_self: impl_self.map(|ty| &ty.node),
lifetime: None,
lifetime: Set1::Empty,
};
visitor.visit_ty(&inputs[0]);
if let Some(lifetime) = visitor.lifetime {
if let Set1::One(lifetime) = visitor.lifetime {
let scope = Scope::Elision {
elide: Elide::Exact(lifetime),
s: self.scope,