Enable feature gate extern_crate_item_prelude

diff --git a/src/abi.rs b/src/abi.rs
index 24645279f97fb17d1a42ffa6760189d11a533919..217064e51b880912dfd3919aeecf3f6a41cf7cb3 100644 (file)
--- a/src/abi.rs
+++ b/src/abi.rs
@@ -1,7 +1,7 @@
 use std::iter;
 
-use crate::rustc::hir;
-use crate::rustc_target::spec::abi::Abi;
+use rustc::hir;
+use rustc_target::spec::abi::Abi;
 
 use crate::prelude::*;
 

diff --git a/src/allocator.rs b/src/allocator.rs
index 72ddf5312bd60a9828e96944d2f5a4401e8a4094..72f1046a56b0c4d7da464a2cf99d94cb72b1c898 100644 (file)
--- a/src/allocator.rs
+++ b/src/allocator.rs
@@ -10,8 +10,8 @@
 
 use crate::prelude::*;
 
-use crate::rustc::middle::allocator::AllocatorKind;
-use crate::rustc_allocator::{ALLOCATOR_METHODS, AllocatorTy};
+use rustc::middle::allocator::AllocatorKind;
+use rustc_allocator::{ALLOCATOR_METHODS, AllocatorTy};
 
 pub fn codegen(tcx: TyCtxt, module: &mut Module<impl Backend + 'static>, kind: AllocatorKind) {
     let usize_ty = module.target_config().pointer_type();

diff --git a/src/analyze.rs b/src/analyze.rs
index c8b4697bec9b15981d8f91d8492cf4ec6e83da80..bdb40411ffa2634612686074ce27f08680fdcfe5 100644 (file)
--- a/src/analyze.rs
+++ b/src/analyze.rs
@@ -1,6 +1,6 @@
 use crate::prelude::*;
 
-use crate::rustc::mir::StatementKind::*;
+use rustc::mir::StatementKind::*;
 
 bitflags! {
     pub struct Flags: u8 {

diff --git a/src/base.rs b/src/base.rs
index 3d4112dba1042a7a2e12f0eaf46a6aaa5b43396e..6c55e12fde78c3b90db49bfc0279e51c614d3ecf 100644 (file)
--- a/src/base.rs
+++ b/src/base.rs
@@ -606,7 +606,7 @@ fn trans_stmt<'a, 'tcx: 'a>(
                     lval.write_cvalue(fx, CValue::ByVal(len, usize_layout));
                 }
                 Rvalue::NullaryOp(NullOp::Box, content_ty) => {
-                    use crate::rustc::middle::lang_items::ExchangeMallocFnLangItem;
+                    use rustc::middle::lang_items::ExchangeMallocFnLangItem;
 
                     let usize_type = fx.cton_type(fx.tcx.types.usize).unwrap();
                     let (size, align) = fx.layout_of(content_ty).size_and_align();

diff --git a/src/common.rs b/src/common.rs
index f642384634af0232a893bca894f3d3377c36e9ad..8b3c019691e86d68f50c32212439790f8ca37321 100644 (file)
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use crate::rustc_target::spec::{HasTargetSpec, Target};
+use rustc_target::spec::{HasTargetSpec, Target};
 
 use cranelift_module::Module;
 

diff --git a/src/constant.rs b/src/constant.rs
index c7a6b971041dbd8829073a5a1f6b7c2f4b030587..f66abe052a595df23ecc17e5a2ef4c799e92edb6 100644 (file)
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -1,11 +1,14 @@
-use cranelift_module::*;
-use crate::prelude::*;
-use crate::rustc::mir::interpret::{
+use std::borrow::Cow;
+
+use rustc::mir::interpret::{
     read_target_uint, AllocId, AllocType, Allocation, ConstValue, EvalResult, GlobalId, Scalar,
 };
-use crate::rustc::ty::Const;
-use crate::rustc_mir::interpret::{EvalContext, Machine, Memory, MemoryKind, MemPlace, OpTy, PlaceTy, Pointer};
-use std::borrow::Cow;
+use rustc::ty::Const;
+use rustc_mir::interpret::{EvalContext, Machine, Memory, MemoryKind, MemPlace, OpTy, PlaceTy, Pointer};
+
+use cranelift_module::*;
+
+use crate::prelude::*;
 
 #[derive(Default)]
 pub struct ConstantCx {

diff --git a/src/lib.rs b/src/lib.rs
index 013dbc510d82667710390f0b58f19f2213667489..c7b09c22a8b477c949737b8fb4bbd56721aa62dc 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_private, macro_at_most_once_rep, never_type)]
+#![feature(rustc_private, macro_at_most_once_rep, never_type, extern_crate_item_prelude)]
 #![allow(intra_doc_link_resolution_failure)]
 
 extern crate byteorder;
@@ -26,15 +26,15 @@
 
 use std::any::Any;
 use std::fs::File;
-use std::sync::{mpsc, Arc};
+use std::sync::mpsc;
 
-use crate::rustc::dep_graph::DepGraph;
-use crate::rustc::middle::cstore::MetadataLoader;
-use crate::rustc::session::{config::OutputFilenames, CompileIncomplete};
-use crate::rustc::ty::query::Providers;
-use crate::rustc_codegen_utils::codegen_backend::CodegenBackend;
-use crate::rustc_codegen_utils::link::out_filename;
-use crate::syntax::symbol::Symbol;
+use rustc::dep_graph::DepGraph;
+use rustc::middle::cstore::MetadataLoader;
+use rustc::session::{config::OutputFilenames, CompileIncomplete};
+use rustc::ty::query::Providers;
+use rustc_codegen_utils::codegen_backend::CodegenBackend;
+use rustc_codegen_utils::link::out_filename;
+use syntax::symbol::Symbol;
 
 use cranelift::codegen::settings;
 use cranelift_faerie::*;
@@ -63,24 +63,22 @@ mod prelude {
     pub use std::any::Any;
     pub use std::collections::{HashMap, HashSet};
 
-    pub use crate::rustc::hir::def_id::{DefId, LOCAL_CRATE};
-    pub use crate::rustc::mir;
-    pub use crate::rustc::mir::interpret::AllocId;
-    pub use crate::rustc::mir::*;
-    pub use crate::rustc::session::{config::CrateType, Session};
-    pub use crate::rustc::ty::layout::{self, Abi, LayoutOf, Scalar, Size, TyLayout};
-    pub use crate::rustc::ty::{
+    pub use rustc::hir::def_id::{DefId, LOCAL_CRATE};
+    pub use rustc::mir::{self, interpret::AllocId, *};
+    pub use rustc::session::{config::CrateType, Session};
+    pub use rustc::ty::layout::{self, Abi, LayoutOf, Scalar, Size, TyLayout};
+    pub use rustc::ty::{
         self, subst::Substs, FnSig, Instance, InstanceDef, ParamEnv, PolyFnSig, Ty, TyCtxt,
         TypeAndMut, TypeFoldable,
     };
-    pub use crate::rustc_data_structures::{
+    pub use rustc_data_structures::{
         fx::{FxHashMap, FxHashSet},
         indexed_vec::Idx,
         sync::Lrc,
     };
-    pub use crate::rustc_mir::monomorphize::{collector, MonoItem};
-    pub use crate::syntax::ast::{FloatTy, IntTy, UintTy};
-    pub use crate::syntax::source_map::DUMMY_SP;
+    pub use rustc_mir::monomorphize::{collector, MonoItem};
+    pub use syntax::ast::{FloatTy, IntTy, UintTy};
+    pub use syntax::source_map::DUMMY_SP;
 
     pub use cranelift::codegen::isa::CallConv;
     pub use cranelift::codegen::ir::{
@@ -379,7 +377,7 @@ fn codegen_mono_items<'a, 'tcx: 'a>(
     let any_dynamic_crate = tcx.sess.dependency_formats.borrow()
         .iter()
         .any(|(_, list)| {
-            use crate::rustc::middle::dependency_format::Linkage;
+            use rustc::middle::dependency_format::Linkage;
             list.iter().any(|&linkage| linkage == Linkage::Dynamic)
         });
     if any_dynamic_crate {

diff --git a/src/main_shim.rs b/src/main_shim.rs
index f96f353cac95d23dd5f630f3823d0f373937a145..ef9409f4bb25d319b6f412e0e7214000973ef36c 100644 (file)
--- a/src/main_shim.rs
+++ b/src/main_shim.rs
@@ -6,8 +6,8 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx: 'a>(
     tcx: TyCtxt<'a, 'tcx, 'tcx>,
     module: &mut Module<impl Backend + 'static>,
 ) {
-    use crate::rustc::middle::lang_items::StartFnLangItem;
-    use crate::rustc::session::config::EntryFnType;
+    use rustc::middle::lang_items::StartFnLangItem;
+    use rustc::session::config::EntryFnType;
 
     let (main_def_id, use_start_lang_item) = match *tcx.sess.entry_fn.borrow() {
         Some((id, _, entry_ty)) => (

diff --git a/src/metadata.rs b/src/metadata.rs
index 1e68e9f1363a9a9c594f1cb50873b7235c7ad7c1..bbcbd083fa7e16d94f00c0eb2ae0840406488bc5 100644 (file)
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -1,5 +1,5 @@
-use crate::rustc::middle::cstore::MetadataLoader;
-use crate::rustc_data_structures::owning_ref::{self, OwningRef};
+use rustc::middle::cstore::MetadataLoader;
+use rustc_data_structures::owning_ref::{self, OwningRef};
 use std::fs::File;
 use std::path::Path;