From 648f491977546945afa31587390041d3fdb17c61 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Wed, 7 Nov 2018 13:29:38 +0100 Subject: [PATCH] Enable feature gate extern_crate_item_prelude --- src/abi.rs | 4 ++-- src/allocator.rs | 4 ++-- src/analyze.rs | 2 +- src/base.rs | 2 +- src/common.rs | 2 +- src/constant.rs | 15 +++++++++------ src/lib.rs | 40 +++++++++++++++++++--------------------- src/main_shim.rs | 4 ++-- src/metadata.rs | 4 ++-- 9 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/abi.rs b/src/abi.rs index 24645279f97..217064e51b8 100644 --- 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 72ddf5312bd..72f1046a56b 100644 --- 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, kind: AllocatorKind) { let usize_ty = module.target_config().pointer_type(); diff --git a/src/analyze.rs b/src/analyze.rs index c8b4697bec9..bdb40411ffa 100644 --- 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 3d4112dba10..6c55e12fde7 100644 --- 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 f642384634a..8b3c019691e 100644 --- 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 c7a6b971041..f66abe052a5 100644 --- 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 013dbc510d8..c7b09c22a8b 100644 --- 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 @@ extern crate target_lexicon; 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 f96f353cac9..ef9409f4bb2 100644 --- 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, ) { - 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 1e68e9f1363..bbcbd083fa7 100644 --- 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;