Auto merge of #68258 - RalfJung:miri, r=RalfJung

[rust.git] / src / librustc_passes / layout_test.rs

diff --git a/src/librustc_passes/layout_test.rs b/src/librustc_passes/layout_test.rs
index b0651c980481e3ea792c9614da243e70f2d63be1..be3e1f4738234867574bcb61962c34fdbfc96946 100644 (file)
--- a/src/librustc_passes/layout_test.rs
+++ b/src/librustc_passes/layout_test.rs
@@ -1,7 +1,3 @@
-use rustc::hir;
-use rustc::hir::def_id::DefId;
-use rustc::hir::itemlikevisit::ItemLikeVisitor;
-use rustc::hir::ItemKind;
 use rustc::ty::layout::HasDataLayout;
 use rustc::ty::layout::HasParamEnv;
 use rustc::ty::layout::HasTyCtxt;
@@ -11,8 +7,12 @@
 use rustc::ty::ParamEnv;
 use rustc::ty::Ty;
 use rustc::ty::TyCtxt;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_hir::itemlikevisit::ItemLikeVisitor;
+use rustc_hir::ItemKind;
+use rustc_span::symbol::sym;
 use syntax::ast::Attribute;
-use syntax::symbol::sym;
 
 pub fn test_layout(tcx: TyCtxt<'_>) {
     if tcx.features().rustc_attrs {