diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2018-05-03 18:58:49 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2018-05-03 19:10:27 -0400 |
| commit | 63b2e01e85472cededf387e9dffbf2cbac8266e1 (patch) | |
| tree | 6f5d2f429d69e09be0b2e7e7c5f7bf39305edc6f /src | |
| parent | 6a143add9eb6a73a23e570fd3fb42c453497b29a (diff) | |
| download | rust-63b2e01e85472cededf387e9dffbf2cbac8266e1.tar.gz rust-63b2e01e85472cededf387e9dffbf2cbac8266e1.zip | |
rustfmt
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/resolve_lifetime.rs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index ee2e6b092a2..ac4af184038 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -15,28 +15,28 @@ //! used between functions, and they operate in a purely top-down //! way. Therefore we break lifetime name resolution into a separate pass. -use hir::map::Map; use hir::def::Def; use hir::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE}; +use hir::map::Map; use hir::ItemLocalId; use hir::LifetimeName; use ty::{self, TyCtxt}; +use errors::DiagnosticBuilder; +use rustc::lint; +use rustc_data_structures::sync::Lrc; +use session::Session; use std::cell::Cell; use std::mem::replace; -use rustc_data_structures::sync::Lrc; +use std::slice; use syntax::ast; use syntax::attr; use syntax::ptr::P; use syntax_pos::Span; -use errors::DiagnosticBuilder; use util::nodemap::{DefIdMap, FxHashMap, FxHashSet, NodeMap, NodeSet}; -use session::Session; -use std::slice; -use rustc::lint; -use hir::{self, GenericParamsExt}; use hir::intravisit::{self, NestedVisitorMap, Visitor}; +use hir::{self, GenericParamsExt}; /// The origin of a named lifetime definition. /// @@ -2087,8 +2087,9 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> { ); err.emit(); } - hir::LifetimeName::Fresh(_) | hir::LifetimeName::Implicit | - hir::LifetimeName::Name(_) => {} + hir::LifetimeName::Fresh(_) + | hir::LifetimeName::Implicit + | hir::LifetimeName::Name(_) => {} } } @@ -2140,8 +2141,9 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> { )) .emit(); } - hir::LifetimeName::Fresh(_) | hir::LifetimeName::Implicit | - hir::LifetimeName::Name(_) => { + hir::LifetimeName::Fresh(_) + | hir::LifetimeName::Implicit + | hir::LifetimeName::Name(_) => { self.resolve_lifetime_ref(bound); } } |
