Skip to content

Commit 63b2e01

Browse files
committed
rustfmt
1 parent 6a143ad commit 63b2e01

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

src/librustc/middle/resolve_lifetime.rs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@
1515
//! used between functions, and they operate in a purely top-down
1616
//! way. Therefore we break lifetime name resolution into a separate pass.
1717
18-
use hir::map::Map;
1918
use hir::def::Def;
2019
use hir::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE};
20+
use hir::map::Map;
2121
use hir::ItemLocalId;
2222
use hir::LifetimeName;
2323
use ty::{self, TyCtxt};
2424

25+
use errors::DiagnosticBuilder;
26+
use rustc::lint;
27+
use rustc_data_structures::sync::Lrc;
28+
use session::Session;
2529
use std::cell::Cell;
2630
use std::mem::replace;
27-
use rustc_data_structures::sync::Lrc;
31+
use std::slice;
2832
use syntax::ast;
2933
use syntax::attr;
3034
use syntax::ptr::P;
3135
use syntax_pos::Span;
32-
use errors::DiagnosticBuilder;
3336
use util::nodemap::{DefIdMap, FxHashMap, FxHashSet, NodeMap, NodeSet};
34-
use session::Session;
35-
use std::slice;
36-
use rustc::lint;
3737

38-
use hir::{self, GenericParamsExt};
3938
use hir::intravisit::{self, NestedVisitorMap, Visitor};
39+
use hir::{self, GenericParamsExt};
4040

4141
/// The origin of a named lifetime definition.
4242
///
@@ -2087,8 +2087,9 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
20872087
);
20882088
err.emit();
20892089
}
2090-
hir::LifetimeName::Fresh(_) | hir::LifetimeName::Implicit |
2091-
hir::LifetimeName::Name(_) => {}
2090+
hir::LifetimeName::Fresh(_)
2091+
| hir::LifetimeName::Implicit
2092+
| hir::LifetimeName::Name(_) => {}
20922093
}
20932094
}
20942095

@@ -2140,8 +2141,9 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
21402141
))
21412142
.emit();
21422143
}
2143-
hir::LifetimeName::Fresh(_) | hir::LifetimeName::Implicit |
2144-
hir::LifetimeName::Name(_) => {
2144+
hir::LifetimeName::Fresh(_)
2145+
| hir::LifetimeName::Implicit
2146+
| hir::LifetimeName::Name(_) => {
21452147
self.resolve_lifetime_ref(bound);
21462148
}
21472149
}

0 commit comments

Comments
 (0)