Rollup merge of #68504 - tmiasko:check-pass, r=alexcrichton

[rust.git] / src / librustc_traits / dropck_outlives.rs

diff --git a/src/librustc_traits/dropck_outlives.rs b/src/librustc_traits/dropck_outlives.rs
index 39557c22ce80b3ab164ffa77ce95b78350974ab3..bc4d03cca7fee5fce728cc800f5c2a3399c5a9a1 100644 (file)
--- a/src/librustc_traits/dropck_outlives.rs
+++ b/src/librustc_traits/dropck_outlives.rs
@@ -1,4 +1,3 @@
-use rustc::hir::def_id::DefId;
 use rustc::infer::canonical::{Canonical, QueryResponse};
 use rustc::traits::query::dropck_outlives::trivial_dropck_outlives;
 use rustc::traits::query::dropck_outlives::{DropckOutlivesResult, DtorckConstraint};
@@ -7,8 +6,9 @@
 use rustc::ty::query::Providers;
 use rustc::ty::subst::{InternalSubsts, Subst};
 use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt};
-use rustc::util::nodemap::FxHashSet;
-use syntax::source_map::{Span, DUMMY_SP};
+use rustc_data_structures::fx::FxHashSet;
+use rustc_hir::def_id::DefId;
+use rustc_span::source_map::{Span, DUMMY_SP};
 
 crate fn provide(p: &mut Providers<'_>) {
     *p = Providers { dropck_outlives, adt_dtorck_constraint, ..*p };