Rollup merge of #70762 - RalfJung:miri-leak-check, r=oli-obk

[rust.git] / src / librustc_metadata / creader.rs

diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 1f551583b0c863fbf0cc20159c734040c912fda6..3e5d7b8efd530a5d31341446639ca9a62f3af454 100644 (file)
--- a/src/librustc_metadata/creader.rs
+++ b/src/librustc_metadata/creader.rs
@@ -3,10 +3,6 @@
 use crate::locator::{CrateLocator, CratePaths};
 use crate::rmeta::{CrateDep, CrateMetadata, CrateNumMap, CrateRoot, MetadataBlob};
 
-use rustc::hir::map::Definitions;
-use rustc::middle::cstore::DepKind;
-use rustc::middle::cstore::{CrateSource, ExternCrate, ExternCrateSource, MetadataLoaderDyn};
-use rustc::ty::TyCtxt;
 use rustc_ast::expand::allocator::{global_allocator_spans, AllocatorKind};
 use rustc_ast::{ast, attr};
 use rustc_data_structures::svh::Svh;
@@ -14,7 +10,13 @@
 use rustc_errors::struct_span_err;
 use rustc_expand::base::SyntaxExtension;
 use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
+use rustc_hir::definitions::Definitions;
 use rustc_index::vec::IndexVec;
+use rustc_middle::middle::cstore::DepKind;
+use rustc_middle::middle::cstore::{
+    CrateSource, ExternCrate, ExternCrateSource, MetadataLoaderDyn,
+};
+use rustc_middle::ty::TyCtxt;
 use rustc_session::config;
 use rustc_session::output::validate_crate_name;
 use rustc_session::search_paths::PathKind;