Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove reexport of rustc::ty::Instance
  • Loading branch information
mark-i-m committed Jun 3, 2019
1 parent 607aadc commit 8af151b
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 29 deletions.
3 changes: 1 addition & 2 deletions src/librustc_codegen_llvm/callee.rs
Expand Up @@ -6,12 +6,11 @@

use crate::attributes;
use crate::llvm;
use crate::monomorphize::Instance;
use crate::context::CodegenCx;
use crate::value::Value;
use rustc_codegen_ssa::traits::*;

use rustc::ty::TypeFoldable;
use rustc::ty::{TypeFoldable, Instance};
use rustc::ty::layout::{LayoutOf, HasTyCtxt};

/// Codegens a reference to a fn/method item, monomorphizing and
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_llvm/consts.rs
Expand Up @@ -2,7 +2,6 @@ use crate::llvm::{self, SetUnnamedAddr, True};
use crate::debuginfo;
use crate::monomorphize::MonoItem;
use crate::common::CodegenCx;
use crate::monomorphize::Instance;
use crate::base;
use crate::type_::Type;
use crate::type_of::LayoutLlvmExt;
Expand All @@ -16,7 +15,7 @@ use syntax_pos::Span;
use rustc_target::abi::HasDataLayout;
use syntax::symbol::sym;
use syntax_pos::symbol::LocalInternedString;
use rustc::ty::{self, Ty};
use rustc::ty::{self, Ty, Instance};
use rustc_codegen_ssa::traits::*;

use rustc::ty::layout::{self, Size, Align, LayoutOf};
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_llvm/context.rs
@@ -1,7 +1,6 @@
use crate::attributes;
use crate::llvm;
use crate::debuginfo;
use crate::monomorphize::Instance;
use crate::value::Value;
use rustc::dep_graph::DepGraphSafe;
use rustc::hir;
Expand All @@ -17,7 +16,7 @@ use rustc::session::Session;
use rustc::ty::layout::{
LayoutError, LayoutOf, PointeeInfo, Size, TyLayout, VariantIdx, HasParamEnv
};
use rustc::ty::{self, Ty, TyCtxt};
use rustc::ty::{self, Ty, TyCtxt, Instance};
use rustc::util::nodemap::FxHashMap;
use rustc_target::spec::{HasTargetSpec, Target};
use rustc_codegen_ssa::callee::resolve_and_get_fn;
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_llvm/debuginfo/mod.rs
Expand Up @@ -20,9 +20,8 @@ use rustc::ty::subst::{SubstsRef, UnpackedKind};
use crate::abi::Abi;
use crate::common::CodegenCx;
use crate::builder::Builder;
use crate::monomorphize::Instance;
use crate::value::Value;
use rustc::ty::{self, ParamEnv, Ty, InstanceDef};
use rustc::ty::{self, ParamEnv, Ty, InstanceDef, Instance};
use rustc::mir;
use rustc::session::config::{self, DebugInfo};
use rustc::util::nodemap::{DefIdMap, FxHashMap, FxHashSet};
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_codegen_llvm/debuginfo/namespace.rs
Expand Up @@ -2,14 +2,14 @@

use super::metadata::{unknown_file_metadata, UNKNOWN_LINE_NUMBER};
use super::utils::{DIB, debug_context};
use crate::monomorphize::Instance;
use rustc::ty;

use crate::llvm;
use crate::llvm::debuginfo::DIScope;
use crate::common::CodegenCx;
use rustc::hir::def_id::DefId;
use rustc::hir::map::DefPathData;
use rustc::ty::Instance;

use rustc_data_structures::small_c_str::SmallCStr;

Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_llvm/mono_item.rs
Expand Up @@ -2,11 +2,10 @@ use crate::attributes;
use crate::base;
use crate::context::CodegenCx;
use crate::llvm;
use crate::monomorphize::Instance;
use crate::type_of::LayoutLlvmExt;
use rustc::hir::def_id::{DefId, LOCAL_CRATE};
use rustc::mir::mono::{Linkage, Visibility};
use rustc::ty::TypeFoldable;
use rustc::ty::{TypeFoldable, Instance};
use rustc::ty::layout::{LayoutOf, HasTyCtxt};
use rustc_codegen_ssa::traits::*;

Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_ssa/base.rs
Expand Up @@ -21,14 +21,13 @@ use rustc::middle::cstore::EncodedMetadata;
use rustc::middle::lang_items::StartFnLangItem;
use rustc::middle::weak_lang_items;
use rustc::mir::mono::CodegenUnitNameBuilder;
use rustc::ty::{self, Ty, TyCtxt};
use rustc::ty::{self, Ty, TyCtxt, Instance};
use rustc::ty::layout::{self, Align, TyLayout, LayoutOf, VariantIdx, HasTyCtxt};
use rustc::ty::query::Providers;
use rustc::middle::cstore::{self, LinkagePreference};
use rustc::util::common::{time, print_time_passes_entry};
use rustc::session::config::{self, EntryFnType, Lto};
use rustc::session::Session;
use rustc_mir::monomorphize::Instance;
use rustc_mir::monomorphize::partitioning::{CodegenUnit, CodegenUnitExt};
use rustc::util::nodemap::FxHashMap;
use rustc_data_structures::indexed_vec::Idx;
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_ssa/mir/mod.rs
@@ -1,8 +1,7 @@
use rustc::ty::{self, Ty, TypeFoldable, UpvarSubsts};
use rustc::ty::{self, Ty, TypeFoldable, UpvarSubsts, Instance};
use rustc::ty::layout::{TyLayout, HasTyCtxt, FnTypeExt};
use rustc::mir::{self, Body};
use rustc::session::config::DebugInfo;
use rustc_mir::monomorphize::Instance;
use rustc_target::abi::call::{FnType, PassMode, IgnoreMode};
use rustc_target::abi::{Variants, VariantIdx};
use crate::base;
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_ssa/traits/debuginfo.rs
Expand Up @@ -2,9 +2,8 @@ use super::BackendTypes;
use crate::debuginfo::{FunctionDebugContext, MirDebugScope, VariableAccess, VariableKind};
use rustc::hir::def_id::CrateNum;
use rustc::mir;
use rustc::ty::{self, Ty};
use rustc::ty::{self, Ty, Instance};
use rustc_data_structures::indexed_vec::IndexVec;
use rustc_mir::monomorphize::Instance;
use syntax::ast::Name;
use syntax_pos::{SourceFile, Span};

Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_ssa/traits/declare.rs
@@ -1,8 +1,7 @@
use super::BackendTypes;
use rustc::hir::def_id::DefId;
use rustc::mir::mono::{Linkage, Visibility};
use rustc::ty;
use rustc_mir::monomorphize::Instance;
use rustc::ty::{self, Instance};

pub trait DeclareMethods<'tcx>: BackendTypes {
/// Declare a global value.
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_utils/symbol_names.rs
Expand Up @@ -92,9 +92,8 @@ use rustc::hir::Node;
use rustc::hir::CodegenFnAttrFlags;
use rustc::session::config::SymbolManglingVersion;
use rustc::ty::query::Providers;
use rustc::ty::{self, TyCtxt};
use rustc::ty::{self, TyCtxt, Instance};
use rustc_mir::monomorphize::item::{InstantiationMode, MonoItem, MonoItemExt};
use rustc_mir::monomorphize::Instance;

use syntax_pos::symbol::InternedString;

Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_utils/symbol_names/legacy.rs
Expand Up @@ -4,10 +4,9 @@ use rustc::ich::NodeIdHashingMode;
use rustc::mir::interpret::{ConstValue, Scalar};
use rustc::ty::print::{PrettyPrinter, Printer, Print};
use rustc::ty::subst::{Kind, UnpackedKind};
use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
use rustc::ty::{self, Ty, TyCtxt, TypeFoldable, Instance};
use rustc::util::common::record_time;
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
use rustc_mir::monomorphize::Instance;

use log::debug;

Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_utils/symbol_names/v0.rs
@@ -1,12 +1,11 @@
use rustc::hir;
use rustc::hir::def_id::{CrateNum, DefId};
use rustc::hir::map::{DefPathData, DisambiguatedDefPathData};
use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
use rustc::ty::{self, Ty, TyCtxt, TypeFoldable, Instance};
use rustc::ty::print::{Printer, Print};
use rustc::ty::subst::{Kind, Subst, UnpackedKind};
use rustc_data_structures::base_n;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_mir::monomorphize::Instance;
use rustc_target::spec::abi::Abi;
use syntax::ast::{IntTy, UintTy, FloatTy};

Expand Down
3 changes: 1 addition & 2 deletions src/librustc_codegen_utils/symbol_names_test.rs
Expand Up @@ -5,8 +5,7 @@
//! paths etc in all kinds of annoying scenarios.

use rustc::hir;
use rustc::ty::TyCtxt;
use rustc_mir::monomorphize::Instance;
use rustc::ty::{TyCtxt, Instance};
use syntax::symbol::{Symbol, sym};

const SYMBOL_NAME: Symbol = sym::rustc_symbol_name;
Expand Down
3 changes: 1 addition & 2 deletions src/librustc_mir/monomorphize/mod.rs
Expand Up @@ -2,9 +2,8 @@ use rustc::hir::def_id::DefId;
use rustc::middle::lang_items::DropInPlaceFnLangItem;
use rustc::traits;
use rustc::ty::adjustment::CustomCoerceUnsized;
use rustc::ty::{self, Ty, TyCtxt};
use rustc::ty::{self, Ty, TyCtxt, Instance};

pub use rustc::ty::Instance;
pub use self::item::{MonoItem, MonoItemExt};

pub mod collector;
Expand Down

0 comments on commit 8af151b

Please sign in to comment.