mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rustc -> rustc_middle part 2

Browse source
This commit is contained in:
Mazdak Farrokhzad 2020-03-29 16:41:09 +02:00
parent 7710f2dd5c
commit 0cb9e36090
458 changed files with 1519 additions and 1523 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcore/raw.rs
View file

@ -6,7 +6,7 @@
//! They can be used as targets of transmutes in unsafe code for manipulating
//! the raw representations directly.
//!
//! Their definition should always match the ABI defined in `rustc::back::abi`.
//! Their definition should always match the ABI defined in `rustc_target::abi`.
/// The representation of a trait object like `&SomeTrait`.
///

2
src/librustc_attr/builtin.rs
View file

@ -870,7 +870,7 @@ pub fn find_repr_attrs(sess: &ParseSess, attr: &Attribute) -> Vec<ReprAttr> {
let parse_alignment = |node: &ast::LitKind| -> Result<u32, &'static str> {
if let ast::LitKind::Int(literal, ast::LitIntType::Unsuffixed) = node {
if literal.is_power_of_two() {
// rustc::ty::layout::Align restricts align to <= 2^29
// rustc_middle::ty::layout::Align restricts align to <= 2^29
if *literal <= 1 << 29 {
Ok(*literal as u32)
} else {

8
src/librustc_codegen_llvm/abi.rs
View file

@ -5,9 +5,9 @@ use crate::type_::Type;
use crate::type_of::LayoutLlvmExt;
use crate::value::Value;
use rustc::bug;
use rustc::ty::layout::{self};
use rustc::ty::Ty;
use rustc_middle::bug;
use rustc_middle::ty::layout::{self};
use rustc_middle::ty::Ty;
use rustc_codegen_ssa::mir::operand::OperandValue;
use rustc_codegen_ssa::mir::place::PlaceRef;
use rustc_codegen_ssa::traits::*;
@ -17,7 +17,7 @@ use rustc_target::abi::{HasDataLayout, LayoutOf};
use libc::c_uint;
pub use rustc::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
pub use rustc_middle::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
pub use rustc_target::abi::call::*;
pub use rustc_target::spec::abi::Abi;

4
src/librustc_codegen_llvm/allocator.rs
View file

@ -1,7 +1,7 @@
use crate::attributes;
use libc::c_uint;
use rustc::bug;
use rustc::ty::TyCtxt;
use rustc_middle::bug;
use rustc_middle::ty::TyCtxt;
use rustc_ast::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
use crate::llvm::{self, False, True};

8
src/librustc_codegen_llvm/attributes.rs
View file

@ -2,10 +2,10 @@
use std::ffi::CString;
use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc::ty::layout::HasTyCtxt;
use rustc::ty::query::Providers;
use rustc::ty::{self, Ty, TyCtxt};
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc_middle::ty::layout::HasTyCtxt;
use rustc_middle::ty::query::Providers;
use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_codegen_ssa::traits::*;
use rustc_data_structures::const_cstr;
use rustc_data_structures::fx::FxHashMap;

6
src/librustc_codegen_llvm/back/lto.rs
View file

@ -6,9 +6,9 @@ use crate::llvm::archive_ro::ArchiveRO;
use crate::llvm::{self, False, True};
use crate::{LlvmCodegenBackend, ModuleLlvm};
use log::{debug, info};
use rustc::bug;
use rustc::dep_graph::WorkProduct;
use rustc::middle::exported_symbols::SymbolExportLevel;
use rustc_middle::bug;
use rustc_middle::dep_graph::WorkProduct;
use rustc_middle::middle::exported_symbols::SymbolExportLevel;
use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule, ThinShared};
use rustc_codegen_ssa::back::symbol_export;
use rustc_codegen_ssa::back::write::{CodegenContext, FatLTOInput, ModuleConfig};

4
src/librustc_codegen_llvm/back/write.rs
View file

@ -14,8 +14,8 @@ use crate::type_::Type;
use crate::LlvmCodegenBackend;
use crate::ModuleLlvm;
use log::debug;
use rustc::bug;
use rustc::ty::TyCtxt;
use rustc_middle::bug;
use rustc_middle::ty::TyCtxt;
use rustc_codegen_ssa::back::write::{BitcodeSection, CodegenContext, EmitObj, ModuleConfig};
use rustc_codegen_ssa::traits::*;
use rustc_codegen_ssa::{CompiledModule, ModuleCodegen, RLIB_BYTECODE_EXTENSION};

12
src/librustc_codegen_llvm/base.rs
View file

@ -23,12 +23,12 @@ use crate::llvm;
use crate::metadata;
use crate::value::Value;
use rustc::dep_graph;
use rustc::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
use rustc::middle::cstore::EncodedMetadata;
use rustc::middle::exported_symbols;
use rustc::mir::mono::{Linkage, Visibility};
use rustc::ty::TyCtxt;
use rustc_middle::dep_graph;
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
use rustc_middle::middle::cstore::EncodedMetadata;
use rustc_middle::middle::exported_symbols;
use rustc_middle::mir::mono::{Linkage, Visibility};
use rustc_middle::ty::TyCtxt;
use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
use rustc_codegen_ssa::mono_item::MonoItemExt;
use rustc_codegen_ssa::traits::*;

6
src/librustc_codegen_llvm/builder.rs
View file

@ -7,8 +7,6 @@ use crate::type_of::LayoutLlvmExt;
use crate::value::Value;
use libc::{c_char, c_uint};
use log::debug;
use rustc::ty::layout::{self, Align, Size, TyAndLayout};
use rustc::ty::{self, Ty, TyCtxt};
use rustc_codegen_ssa::base::to_immediate;
use rustc_codegen_ssa::common::{IntPredicate, RealPredicate, TypeKind};
use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
@ -18,6 +16,8 @@ use rustc_codegen_ssa::MemFlags;
use rustc_data_structures::const_cstr;
use rustc_data_structures::small_c_str::SmallCStr;
use rustc_hir::def_id::DefId;
use rustc_middle::ty::layout::{self, Align, Size, TyAndLayout};
use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_session::config::{self, Sanitizer};
use rustc_target::spec::{HasTargetSpec, Target};
use std::borrow::Cow;
@ -302,9 +302,9 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
lhs: Self::Value,
rhs: Self::Value,
) -> (Self::Value, Self::Value) {
use rustc::ty::{Int, Uint};
use rustc_ast::ast::IntTy::*;
use rustc_ast::ast::UintTy::*;
use rustc_middle::ty::{Int, Uint};
let new_kind = match ty.kind {
Int(t @ Isize) => Int(t.normalize(self.tcx.sess.target.ptr_width)),

4
src/librustc_codegen_llvm/callee.rs
View file

@ -12,8 +12,8 @@ use crate::value::Value;
use log::debug;
use rustc_codegen_ssa::traits::*;
use rustc::ty::layout::{FnAbiExt, HasTyCtxt};
use rustc::ty::{Instance, TypeFoldable};
use rustc_middle::ty::layout::{FnAbiExt, HasTyCtxt};
use rustc_middle::ty::{Instance, TypeFoldable};
/// Codegens a reference to a fn/method item, monomorphizing and
/// inlining as it goes.

6
src/librustc_codegen_llvm/common.rs
View file

@ -8,13 +8,13 @@ use crate::type_::Type;
use crate::type_of::LayoutLlvmExt;
use crate::value::Value;
use log::debug;
use rustc::bug;
use rustc_codegen_ssa::traits::*;
use rustc_middle::bug;
use crate::consts::const_alloc_to_llvm;
use rustc::mir::interpret::{Allocation, GlobalAlloc, Scalar};
use rustc::ty::layout::{self, HasDataLayout, LayoutOf, Size, TyAndLayout};
use rustc_codegen_ssa::mir::place::PlaceRef;
use rustc_middle::mir::interpret::{Allocation, GlobalAlloc, Scalar};
use rustc_middle::ty::layout::{self, HasDataLayout, LayoutOf, Size, TyAndLayout};
use libc::{c_char, c_uint};

12
src/librustc_codegen_llvm/consts.rs
View file

@ -7,12 +7,12 @@ use crate::type_of::LayoutLlvmExt;
use crate::value::Value;
use libc::c_uint;
use log::debug;
use rustc::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
use rustc::mir::interpret::{read_target_uint, Allocation, ConstValue, ErrorHandled, Pointer};
use rustc::mir::mono::MonoItem;
use rustc::ty::layout::{self, Align, LayoutOf, Size};
use rustc::ty::{self, Instance, Ty};
use rustc::{bug, span_bug};
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
use rustc_middle::mir::interpret::{read_target_uint, Allocation, ConstValue, ErrorHandled, Pointer};
use rustc_middle::mir::mono::MonoItem;
use rustc_middle::ty::layout::{self, Align, LayoutOf, Size};
use rustc_middle::ty::{self, Instance, Ty};
use rustc_middle::{bug, span_bug};
use rustc_codegen_ssa::traits::*;
use rustc_hir as hir;
use rustc_hir::def_id::DefId;

12
src/librustc_codegen_llvm/context.rs
View file

@ -6,18 +6,18 @@ use crate::llvm_util;
use crate::type_::Type;
use crate::value::Value;
use rustc::bug;
use rustc::mir::mono::CodegenUnit;
use rustc::ty::layout::{
HasParamEnv, LayoutError, LayoutOf, PointeeInfo, Size, TyAndLayout, VariantIdx,
};
use rustc::ty::{self, Instance, Ty, TyCtxt};
use rustc_codegen_ssa::base::wants_msvc_seh;
use rustc_codegen_ssa::traits::*;
use rustc_data_structures::base_n;
use rustc_data_structures::const_cstr;
use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::small_c_str::SmallCStr;
use rustc_middle::bug;
use rustc_middle::mir::mono::CodegenUnit;
use rustc_middle::ty::layout::{
HasParamEnv, LayoutError, LayoutOf, PointeeInfo, Size, TyAndLayout, VariantIdx,
};
use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
use rustc_session::config::{self, CFGuard, DebugInfo};
use rustc_session::Session;
use rustc_span::source_map::{Span, DUMMY_SP};

2
src/librustc_codegen_llvm/debuginfo/create_scope_map.rs
View file

@ -6,7 +6,7 @@ use rustc_codegen_ssa::traits::*;
use crate::common::CodegenCx;
use crate::llvm;
use crate::llvm::debuginfo::{DIScope, DISubprogram};
use rustc::mir::{Body, SourceScope};
use rustc_middle::mir::{Body, SourceScope};
use rustc_session::config::DebugInfo;
use rustc_index::bit_set::BitSet;

2
src/librustc_codegen_llvm/debuginfo/gdb.rs
View file

@ -5,7 +5,7 @@ use crate::llvm;
use crate::builder::Builder;
use crate::common::CodegenCx;
use crate::value::Value;
use rustc::bug;
use rustc_middle::bug;
use rustc_codegen_ssa::traits::*;
use rustc_session::config::DebugInfo;

22
src/librustc_codegen_llvm/debuginfo/metadata.rs
View file

@ -20,17 +20,6 @@ use crate::llvm_util;
use crate::value::Value;
use log::debug;
use rustc::ich::NodeIdHashingMode;
use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc::mir::interpret::truncate;
use rustc::mir::{self, Field, GeneratorLayout};
use rustc::ty::layout::{
self, Align, Integer, IntegerExt, LayoutOf, PrimitiveExt, Size, TyAndLayout, VariantIdx,
};
use rustc::ty::subst::{GenericArgKind, SubstsRef};
use rustc::ty::Instance;
use rustc::ty::{self, AdtKind, ParamEnv, Ty, TyCtxt};
use rustc::{bug, span_bug};
use rustc_ast::ast;
use rustc_codegen_ssa::traits::*;
use rustc_data_structures::const_cstr;
@ -41,6 +30,17 @@ use rustc_fs_util::path_to_c_string;
use rustc_hir::def::CtorKind;
use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
use rustc_index::vec::{Idx, IndexVec};
use rustc_middle::ich::NodeIdHashingMode;
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc_middle::mir::interpret::truncate;
use rustc_middle::mir::{self, Field, GeneratorLayout};
use rustc_middle::ty::layout::{
self, Align, Integer, IntegerExt, LayoutOf, PrimitiveExt, Size, TyAndLayout, VariantIdx,
};
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
use rustc_middle::ty::Instance;
use rustc_middle::ty::{self, AdtKind, ParamEnv, Ty, TyCtxt};
use rustc_middle::{bug, span_bug};
use rustc_session::config::{self, DebugInfo};
use rustc_span::symbol::{Interner, Symbol};
use rustc_span::{self, FileName, Span};

8
src/librustc_codegen_llvm/debuginfo/mod.rs
View file

@ -12,15 +12,15 @@ use crate::llvm;
use crate::llvm::debuginfo::{
DIArray, DIBuilder, DIFile, DIFlags, DILexicalBlock, DISPFlags, DIScope, DIType, DIVariable,
};
use rustc::ty::subst::{GenericArgKind, SubstsRef};
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE};
use crate::abi::FnAbi;
use crate::builder::Builder;
use crate::common::CodegenCx;
use crate::value::Value;
use rustc::mir;
use rustc::ty::{self, Instance, ParamEnv, Ty};
use rustc_middle::mir;
use rustc_middle::ty::{self, Instance, ParamEnv, Ty};
use rustc_codegen_ssa::debuginfo::type_names;
use rustc_codegen_ssa::mir::debuginfo::{DebugScope, FunctionDebugContext, VariableKind};
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
@ -31,7 +31,7 @@ use libc::c_uint;
use log::debug;
use std::cell::RefCell;
use rustc::ty::layout::{self, HasTyCtxt, LayoutOf, Size};
use rustc_middle::ty::layout::{self, HasTyCtxt, LayoutOf, Size};
use rustc_ast::ast;
use rustc_codegen_ssa::traits::*;
use rustc_span::symbol::Symbol;

2
src/librustc_codegen_llvm/debuginfo/namespace.rs
View file

@ -1,7 +1,7 @@
// Namespace Handling.
use super::utils::{debug_context, DIB};
use rustc::ty::{self, Instance};
use rustc_middle::ty::{self, Instance};
use crate::common::CodegenCx;
use crate::llvm;

2
src/librustc_codegen_llvm/debuginfo/utils.rs
View file

@ -3,7 +3,7 @@
use super::namespace::item_namespace;
use super::CrateDebugContext;
use rustc::ty::DefIdTree;
use rustc_middle::ty::DefIdTree;
use rustc_hir::def_id::DefId;
use crate::common::CodegenCx;

2
src/librustc_codegen_llvm/declare.rs
View file

@ -19,7 +19,7 @@ use crate::llvm::AttributePlace::Function;
use crate::type_::Type;
use crate::value::Value;
use log::debug;
use rustc::ty::Ty;
use rustc_middle::ty::Ty;
use rustc_codegen_ssa::traits::*;
/// Declare a function.

10
src/librustc_codegen_llvm/intrinsic.rs
View file

@ -7,9 +7,6 @@ use crate::type_::Type;
use crate::type_of::LayoutLlvmExt;
use crate::va_arg::emit_va_arg;
use crate::value::Value;
use rustc::ty::layout::{self, FnAbiExt, HasTyCtxt, LayoutOf, Primitive};
use rustc::ty::{self, Ty};
use rustc::{bug, span_bug};
use rustc_ast::ast;
use rustc_codegen_ssa::base::{compare_simd_types, to_immediate, wants_msvc_seh};
use rustc_codegen_ssa::common::{IntPredicate, TypeKind};
@ -18,6 +15,9 @@ use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
use rustc_codegen_ssa::mir::place::PlaceRef;
use rustc_codegen_ssa::MemFlags;
use rustc_hir as hir;
use rustc_middle::ty::layout::{self, FnAbiExt, HasTyCtxt, LayoutOf, Primitive};
use rustc_middle::ty::{self, Ty};
use rustc_middle::{bug, span_bug};
use rustc_target::abi::HasDataLayout;
use rustc_codegen_ssa::common::span_invalid_monomorphization_error;
@ -1390,8 +1390,8 @@ fn generic_simd_intrinsic(
fn simd_simple_float_intrinsic(
name: &str,
in_elem: &::rustc::ty::TyS<'_>,
in_ty: &::rustc::ty::TyS<'_>,
in_elem: &::rustc_middle::ty::TyS<'_>,
in_ty: &::rustc_middle::ty::TyS<'_>,
in_len: u64,
bx: &mut Builder<'a, 'll, 'tcx>,
span: Span,

8
src/librustc_codegen_llvm/lib.rs
View file

@ -17,10 +17,10 @@
use back::write::{create_informational_target_machine, create_target_machine};
pub use llvm_util::target_features;
use rustc::dep_graph::{DepGraph, WorkProduct};
use rustc::middle::cstore::{EncodedMetadata, MetadataLoaderDyn};
use rustc::ty::{self, TyCtxt};
use rustc::util::common::ErrorReported;
use rustc_middle::dep_graph::{DepGraph, WorkProduct};
use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoaderDyn};
use rustc_middle::ty::{self, TyCtxt};
use rustc_middle::util::common::ErrorReported;
use rustc_ast::expand::allocator::AllocatorKind;
use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule};
use rustc_codegen_ssa::back::write::{CodegenContext, FatLTOInput, ModuleConfig};

2
src/librustc_codegen_llvm/llvm_util.rs
View file

@ -1,7 +1,7 @@
use crate::back::write::create_informational_target_machine;
use crate::llvm;
use libc::c_int;
use rustc::bug;
use rustc_middle::bug;
use rustc_data_structures::fx::FxHashSet;
use rustc_feature::UnstableFeatures;
use rustc_session::config::PrintRequest;

2
src/librustc_codegen_llvm/metadata.rs
View file

@ -1,7 +1,7 @@
use crate::llvm;
use crate::llvm::archive_ro::ArchiveRO;
use crate::llvm::{mk_section_iter, False, ObjectFile};
use rustc::middle::cstore::MetadataLoader;
use rustc_middle::middle::cstore::MetadataLoader;
use rustc_target::spec::Target;
use log::debug;

8
src/librustc_codegen_llvm/mono_item.rs
View file

@ -5,13 +5,13 @@ use crate::context::CodegenCx;
use crate::llvm;
use crate::type_of::LayoutLlvmExt;
use log::debug;
use rustc::mir::mono::{Linkage, Visibility};
use rustc::ty::layout::{FnAbiExt, LayoutOf};
use rustc::ty::{Instance, TypeFoldable};
use rustc_middle::mir::mono::{Linkage, Visibility};
use rustc_middle::ty::layout::{FnAbiExt, LayoutOf};
use rustc_middle::ty::{Instance, TypeFoldable};
use rustc_codegen_ssa::traits::*;
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
pub use rustc::mir::mono::MonoItem;
pub use rustc_middle::mir::mono::MonoItem;
impl PreDefineMethods<'tcx> for CodegenCx<'ll, 'tcx> {
fn predefine_static(

18
src/librustc_codegen_llvm/type_.rs
View file

@ -1,20 +1,20 @@
pub use crate::llvm::Type;
use crate::context::CodegenCx;
use crate::llvm;
use crate::llvm::{Bool, False, True};
use crate::value::Value;
use rustc::bug;
use rustc_codegen_ssa::traits::*;
use crate::abi::{FnAbiLlvmExt, LlvmType};
use crate::common;
use crate::context::CodegenCx;
use crate::llvm;
use crate::llvm::{Bool, False, True};
use crate::type_of::LayoutLlvmExt;
use rustc::ty::layout::{self, Align, Size, TyAndLayout};
use rustc::ty::Ty;
use crate::value::Value;
use rustc_ast::ast;
use rustc_codegen_ssa::common::TypeKind;
use rustc_codegen_ssa::traits::*;
use rustc_data_structures::small_c_str::SmallCStr;
use rustc_middle::bug;
use rustc_middle::ty::layout::{self, Align, Size, TyAndLayout};
use rustc_middle::ty::Ty;
use rustc_target::abi::call::{CastTarget, FnAbi, Reg};
use std::fmt;

10
src/librustc_codegen_llvm/type_of.rs
View file

@ -2,11 +2,11 @@ use crate::abi::FnAbi;
use crate::common::*;
use crate::type_::Type;
use log::debug;
use rustc::bug;
use rustc::ty::layout::{self, Align, FnAbiExt, LayoutOf, PointeeInfo, Size, TyAndLayout};
use rustc::ty::print::obsolete::DefPathBasedNames;
use rustc::ty::{self, Ty, TypeFoldable};
use rustc_codegen_ssa::traits::*;
use rustc_middle::bug;
use rustc_middle::ty::layout::{self, Align, FnAbiExt, LayoutOf, PointeeInfo, Size, TyAndLayout};
use rustc_middle::ty::print::obsolete::DefPathBasedNames;
use rustc_middle::ty::{self, Ty, TypeFoldable};
use rustc_target::abi::TyAndLayoutMethods;
use std::fmt::Write;
@ -221,7 +221,7 @@ impl<'tcx> LayoutLlvmExt<'tcx> for TyAndLayout<'tcx> {
}
}
/// Gets the LLVM type corresponding to a Rust type, i.e., `rustc::ty::Ty`.
/// Gets the LLVM type corresponding to a Rust type, i.e., `rustc_middle::ty::Ty`.
/// The pointee type of the pointer in `PlaceRef` is always this type.
/// For sized types, it is also the right LLVM type for an `alloca`
/// containing a value of that type, and most immediates (except `bool`).

4
src/librustc_codegen_llvm/va_arg.rs
View file

@ -2,8 +2,8 @@ use crate::builder::Builder;
use crate::type_::Type;
use crate::type_of::LayoutLlvmExt;
use crate::value::Value;
use rustc::ty::layout::{Align, HasDataLayout, HasTyCtxt, LayoutOf, Size};
use rustc::ty::Ty;
use rustc_middle::ty::layout::{Align, HasDataLayout, HasTyCtxt, LayoutOf, Size};
use rustc_middle::ty::Ty;
use rustc_codegen_ssa::mir::operand::OperandRef;
use rustc_codegen_ssa::traits::{
BaseTypeMethods, BuilderMethods, ConstMethods, DerivedTypeMethods,

4
src/librustc_codegen_ssa/back/link.rs
View file

@ -1,5 +1,5 @@
use rustc::middle::cstore::{EncodedMetadata, LibSource, NativeLibrary, NativeLibraryKind};
use rustc::middle::dependency_format::Linkage;
use rustc_middle::middle::cstore::{EncodedMetadata, LibSource, NativeLibrary, NativeLibraryKind};
use rustc_middle::middle::dependency_format::Linkage;
use rustc_data_structures::fx::FxHashSet;
use rustc_fs_util::fix_windows_verbatim_for_gcc;
use rustc_hir::def_id::CrateNum;

4
src/librustc_codegen_ssa/back/linker.rs
View file

@ -8,8 +8,8 @@ use std::io::prelude::*;
use std::io::{self, BufWriter};
use std::path::{Path, PathBuf};
use rustc::middle::dependency_format::Linkage;
use rustc::ty::TyCtxt;
use rustc_middle::middle::dependency_format::Linkage;
use rustc_middle::ty::TyCtxt;
use rustc_data_structures::fx::FxHashMap;
use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
use rustc_serialize::{json, Encoder};

2
src/librustc_codegen_ssa/back/rpath.rs
View file

@ -3,7 +3,7 @@ use std::env;
use std::fs;
use std::path::{Path, PathBuf};
use rustc::middle::cstore::LibSource;
use rustc_middle::middle::cstore::LibSource;
use rustc_hir::def_id::CrateNum;
pub struct RPathConfig<'a> {

16
src/librustc_codegen_ssa/back/symbol_export.rs
View file

@ -1,12 +1,12 @@
use std::collections::hash_map::Entry::*;
use std::sync::Arc;
use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc::middle::exported_symbols::{metadata_symbol_name, ExportedSymbol, SymbolExportLevel};
use rustc::ty::query::Providers;
use rustc::ty::subst::{GenericArgKind, SubstsRef};
use rustc::ty::Instance;
use rustc::ty::{SymbolName, TyCtxt};
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
use rustc_middle::middle::exported_symbols::{metadata_symbol_name, ExportedSymbol, SymbolExportLevel};
use rustc_middle::ty::query::Providers;
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
use rustc_middle::ty::Instance;
use rustc_middle::ty::{SymbolName, TyCtxt};
use rustc_ast::expand::allocator::ALLOCATOR_METHODS;
use rustc_data_structures::fingerprint::Fingerprint;
use rustc_data_structures::fx::FxHashMap;
@ -221,8 +221,8 @@ fn exported_symbols_provider_local(
}
if tcx.sess.opts.share_generics() && tcx.local_crate_exports_generics() {
use rustc::mir::mono::{Linkage, MonoItem, Visibility};
use rustc::ty::InstanceDef;
use rustc_middle::mir::mono::{Linkage, MonoItem, Visibility};
use rustc_middle::ty::InstanceDef;
// Normally, we require that shared monomorphizations are not hidden,
// because if we want to re-use a monomorphization from a Rust dylib, it

8
src/librustc_codegen_ssa/back/write.rs
View file

@ -10,10 +10,10 @@ use crate::{
use crate::traits::*;
use jobserver::{Acquired, Client};
use rustc::dep_graph::{WorkProduct, WorkProductFileKind, WorkProductId};
use rustc::middle::cstore::EncodedMetadata;
use rustc::middle::exported_symbols::SymbolExportLevel;
use rustc::ty::TyCtxt;
use rustc_middle::dep_graph::{WorkProduct, WorkProductFileKind, WorkProductId};
use rustc_middle::middle::cstore::EncodedMetadata;
use rustc_middle::middle::exported_symbols::SymbolExportLevel;
use rustc_middle::ty::TyCtxt;
use rustc_ast::attr;
use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::profiling::SelfProfilerRef;

22
src/librustc_codegen_ssa/base.rs
View file

@ -25,16 +25,6 @@ use crate::mir::place::PlaceRef;
use crate::traits::*;
use crate::{CachedModuleCodegen, CrateInfo, MemFlags, ModuleCodegen, ModuleKind};
use rustc::middle::codegen_fn_attrs::CodegenFnAttrs;
use rustc::middle::cstore::EncodedMetadata;
use rustc::middle::cstore::{self, LinkagePreference};
use rustc::middle::lang_items;
use rustc::middle::lang_items::StartFnLangItem;
use rustc::mir::mono::{CodegenUnit, CodegenUnitNameBuilder, MonoItem};
use rustc::ty::layout::{self, Align, HasTyCtxt, LayoutOf, TyAndLayout, VariantIdx};
use rustc::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
use rustc::ty::query::Providers;
use rustc::ty::{self, Instance, Ty, TyCtxt};
use rustc_attr as attr;
use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::profiling::print_time_passes_entry;
@ -42,6 +32,16 @@ use rustc_data_structures::sync::{par_iter, Lock, ParallelIterator};
use rustc_hir as hir;
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
use rustc_index::vec::Idx;
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
use rustc_middle::middle::cstore::EncodedMetadata;
use rustc_middle::middle::cstore::{self, LinkagePreference};
use rustc_middle::middle::lang_items;
use rustc_middle::middle::lang_items::StartFnLangItem;
use rustc_middle::mir::mono::{CodegenUnit, CodegenUnitNameBuilder, MonoItem};
use rustc_middle::ty::layout::{self, Align, HasTyCtxt, LayoutOf, TyAndLayout, VariantIdx};
use rustc_middle::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
use rustc_middle::ty::query::Providers;
use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
use rustc_session::cgu_reuse_tracker::CguReuse;
use rustc_session::config::{self, EntryFnType, Lto};
use rustc_session::Session;
@ -557,7 +557,7 @@ pub fn codegen_crate<B: ExtraBackendMethods>(
// one instead. If nothing exists then it's our job to generate the
// allocator!
let any_dynamic_crate = tcx.dependency_formats(LOCAL_CRATE).iter().any(|(_, list)| {
use rustc::middle::dependency_format::Linkage;
use rustc_middle::middle::dependency_format::Linkage;
list.iter().any(|&linkage| linkage == Linkage::Dynamic)
});
let allocator_module = if any_dynamic_crate {

4
src/librustc_codegen_ssa/common.rs
View file

@ -1,13 +1,13 @@
#![allow(non_camel_case_types, non_snake_case)]
use rustc::ty::{Ty, TyCtxt};
use rustc_middle::ty::{Ty, TyCtxt};
use rustc_errors::struct_span_err;
use rustc_session::Session;
use rustc_span::Span;
use crate::base;
use crate::traits::*;
use rustc::middle::lang_items::LangItem;
use rustc_middle::middle::lang_items::LangItem;
use rustc_hir::def_id::DefId;
use crate::traits::BuilderMethods;

2
src/librustc_codegen_ssa/debuginfo/type_names.rs
View file

@ -1,6 +1,6 @@
// Type Names for Debug Info.
use rustc::ty::{self, subst::SubstsRef, Ty, TyCtxt};
use rustc_middle::ty::{self, subst::SubstsRef, Ty, TyCtxt};
use rustc_data_structures::fx::FxHashSet;
use rustc_hir as hir;
use rustc_hir::def_id::DefId;

2
src/librustc_codegen_ssa/glue.rs
View file

@ -5,7 +5,7 @@
use crate::common::IntPredicate;
use crate::meth;
use crate::traits::*;
use rustc::ty::{self, Ty};
use rustc_middle::ty::{self, Ty};
pub fn size_and_align_of_dst<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
bx: &mut Bx,

14
src/librustc_codegen_ssa/lib.rs
View file

@ -15,17 +15,17 @@
#[macro_use]
extern crate log;
#[macro_use]
extern crate rustc;
extern crate rustc_middle;
use rustc::dep_graph::WorkProduct;
use rustc::middle::cstore::{CrateSource, LibSource, NativeLibrary};
use rustc::middle::dependency_format::Dependencies;
use rustc::middle::lang_items::LangItem;
use rustc::ty::query::Providers;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_data_structures::svh::Svh;
use rustc_data_structures::sync::Lrc;
use rustc_hir::def_id::CrateNum;
use rustc_middle::dep_graph::WorkProduct;
use rustc_middle::middle::cstore::{CrateSource, LibSource, NativeLibrary};
use rustc_middle::middle::dependency_format::Dependencies;
use rustc_middle::middle::lang_items::LangItem;
use rustc_middle::ty::query::Providers;
use rustc_session::config::{OutputFilenames, OutputType, RUST_CGU_EXT};
use rustc_span::symbol::Symbol;
use std::path::{Path, PathBuf};
@ -144,7 +144,7 @@ pub struct CodegenResults {
pub allocator_module: Option<CompiledModule>,
pub metadata_module: Option<CompiledModule>,
pub crate_hash: Svh,
pub metadata: rustc::middle::cstore::EncodedMetadata,
pub metadata: rustc_middle::middle::cstore::EncodedMetadata,
pub windows_subsystem: Option<String>,
pub linker_info: back::linker::LinkerInfo,
pub crate_info: CrateInfo,

2
src/librustc_codegen_ssa/meth.rs
View file

@ -1,6 +1,6 @@
use crate::traits::*;
use rustc::ty::{self, Instance, Ty};
use rustc_middle::ty::{self, Instance, Ty};
use rustc_target::abi::call::FnAbi;
#[derive(Copy, Clone, Debug)]

10
src/librustc_codegen_ssa/mir/analyze.rs
View file

@ -3,13 +3,13 @@
use super::FunctionCx;
use crate::traits::*;
use rustc::mir::traversal;
use rustc::mir::visit::{
use rustc_middle::mir::traversal;
use rustc_middle::mir::visit::{
MutatingUseContext, NonMutatingUseContext, NonUseContext, PlaceContext, Visitor,
};
use rustc::mir::{self, Location, TerminatorKind};
use rustc::ty;
use rustc::ty::layout::{HasTyCtxt, LayoutOf};
use rustc_middle::mir::{self, Location, TerminatorKind};
use rustc_middle::ty;
use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf};
use rustc_data_structures::graph::dominators::Dominators;
use rustc_index::bit_set::BitSet;
use rustc_index::vec::{Idx, IndexVec};

10
src/librustc_codegen_ssa/mir/block.rs
View file

@ -9,11 +9,11 @@ use crate::meth;
use crate::traits::*;
use crate::MemFlags;
use rustc::middle::lang_items;
use rustc::mir;
use rustc::mir::AssertKind;
use rustc::ty::layout::{self, FnAbiExt, HasTyCtxt, LayoutOf};
use rustc::ty::{self, Instance, Ty, TypeFoldable};
use rustc_middle::middle::lang_items;
use rustc_middle::mir;
use rustc_middle::mir::AssertKind;
use rustc_middle::ty::layout::{self, FnAbiExt, HasTyCtxt, LayoutOf};
use rustc_middle::ty::{self, Instance, Ty, TypeFoldable};
use rustc_index::vec::Idx;
use rustc_span::{source_map::Span, symbol::Symbol};
use rustc_target::abi::call::{ArgAbi, FnAbi, PassMode};

8
src/librustc_codegen_ssa/mir/constant.rs
View file

@ -1,9 +1,9 @@
use crate::mir::operand::OperandRef;
use crate::traits::*;
use rustc::mir;
use rustc::mir::interpret::{ConstValue, ErrorHandled};
use rustc::ty::layout::{self, HasTyCtxt};
use rustc::ty::{self, Ty};
use rustc_middle::mir;
use rustc_middle::mir::interpret::{ConstValue, ErrorHandled};
use rustc_middle::ty::layout::{self, HasTyCtxt};
use rustc_middle::ty::{self, Ty};
use rustc_index::vec::Idx;
use rustc_span::source_map::Span;

6
src/librustc_codegen_ssa/mir/debuginfo.rs
View file

@ -1,7 +1,7 @@
use crate::traits::*;
use rustc::mir;
use rustc::ty;
use rustc::ty::layout::{LayoutOf, Size};
use rustc_middle::mir;
use rustc_middle::ty;
use rustc_middle::ty::layout::{LayoutOf, Size};
use rustc_hir::def_id::CrateNum;
use rustc_index::vec::IndexVec;
use rustc_session::config::DebugInfo;

8
src/librustc_codegen_ssa/mir/mod.rs
View file

@ -1,8 +1,8 @@
use crate::base;
use crate::traits::*;
use rustc::mir;
use rustc::ty::layout::{FnAbiExt, HasTyCtxt, TyAndLayout};
use rustc::ty::{self, Instance, Ty, TypeFoldable};
use rustc_middle::mir;
use rustc_middle::ty::layout::{FnAbiExt, HasTyCtxt, TyAndLayout};
use rustc_middle::ty::{self, Instance, Ty, TypeFoldable};
use rustc_target::abi::call::{FnAbi, PassMode};
use std::iter;
@ -13,7 +13,7 @@ use rustc_index::vec::IndexVec;
use self::analyze::CleanupKind;
use self::debuginfo::{FunctionDebugContext, PerLocalVarDebugInfo};
use self::place::PlaceRef;
use rustc::mir::traversal;
use rustc_middle::mir::traversal;
use self::operand::{OperandRef, OperandValue};

8
src/librustc_codegen_ssa/mir/operand.rs
View file

@ -6,10 +6,10 @@ use crate::glue;
use crate::traits::*;
use crate::MemFlags;
use rustc::mir;
use rustc::mir::interpret::{ConstValue, ErrorHandled, Pointer, Scalar};
use rustc::ty::layout::{self, Align, LayoutOf, Size, TyAndLayout};
use rustc::ty::Ty;
use rustc_middle::mir;
use rustc_middle::mir::interpret::{ConstValue, ErrorHandled, Pointer, Scalar};
use rustc_middle::ty::layout::{self, Align, LayoutOf, Size, TyAndLayout};
use rustc_middle::ty::Ty;
use std::fmt;

8
src/librustc_codegen_ssa/mir/place.rs
View file

@ -6,10 +6,10 @@ use crate::glue;
use crate::traits::*;
use crate::MemFlags;
use rustc::mir;
use rustc::mir::tcx::PlaceTy;
use rustc::ty::layout::{self, Align, HasTyCtxt, LayoutOf, TyAndLayout, VariantIdx};
use rustc::ty::{self, Ty};
use rustc_middle::mir;
use rustc_middle::mir::tcx::PlaceTy;
use rustc_middle::ty::layout::{self, Align, HasTyCtxt, LayoutOf, TyAndLayout, VariantIdx};
use rustc_middle::ty::{self, Ty};
#[derive(Copy, Clone, Debug)]
pub struct PlaceRef<'tcx, V> {

10
src/librustc_codegen_ssa/mir/rvalue.rs
View file

@ -7,11 +7,11 @@ use crate::common::{self, IntPredicate, RealPredicate};
use crate::traits::*;
use crate::MemFlags;
use rustc::middle::lang_items::ExchangeMallocFnLangItem;
use rustc::mir;
use rustc::ty::cast::{CastTy, IntTy};
use rustc::ty::layout::{self, HasTyCtxt, LayoutOf};
use rustc::ty::{self, adjustment::PointerCast, Instance, Ty, TyCtxt};
use rustc_middle::middle::lang_items::ExchangeMallocFnLangItem;
use rustc_middle::mir;
use rustc_middle::ty::cast::{CastTy, IntTy};
use rustc_middle::ty::layout::{self, HasTyCtxt, LayoutOf};
use rustc_middle::ty::{self, adjustment::PointerCast, Instance, Ty, TyCtxt};
use rustc_apfloat::{ieee, Float, Round, Status};
use rustc_span::source_map::{Span, DUMMY_SP};
use rustc_span::symbol::sym;

2
src/librustc_codegen_ssa/mir/statement.rs
View file

@ -1,4 +1,4 @@
use rustc::mir;
use rustc_middle::mir;
use rustc_errors::struct_span_err;
use super::FunctionCx;

6
src/librustc_codegen_ssa/mono_item.rs
View file

@ -1,10 +1,10 @@
use crate::base;
use crate::traits::*;
use rustc::mir::mono::{Linkage, Visibility};
use rustc::ty::layout::HasTyCtxt;
use rustc_middle::mir::mono::{Linkage, Visibility};
use rustc_middle::ty::layout::HasTyCtxt;
use rustc_hir as hir;
use rustc::mir::mono::MonoItem;
use rustc_middle::mir::mono::MonoItem;
pub trait MonoItemExt<'a, 'tcx> {
fn define<Bx: BuilderMethods<'a, 'tcx>>(&self, cx: &'a Bx::CodegenCx);

2
src/librustc_codegen_ssa/traits/abi.rs
View file

@ -1,5 +1,5 @@
use super::BackendTypes;
use rustc::ty::Ty;
use rustc_middle::ty::Ty;
use rustc_target::abi::call::FnAbi;
pub trait AbiBuilderMethods<'tcx>: BackendTypes {

12
src/librustc_codegen_ssa/traits/backend.rs
View file

@ -2,13 +2,13 @@ use super::write::WriteBackendMethods;
use super::CodegenObject;
use crate::ModuleCodegen;
use rustc::dep_graph::DepGraph;
use rustc::middle::cstore::{EncodedMetadata, MetadataLoaderDyn};
use rustc::ty::layout::{HasTyCtxt, LayoutOf, TyAndLayout};
use rustc::ty::query::Providers;
use rustc::ty::{Ty, TyCtxt};
use rustc::util::common::ErrorReported;
use rustc_ast::expand::allocator::AllocatorKind;
use rustc_middle::dep_graph::DepGraph;
use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoaderDyn};
use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf, TyAndLayout};
use rustc_middle::ty::query::Providers;
use rustc_middle::ty::{Ty, TyCtxt};
use rustc_middle::util::common::ErrorReported;
use rustc_session::{
config::{self, OutputFilenames, PrintRequest},
Session,

4
src/librustc_codegen_ssa/traits/builder.rs
View file

@ -12,8 +12,8 @@ use crate::mir::operand::OperandRef;
use crate::mir::place::PlaceRef;
use crate::MemFlags;
use rustc::ty::layout::{Align, HasParamEnv, Size};
use rustc::ty::Ty;
use rustc_middle::ty::layout::{Align, HasParamEnv, Size};
use rustc_middle::ty::Ty;
use rustc_target::spec::HasTargetSpec;
use std::iter::TrustedLen;

6
src/librustc_codegen_ssa/traits/consts.rs
View file

@ -1,8 +1,8 @@
use super::BackendTypes;
use crate::mir::place::PlaceRef;
use rustc::mir::interpret::Allocation;
use rustc::mir::interpret::Scalar;
use rustc::ty::layout;
use rustc_middle::mir::interpret::Allocation;
use rustc_middle::mir::interpret::Scalar;
use rustc_middle::ty::layout;
use rustc_span::Symbol;
pub trait ConstMethods<'tcx>: BackendTypes {

6
src/librustc_codegen_ssa/traits/debuginfo.rs
View file

@ -1,8 +1,8 @@
use super::BackendTypes;
use crate::mir::debuginfo::{FunctionDebugContext, VariableKind};
use rustc::mir;
use rustc::ty::layout::Size;
use rustc::ty::{Instance, Ty};
use rustc_middle::mir;
use rustc_middle::ty::layout::Size;
use rustc_middle::ty::{Instance, Ty};
use rustc_ast::ast::Name;
use rustc_hir::def_id::CrateNum;
use rustc_span::{SourceFile, Span};

4
src/librustc_codegen_ssa/traits/declare.rs
View file

@ -1,6 +1,6 @@
use super::BackendTypes;
use rustc::mir::mono::{Linkage, Visibility};
use rustc::ty::{Instance, Ty};
use rustc_middle::mir::mono::{Linkage, Visibility};
use rustc_middle::ty::{Instance, Ty};
use rustc_hir::def_id::DefId;
use rustc_target::abi::call::FnAbi;

2
src/librustc_codegen_ssa/traits/intrinsic.rs
View file

@ -1,6 +1,6 @@
use super::BackendTypes;
use crate::mir::operand::OperandRef;
use rustc::ty::{self, Ty};
use rustc_middle::ty::{self, Ty};
use rustc_span::Span;
use rustc_target::abi::call::FnAbi;

4
src/librustc_codegen_ssa/traits/misc.rs
View file

@ -1,6 +1,6 @@
use super::BackendTypes;
use rustc::mir::mono::CodegenUnit;
use rustc::ty::{self, Instance, Ty};
use rustc_middle::mir::mono::CodegenUnit;
use rustc_middle::ty::{self, Instance, Ty};
use rustc_data_structures::fx::FxHashMap;
use rustc_session::Session;
use std::cell::RefCell;

2
src/librustc_codegen_ssa/traits/mod.rs
View file

@ -42,7 +42,7 @@ pub use self::type_::{
};
pub use self::write::{ModuleBufferMethods, ThinBufferMethods, WriteBackendMethods};
use rustc::ty::layout::{HasParamEnv, HasTyCtxt};
use rustc_middle::ty::layout::{HasParamEnv, HasTyCtxt};
use rustc_target::spec::HasTargetSpec;
use std::fmt;

2
src/librustc_codegen_ssa/traits/statics.rs
View file

@ -1,5 +1,5 @@
use super::BackendTypes;
use rustc::ty::layout::Align;
use rustc_middle::ty::layout::Align;
use rustc_hir::def_id::DefId;
pub trait StaticMethods: BackendTypes {

6
src/librustc_codegen_ssa/traits/type_.rs
View file

@ -3,8 +3,8 @@ use super::Backend;
use super::HasCodegen;
use crate::common::TypeKind;
use crate::mir::place::PlaceRef;
use rustc::ty::layout::{self, TyAndLayout};
use rustc::ty::{self, Ty};
use rustc_middle::ty::layout::{self, TyAndLayout};
use rustc_middle::ty::{self, Ty};
use rustc_span::DUMMY_SP;
use rustc_target::abi::call::{ArgAbi, CastTarget, FnAbi, Reg};
@ -54,7 +54,7 @@ pub trait DerivedTypeMethods<'tcx>: BaseTypeMethods<'tcx> + MiscMethods<'tcx> {
}
fn type_from_integer(&self, i: layout::Integer) -> Self::Type {
use rustc::ty::layout::Integer::*;
use rustc_middle::ty::layout::Integer::*;
match i {
I8 => self.type_i8(),
I16 => self.type_i16(),

2
src/librustc_codegen_ssa/traits/write.rs
View file

@ -2,7 +2,7 @@ use crate::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule};
use crate::back::write::{CodegenContext, FatLTOInput, ModuleConfig};
use crate::{CompiledModule, ModuleCodegen};
use rustc::dep_graph::WorkProduct;
use rustc_middle::dep_graph::WorkProduct;
use rustc_errors::{FatalError, Handler};
pub trait WriteBackendMethods: 'static + Sized + Clone {

6
src/librustc_driver/lib.rs
View file

@ -18,9 +18,9 @@ extern crate lazy_static;
pub extern crate rustc_plugin_impl as plugin;
use rustc::middle::cstore::MetadataLoader;
use rustc::ty::TyCtxt;
use rustc::util::common::ErrorReported;
use rustc_middle::middle::cstore::MetadataLoader;
use rustc_middle::ty::TyCtxt;
use rustc_middle::util::common::ErrorReported;
use rustc_ast::ast;
use rustc_codegen_ssa::{traits::CodegenBackend, CodegenResults};
use rustc_data_structures::profiling::print_time_passes_entry;

6
src/librustc_driver/pretty.rs
View file

@ -1,8 +1,8 @@
//! The various pretty-printing routines.
use rustc::hir::map as hir_map;
use rustc::ty::{self, TyCtxt};
use rustc::util::common::ErrorReported;
use rustc_middle::hir::map as hir_map;
use rustc_middle::ty::{self, TyCtxt};
use rustc_middle::util::common::ErrorReported;
use rustc_ast::ast;
use rustc_ast_pretty::pprust;
use rustc_hir as hir;

2
src/librustc_hir/intravisit.rs
View file

@ -119,7 +119,7 @@ impl<'a> FnKind<'a> {
}
}
/// An abstract representation of the HIR `rustc::hir::map::Map`.
/// An abstract representation of the HIR `rustc_middle::hir::map::Map`.
pub trait Map<'hir> {
/// Retrieves the `Node` corresponding to `id`, returning `None` if cannot be found.
fn find(&self, hir_id: HirId) -> Option<Node<'hir>>;

8
src/librustc_incremental/assert_dep_graph.rs
View file

@ -34,10 +34,10 @@
//! ```
use graphviz as dot;
use rustc::dep_graph::debug::{DepNodeFilter, EdgeFilter};
use rustc::dep_graph::{DepGraphQuery, DepKind, DepNode, DepNodeExt};
use rustc::hir::map::Map;
use rustc::ty::TyCtxt;
use rustc_middle::dep_graph::debug::{DepNodeFilter, EdgeFilter};
use rustc_middle::dep_graph::{DepGraphQuery, DepKind, DepNode, DepNodeExt};
use rustc_middle::hir::map::Map;
use rustc_middle::ty::TyCtxt;
use rustc_ast::ast;
use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::graph::implementation::{Direction, NodeIndex, INCOMING, OUTGOING};

4
src/librustc_incremental/assert_module_sources.rs
View file

@ -21,8 +21,8 @@
//! allows for doing a more fine-grained check to see if pre- or post-lto data
//! was re-used.
use rustc::mir::mono::CodegenUnitNameBuilder;
use rustc::ty::TyCtxt;
use rustc_middle::mir::mono::CodegenUnitNameBuilder;
use rustc_middle::ty::TyCtxt;
use rustc_ast::ast;
use rustc_hir::def_id::LOCAL_CRATE;
use rustc_session::cgu_reuse_tracker::*;

2
src/librustc_incremental/persist/data.rs
View file

@ -1,6 +1,6 @@
//! The data that we will serialize and deserialize.
use rustc::dep_graph::{WorkProduct, WorkProductId};
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
#[derive(Debug, RustcEncodable, RustcDecodable)]
pub struct SerializedWorkProduct {

8
src/librustc_incremental/persist/dirty_clean.rs
View file

@ -13,9 +13,6 @@
//! Errors are reported if we are in the suitable configuration but
//! the required condition is not met.
use rustc::dep_graph::{label_strs, DepNode, DepNodeExt};
use rustc::hir::map::Map;
use rustc::ty::TyCtxt;
use rustc_ast::ast::{self, Attribute, NestedMetaItem};
use rustc_data_structures::fingerprint::Fingerprint;
use rustc_data_structures::fx::FxHashSet;
@ -25,6 +22,9 @@ use rustc_hir::intravisit;
use rustc_hir::itemlikevisit::ItemLikeVisitor;
use rustc_hir::Node as HirNode;
use rustc_hir::{ImplItemKind, ItemKind as HirItem, TraitItemKind};
use rustc_middle::dep_graph::{label_strs, DepNode, DepNodeExt};
use rustc_middle::hir::map::Map;
use rustc_middle::ty::TyCtxt;
use rustc_span::symbol::{sym, Symbol};
use rustc_span::Span;
use std::iter::FromIterator;
@ -306,7 +306,7 @@ impl DirtyCleanVisitor<'tcx> {
// michaelwoerister and vitiral came up with a possible solution,
// to just do this before every query
// ```
// ::rustc::ty::query::plumbing::force_from_dep_node(tcx, dep_node)
// ::rustc_middle::ty::query::plumbing::force_from_dep_node(tcx, dep_node)
// ```
//
// However, this did not seem to work effectively and more bugs were hit.

6
src/librustc_incremental/persist/load.rs
View file

@ -1,8 +1,8 @@
//! Code to save/load the dep-graph from files.
use rustc::dep_graph::{PreviousDepGraph, SerializedDepGraph, WorkProduct, WorkProductId};
use rustc::ty::query::OnDiskCache;
use rustc::ty::TyCtxt;
use rustc_middle::dep_graph::{PreviousDepGraph, SerializedDepGraph, WorkProduct, WorkProductId};
use rustc_middle::ty::query::OnDiskCache;
use rustc_middle::ty::TyCtxt;
use rustc_data_structures::fx::FxHashMap;
use rustc_serialize::opaque::Decoder;
use rustc_serialize::Decodable as RustcDecodable;

4
src/librustc_incremental/persist/save.rs
View file

@ -1,5 +1,5 @@
use rustc::dep_graph::{DepGraph, DepKind, WorkProduct, WorkProductId};
use rustc::ty::TyCtxt;
use rustc_middle::dep_graph::{DepGraph, DepKind, WorkProduct, WorkProductId};
use rustc_middle::ty::TyCtxt;
use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::sync::join;
use rustc_serialize::opaque::Encoder;

2
src/librustc_incremental/persist/work_product.rs
View file

@ -1,7 +1,7 @@
//! This module contains files for saving intermediate work-products.
use crate::persist::fs::*;
use rustc::dep_graph::{WorkProduct, WorkProductFileKind, WorkProductId};
use rustc_middle::dep_graph::{WorkProduct, WorkProductFileKind, WorkProductId};
use rustc_fs_util::link_or_copy;
use rustc_session::Session;
use std::fs as std_fs;

4
src/librustc_infer/infer/at.rs
View file

@ -27,8 +27,8 @@
use super::*;
use rustc::ty::relate::{Relate, TypeRelation};
use rustc::ty::Const;
use rustc_middle::ty::relate::{Relate, TypeRelation};
use rustc_middle::ty::Const;
pub struct At<'a, 'tcx> {
pub infcx: &'a InferCtxt<'a, 'tcx>,

8
src/librustc_infer/infer/canonical/canonicalizer.rs
View file

@ -10,10 +10,10 @@ use crate::infer::canonical::{
OriginalQueryValues,
};
use crate::infer::InferCtxt;
use rustc::ty::flags::FlagComputation;
use rustc::ty::fold::{TypeFoldable, TypeFolder};
use rustc::ty::subst::GenericArg;
use rustc::ty::{self, BoundVar, InferConst, List, Ty, TyCtxt, TypeFlags};
use rustc_middle::ty::flags::FlagComputation;
use rustc_middle::ty::fold::{TypeFoldable, TypeFolder};
use rustc_middle::ty::subst::GenericArg;
use rustc_middle::ty::{self, BoundVar, InferConst, List, Ty, TyCtxt, TypeFlags};
use std::sync::atomic::Ordering;
use rustc_data_structures::fx::FxHashMap;

8
src/librustc_infer/infer/canonical/mod.rs
View file

@ -23,13 +23,13 @@
use crate::infer::{ConstVariableOrigin, ConstVariableOriginKind};
use crate::infer::{InferCtxt, RegionVariableOrigin, TypeVariableOrigin, TypeVariableOriginKind};
use rustc::ty::fold::TypeFoldable;
use rustc::ty::subst::GenericArg;
use rustc::ty::{self, BoundVar, List};
use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::subst::GenericArg;
use rustc_middle::ty::{self, BoundVar, List};
use rustc_index::vec::IndexVec;
use rustc_span::source_map::Span;
pub use rustc::infer::canonical::*;
pub use rustc_middle::infer::canonical::*;
use substitute::CanonicalExt;
mod canonicalizer;

10
src/librustc_infer/infer/canonical/query_response.rs
View file

@ -18,11 +18,11 @@ use crate::infer::{InferCtxt, InferOk, InferResult, NLLRegionVariableOrigin};
use crate::traits::query::{Fallible, NoSolution};
use crate::traits::{DomainGoal, TraitEngine};
use crate::traits::{Obligation, ObligationCause, PredicateObligation};
use rustc::arena::ArenaAllocatable;
use rustc::ty::fold::TypeFoldable;
use rustc::ty::relate::TypeRelation;
use rustc::ty::subst::{GenericArg, GenericArgKind};
use rustc::ty::{self, BoundVar, Ty, TyCtxt};
use rustc_middle::arena::ArenaAllocatable;
use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::relate::TypeRelation;
use rustc_middle::ty::subst::{GenericArg, GenericArgKind};
use rustc_middle::ty::{self, BoundVar, Ty, TyCtxt};
use rustc_data_structures::captures::Captures;
use rustc_index::vec::Idx;
use rustc_index::vec::IndexVec;

6
src/librustc_infer/infer/canonical/substitute.rs
View file

@ -7,9 +7,9 @@
//! [c]: https://rustc-dev-guide.rust-lang.org/traits/canonicalization.html
use crate::infer::canonical::{Canonical, CanonicalVarValues};
use rustc::ty::fold::TypeFoldable;
use rustc::ty::subst::GenericArgKind;
use rustc::ty::{self, TyCtxt};
use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::subst::GenericArgKind;
use rustc_middle::ty::{self, TyCtxt};
pub(super) trait CanonicalExt<'tcx, V> {
/// Instantiate the wrapped value, replacing each canonical value

10
src/librustc_infer/infer/combine.rs
View file

@ -34,11 +34,11 @@ use super::{InferCtxt, MiscVariable, TypeTrace};
use crate::traits::{Obligation, PredicateObligations};
use rustc::ty::error::TypeError;
use rustc::ty::relate::{self, Relate, RelateResult, TypeRelation};
use rustc::ty::subst::SubstsRef;
use rustc::ty::{self, InferConst, Ty, TyCtxt};
use rustc::ty::{IntType, UintType};
use rustc_middle::ty::error::TypeError;
use rustc_middle::ty::relate::{self, Relate, RelateResult, TypeRelation};
use rustc_middle::ty::subst::SubstsRef;
use rustc_middle::ty::{self, InferConst, Ty, TyCtxt};
use rustc_middle::ty::{IntType, UintType};
use rustc_ast::ast;
use rustc_hir::def_id::DefId;
use rustc_span::{Span, DUMMY_SP};

8
src/librustc_infer/infer/equate.rs
View file

@ -1,10 +1,10 @@
use super::combine::{CombineFields, RelationDir};
use super::Subtype;
use rustc::ty::relate::{self, Relate, RelateResult, TypeRelation};
use rustc::ty::subst::SubstsRef;
use rustc::ty::TyVar;
use rustc::ty::{self, Ty, TyCtxt};
use rustc_middle::ty::relate::{self, Relate, RelateResult, TypeRelation};
use rustc_middle::ty::subst::SubstsRef;
use rustc_middle::ty::TyVar;
use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_hir::def_id::DefId;

6
src/librustc_infer/infer/error_reporting/mod.rs
View file

@ -55,9 +55,9 @@ use crate::traits::{
IfExpressionCause, MatchExpressionArmCause, ObligationCause, ObligationCauseCode,
};
use rustc::middle::region;
use rustc::ty::error::TypeError;
use rustc::ty::{
use rustc_middle::middle::region;
use rustc_middle::ty::error::TypeError;
use rustc_middle::ty::{
self,
subst::{Subst, SubstsRef},
Region, Ty, TyCtxt, TypeFoldable,

6
src/librustc_infer/infer/error_reporting/need_type_info.rs
View file

@ -1,8 +1,8 @@
use crate::infer::type_variable::TypeVariableOriginKind;
use crate::infer::InferCtxt;
use rustc::hir::map::Map;
use rustc::ty::print::Print;
use rustc::ty::{self, DefIdTree, Infer, Ty, TyVar};
use rustc_middle::hir::map::Map;
use rustc_middle::ty::print::Print;
use rustc_middle::ty::{self, DefIdTree, Infer, Ty, TyVar};
use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder};
use rustc_hir as hir;
use rustc_hir::def::{DefKind, Namespace};

2
src/librustc_infer/infer/error_reporting/nice_region_error/different_lifetimes.rs
View file

@ -5,7 +5,7 @@ use crate::infer::error_reporting::nice_region_error::util::AnonymousParamInfo;
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
use crate::infer::lexical_region_resolve::RegionResolutionError;
use crate::infer::SubregionOrigin;
use rustc::util::common::ErrorReported;
use rustc_middle::util::common::ErrorReported;
use rustc_errors::struct_span_err;

6
src/librustc_infer/infer/error_reporting/nice_region_error/find_anon_type.rs
View file

@ -1,7 +1,7 @@
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
use rustc::hir::map::Map;
use rustc::middle::resolve_lifetime as rl;
use rustc::ty::{self, Region, TyCtxt};
use rustc_middle::hir::map::Map;
use rustc_middle::middle::resolve_lifetime as rl;
use rustc_middle::ty::{self, Region, TyCtxt};
use rustc_hir as hir;
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
use rustc_hir::Node;

4
src/librustc_infer/infer/error_reporting/nice_region_error/mod.rs
View file

@ -1,8 +1,8 @@
use crate::infer::lexical_region_resolve::RegionResolutionError;
use crate::infer::lexical_region_resolve::RegionResolutionError::*;
use crate::infer::InferCtxt;
use rustc::ty::{self, TyCtxt};
use rustc::util::common::ErrorReported;
use rustc_middle::ty::{self, TyCtxt};
use rustc_middle::util::common::ErrorReported;
use rustc_errors::DiagnosticBuilder;
use rustc_span::source_map::Span;

2
src/librustc_infer/infer/error_reporting/nice_region_error/named_anon_conflict.rs
View file

@ -1,7 +1,7 @@
//! Error Reporting for Anonymous Region Lifetime Errors
//! where one region is named and the other is anonymous.
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
use rustc::ty;
use rustc_middle::ty;
use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
use rustc_hir::{FnRetTy, TyKind};

4
src/librustc_infer/infer/error_reporting/nice_region_error/outlives_closure.rs
View file

@ -4,8 +4,8 @@
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
use crate::infer::lexical_region_resolve::RegionResolutionError::SubSupConflict;
use crate::infer::SubregionOrigin;
use rustc::ty::RegionKind;
use rustc::util::common::ErrorReported;
use rustc_middle::ty::RegionKind;
use rustc_middle::util::common::ErrorReported;
use rustc_hir::{Expr, ExprKind::Closure, Node};
impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {

8
src/librustc_infer/infer/error_reporting/nice_region_error/placeholder_error.rs
View file

@ -3,10 +3,10 @@ use crate::infer::lexical_region_resolve::RegionResolutionError;
use crate::infer::ValuePairs;
use crate::infer::{SubregionOrigin, TypeTrace};
use crate::traits::{ObligationCause, ObligationCauseCode};
use rustc::ty::error::ExpectedFound;
use rustc::ty::print::{FmtPrinter, Print, RegionHighlightMode};
use rustc::ty::subst::SubstsRef;
use rustc::ty::{self, TyCtxt};
use rustc_middle::ty::error::ExpectedFound;
use rustc_middle::ty::print::{FmtPrinter, Print, RegionHighlightMode};
use rustc_middle::ty::subst::SubstsRef;
use rustc_middle::ty::{self, TyCtxt};
use rustc_errors::DiagnosticBuilder;
use rustc_hir::def::Namespace;
use rustc_hir::def_id::DefId;

4
src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs
View file

@ -3,8 +3,8 @@
use crate::infer::error_reporting::msg_span_from_free_region;
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
use crate::infer::lexical_region_resolve::RegionResolutionError;
use rustc::ty::{BoundRegion, FreeRegion, RegionKind};
use rustc::util::common::ErrorReported;
use rustc_middle::ty::{BoundRegion, FreeRegion, RegionKind};
use rustc_middle::util::common::ErrorReported;
use rustc_errors::Applicability;
impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {

4
src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs
View file

@ -4,8 +4,8 @@ use crate::infer::error_reporting::nice_region_error::NiceRegionError;
use crate::infer::lexical_region_resolve::RegionResolutionError;
use crate::infer::{Subtype, ValuePairs};
use crate::traits::ObligationCauseCode::CompareImplMethodObligation;
use rustc::ty::Ty;
use rustc::util::common::ErrorReported;
use rustc_middle::ty::Ty;
use rustc_middle::util::common::ErrorReported;
use rustc_span::Span;
impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {

2
src/librustc_infer/infer/error_reporting/nice_region_error/util.rs
View file

@ -2,7 +2,7 @@
//! anonymous regions.
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
use rustc::ty::{self, DefIdTree, Region, Ty};
use rustc_middle::ty::{self, DefIdTree, Region, Ty};
use rustc_hir as hir;
use rustc_hir::def_id::DefId;
use rustc_span::Span;

6
src/librustc_infer/infer/error_reporting/note.rs
View file

@ -1,8 +1,8 @@
use crate::infer::error_reporting::{note_and_explain_region, ObligationCauseExt};
use crate::infer::{self, InferCtxt, SubregionOrigin};
use rustc::middle::region;
use rustc::ty::error::TypeError;
use rustc::ty::{self, Region};
use rustc_middle::middle::region;
use rustc_middle::ty::error::TypeError;
use rustc_middle::ty::{self, Region};
use rustc_errors::{struct_span_err, DiagnosticBuilder};
impl<'a, 'tcx> InferCtxt<'a, 'tcx> {

4
src/librustc_infer/infer/freshen.rs
View file

@ -31,8 +31,8 @@
//! variable only once, and it does so as soon as it can, so it is reasonable to ask what the type
//! inferencer knows "so far".
use rustc::ty::fold::TypeFolder;
use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
use rustc_middle::ty::fold::TypeFolder;
use rustc_middle::ty::{self, Ty, TyCtxt, TypeFoldable};
use rustc_data_structures::fx::FxHashMap;

4
src/librustc_infer/infer/fudge.rs
View file

@ -1,5 +1,5 @@
use rustc::ty::fold::{TypeFoldable, TypeFolder};
use rustc::ty::{self, ConstVid, FloatVid, IntVid, RegionVid, Ty, TyCtxt, TyVid};
use rustc_middle::ty::fold::{TypeFoldable, TypeFolder};
use rustc_middle::ty::{self, ConstVid, FloatVid, IntVid, RegionVid, Ty, TyCtxt, TyVid};
use super::type_variable::TypeVariableOrigin;
use super::InferCtxt;

4
src/librustc_infer/infer/glb.rs
View file

@ -4,8 +4,8 @@ use super::InferCtxt;
use super::Subtype;
use crate::traits::ObligationCause;
use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
use rustc::ty::{self, Ty, TyCtxt};
use rustc_middle::ty::relate::{Relate, RelateResult, TypeRelation};
use rustc_middle::ty::{self, Ty, TyCtxt};
/// "Greatest lower bound" (common subtype)
pub struct Glb<'combine, 'infcx, 'tcx> {

4
src/librustc_infer/infer/higher_ranked/mod.rs
View file

@ -5,8 +5,8 @@ use super::combine::CombineFields;
use super::{HigherRankedType, InferCtxt, PlaceholderMap};
use crate::infer::CombinedSnapshot;
use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
use rustc::ty::{self, Binder, TypeFoldable};
use rustc_middle::ty::relate::{Relate, RelateResult, TypeRelation};
use rustc_middle::ty::{self, Binder, TypeFoldable};
impl<'a, 'tcx> CombineFields<'a, 'tcx> {
pub fn higher_ranked_sub<T>(

6
src/librustc_infer/infer/lattice.rs
View file

@ -23,9 +23,9 @@ use super::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
use super::InferCtxt;
use crate::traits::ObligationCause;
use rustc::ty::relate::{RelateResult, TypeRelation};
use rustc::ty::TyVar;
use rustc::ty::{self, Ty};
use rustc_middle::ty::relate::{RelateResult, TypeRelation};
use rustc_middle::ty::TyVar;
use rustc_middle::ty::{self, Ty};
pub trait LatticeDir<'f, 'tcx>: TypeRelation<'tcx> {
fn infcx(&self) -> &'f InferCtxt<'f, 'tcx>;

8
src/librustc_infer/infer/lexical_region_resolve/graphviz.rs
View file

@ -1,5 +1,5 @@
//! This module provides linkage between libgraphviz traits and
//! `rustc::middle::typeck::infer::region_constraints`, generating a
//! `rustc_middle::middle::typeck::infer::region_constraints`, generating a
//! rendering of the graph represented by the list of `Constraint`
//! instances (which make up the edges of the graph), as well as the
//! origin for each constraint (which are attached to the labels on
@ -11,11 +11,11 @@ use graphviz as dot;
use super::Constraint;
use crate::infer::region_constraints::RegionConstraintData;
use crate::infer::SubregionOrigin;
use rustc::middle::free_region::RegionRelations;
use rustc::middle::region;
use rustc::ty;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_hir::def_id::DefIndex;
use rustc_middle::middle::free_region::RegionRelations;
use rustc_middle::middle::region;
use rustc_middle::ty;
use std::borrow::Cow;
use std::collections::btree_map::BTreeMap;

12
src/librustc_infer/infer/lexical_region_resolve/mod.rs
View file

@ -9,12 +9,12 @@ use crate::infer::region_constraints::VerifyBound;
use crate::infer::RegionVariableOrigin;
use crate::infer::RegionckMode;
use crate::infer::SubregionOrigin;
use rustc::middle::free_region::RegionRelations;
use rustc::ty::fold::TypeFoldable;
use rustc::ty::{self, Ty, TyCtxt};
use rustc::ty::{ReEarlyBound, ReEmpty, ReErased, ReFree, ReStatic};
use rustc::ty::{ReLateBound, RePlaceholder, ReScope, ReVar};
use rustc::ty::{Region, RegionVid};
use rustc_middle::middle::free_region::RegionRelations;
use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_middle::ty::{ReEarlyBound, ReEmpty, ReErased, ReFree, ReStatic};
use rustc_middle::ty::{ReLateBound, RePlaceholder, ReScope, ReVar};
use rustc_middle::ty::{Region, RegionVid};
use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::graph::implementation::{
Direction, Graph, NodeIndex, INCOMING, OUTGOING,

4
src/librustc_infer/infer/lub.rs
View file

@ -4,8 +4,8 @@ use super::InferCtxt;
use super::Subtype;
use crate::traits::ObligationCause;
use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
use rustc::ty::{self, Ty, TyCtxt};
use rustc_middle::ty::relate::{Relate, RelateResult, TypeRelation};
use rustc_middle::ty::{self, Ty, TyCtxt};
/// "Least upper bound" (common supertype)
pub struct Lub<'combine, 'infcx, 'tcx> {

36
src/librustc_infer/infer/mod.rs
View file

@ -8,21 +8,21 @@ pub use self::ValuePairs::*;
use crate::traits::{self, ObligationCause, PredicateObligations, TraitEngine};
use rustc::infer::canonical::{Canonical, CanonicalVarValues};
use rustc::infer::unify_key::{ConstVarValue, ConstVariableValue};
use rustc::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind, ToType};
use rustc::middle::free_region::RegionRelations;
use rustc::middle::region;
use rustc::mir;
use rustc::mir::interpret::ConstEvalResult;
use rustc::traits::select;
use rustc::ty::error::{ExpectedFound, TypeError, UnconstrainedNumeric};
use rustc::ty::fold::{TypeFoldable, TypeFolder};
use rustc::ty::relate::RelateResult;
use rustc::ty::subst::{GenericArg, GenericArgKind, InternalSubsts, SubstsRef};
pub use rustc::ty::IntVarValue;
use rustc::ty::{self, GenericParamDefKind, InferConst, Ty, TyCtxt};
use rustc::ty::{ConstVid, FloatVid, IntVid, TyVid};
use rustc_middle::infer::canonical::{Canonical, CanonicalVarValues};
use rustc_middle::infer::unify_key::{ConstVarValue, ConstVariableValue};
use rustc_middle::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind, ToType};
use rustc_middle::middle::free_region::RegionRelations;
use rustc_middle::middle::region;
use rustc_middle::mir;
use rustc_middle::mir::interpret::ConstEvalResult;
use rustc_middle::traits::select;
use rustc_middle::ty::error::{ExpectedFound, TypeError, UnconstrainedNumeric};
use rustc_middle::ty::fold::{TypeFoldable, TypeFolder};
use rustc_middle::ty::relate::RelateResult;
use rustc_middle::ty::subst::{GenericArg, GenericArgKind, InternalSubsts, SubstsRef};
pub use rustc_middle::ty::IntVarValue;
use rustc_middle::ty::{self, GenericParamDefKind, InferConst, Ty, TyCtxt};
use rustc_middle::ty::{ConstVid, FloatVid, IntVid, TyVid};
use rustc_ast::ast;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_data_structures::sync::Lrc;
@ -65,7 +65,7 @@ mod sub;
pub mod type_variable;
use crate::infer::canonical::OriginalQueryValues;
pub use rustc::infer::unify_key;
pub use rustc_middle::infer::unify_key;
#[must_use]
#[derive(Debug)]
@ -672,8 +672,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
}
pub fn type_is_unconstrained_numeric(&'a self, ty: Ty<'_>) -> UnconstrainedNumeric {
use rustc::ty::error::UnconstrainedNumeric::Neither;
use rustc::ty::error::UnconstrainedNumeric::{UnconstrainedFloat, UnconstrainedInt};
use rustc_middle::ty::error::UnconstrainedNumeric::Neither;
use rustc_middle::ty::error::UnconstrainedNumeric::{UnconstrainedFloat, UnconstrainedInt};
match ty.kind {
ty::Infer(ty::IntVar(vid)) => {
if self.inner.borrow_mut().int_unification_table.probe_value(vid).is_some() {

10
src/librustc_infer/infer/nll_relate/mod.rs
View file

@ -24,11 +24,11 @@
use crate::infer::InferCtxt;
use crate::infer::{ConstVarValue, ConstVariableValue};
use crate::traits::DomainGoal;
use rustc::ty::error::TypeError;
use rustc::ty::fold::{TypeFoldable, TypeVisitor};
use rustc::ty::relate::{self, Relate, RelateResult, TypeRelation};
use rustc::ty::subst::GenericArg;
use rustc::ty::{self, InferConst, Ty, TyCtxt};
use rustc_middle::ty::error::TypeError;
use rustc_middle::ty::fold::{TypeFoldable, TypeVisitor};
use rustc_middle::ty::relate::{self, Relate, RelateResult, TypeRelation};
use rustc_middle::ty::subst::GenericArg;
use rustc_middle::ty::{self, InferConst, Ty, TyCtxt};
use rustc_data_structures::fx::FxHashMap;
use std::fmt::Debug;

Some files were not shown because too many files have changed in this diff Show more