Move rustc_middle::middle::codegen_fn_attrs to rustc_crate.

cjgillot · cjgillot · commit 224e3b4ab51d · 2020-11-15T22:10:11.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
@@ -3972,6 +3972,7 @@ dependencies = [
  "rustc_apfloat",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_graphviz",
@@ -4205,6 +4206,7 @@ dependencies = [
  "punycode",
  "rustc-demangle",
  "rustc_ast",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_middle",
@@ -4300,6 +4302,7 @@ dependencies = [
  "rustc_arena",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
diff --git a/compiler/rustc_codegen_cranelift/src/abi/mod.rs b/compiler/rustc_codegen_cranelift/src/abi/mod.rs
@@ -5,7 +5,7 @@ mod comments;
 mod pass_mode;
 mod returning;
 
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_target::spec::abi::Abi;
 
 use cranelift_codegen::ir::{AbiParam, ArgumentPurpose};
diff --git a/compiler/rustc_codegen_cranelift/src/constant.rs b/compiler/rustc_codegen_cranelift/src/constant.rs
@@ -4,7 +4,7 @@ use rustc_span::DUMMY_SP;
 
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::ErrorReported;
-use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, Linkage as RLinkage};
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrFlags, Linkage as RLinkage};
 use rustc_middle::mir::interpret::{
     read_target_uint, AllocId, Allocation, ConstValue, ErrorHandled, GlobalAlloc, Pointer, Scalar,
 };
diff --git a/compiler/rustc_codegen_cranelift/src/driver/mod.rs b/compiler/rustc_codegen_cranelift/src/driver/mod.rs
@@ -4,7 +4,7 @@
 use std::any::Any;
 
 use rustc_crate::cstore::EncodedMetadata;
-use rustc_middle::middle::codegen_fn_attrs::{Linkage as RLinkage, Visibility};
+use rustc_crate::codegen_fn_attrs::{Linkage as RLinkage, Visibility};
 use rustc_middle::mir::mono::MonoItem;
 
 use crate::prelude::*;
diff --git a/compiler/rustc_codegen_cranelift/src/linkage.rs b/compiler/rustc_codegen_cranelift/src/linkage.rs
@@ -1,4 +1,4 @@
-use rustc_middle::middle::codegen_fn_attrs::{Linkage as RLinkage, Visibility};
+use rustc_crate::codegen_fn_attrs::{Linkage as RLinkage, Visibility};
 use rustc_middle::mir::mono::MonoItem;
 
 use crate::prelude::*;
diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml
@@ -15,10 +15,10 @@ measureme = "9.0.0"
 snap = "1"
 tracing = "0.1"
 rustc_middle = { path = "../rustc_middle" }
+rustc_crate = { path = "../rustc_crate" }
 rustc-demangle = "0.1.18"
 rustc_attr = { path = "../rustc_attr" }
 rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
-rustc_crate = { path = "../rustc_crate" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
 rustc_feature = { path = "../rustc_feature" }
diff --git a/compiler/rustc_codegen_llvm/src/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs
@@ -3,11 +3,11 @@
 use std::ffi::CString;
 
 use rustc_codegen_ssa::traits::*;
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_data_structures::const_cstr;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_hir::def_id::DefId;
-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, TyCtxt};
diff --git a/compiler/rustc_codegen_llvm/src/base.rs b/compiler/rustc_codegen_llvm/src/base.rs
@@ -27,10 +27,10 @@ use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
 use rustc_codegen_ssa::mono_item::MonoItemExt;
 use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::{ModuleCodegen, ModuleKind};
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrs, Linkage, Visibility};
 use rustc_crate::cstore::EncodedMetadata;
 use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_middle::dep_graph;
-use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrs, Linkage, Visibility};
 use rustc_middle::middle::exported_symbols;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{DebugInfo, SanitizerSet};
diff --git a/compiler/rustc_codegen_llvm/src/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs
@@ -7,11 +7,11 @@ use crate::type_of::LayoutLlvmExt;
 use crate::value::Value;
 use libc::c_uint;
 use rustc_codegen_ssa::traits::*;
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_data_structures::const_cstr;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::Node;
-use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_middle::mir::interpret::{
     read_target_uint, Allocation, ErrorHandled, GlobalAlloc, Pointer,
 };
diff --git a/compiler/rustc_codegen_llvm/src/mono_item.rs b/compiler/rustc_codegen_llvm/src/mono_item.rs
@@ -5,8 +5,8 @@ use crate::context::CodegenCx;
 use crate::llvm;
 use crate::type_of::LayoutLlvmExt;
 use rustc_codegen_ssa::traits::*;
+use rustc_crate::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
-use rustc_middle::middle::codegen_fn_attrs::{Linkage, Visibility};
 pub use rustc_middle::mir::mono::MonoItem;
 use rustc_middle::ty::layout::FnAbiExt;
 use rustc_middle::ty::{self, Instance, TypeFoldable};
diff --git a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
@@ -1,13 +1,13 @@
 use std::collections::hash_map::Entry::*;
 
 use rustc_ast::expand::allocator::ALLOCATOR_METHODS;
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrFlags, Linkage, Visibility};
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_hir::Node;
 use rustc_index::vec::IndexVec;
-use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, Linkage, Visibility};
 use rustc_middle::middle::exported_symbols::{
     metadata_symbol_name, ExportedSymbol, SymbolExportLevel,
 };
diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs
@@ -26,6 +26,7 @@ use crate::traits::*;
 use crate::{CachedModuleCodegen, CrateInfo, MemFlags, ModuleCodegen, ModuleKind};
 
 use rustc_attr as attr;
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_crate::cstore::{EncodedMetadata, LinkagePreference};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::profiling::print_time_passes_entry;
@@ -34,7 +35,6 @@ use rustc_hir as hir;
 use rustc_hir::def_id::{LocalDefId, LOCAL_CRATE};
 use rustc_hir::lang_items::LangItem;
 use rustc_index::vec::Idx;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_middle::middle::{lang_items, used_crates};
 use rustc_middle::mir::mono::{CodegenUnit, CodegenUnitNameBuilder, MonoItem};
 use rustc_middle::ty::layout::{HasTyCtxt, TyAndLayout};
diff --git a/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
@@ -1,6 +1,6 @@
 use crate::traits::*;
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_index::vec::IndexVec;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::mir;
 use rustc_middle::ty;
 use rustc_session::config::DebugInfo;
diff --git a/compiler/rustc_codegen_ssa/src/mono_item.rs b/compiler/rustc_codegen_ssa/src/mono_item.rs
@@ -1,7 +1,7 @@
 use crate::base;
 use crate::traits::*;
+use rustc_crate::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_hir as hir;
-use rustc_middle::middle::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_middle::ty::layout::HasTyCtxt;
 
 use rustc_middle::mir::mono::MonoItem;
diff --git a/compiler/rustc_codegen_ssa/src/traits/declare.rs b/compiler/rustc_codegen_ssa/src/traits/declare.rs
@@ -1,6 +1,6 @@
 use super::BackendTypes;
+use rustc_crate::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_hir::def_id::DefId;
-use rustc_middle::middle::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_middle::ty::Instance;
 
 pub trait PreDefineMethods<'tcx>: BackendTypes {
diff --git a/compiler/rustc_crate/src/codegen_fn_attrs.rs b/compiler/rustc_crate/src/codegen_fn_attrs.rs
@@ -5,7 +5,7 @@ use rustc_span::symbol::Symbol;
 /// Specifies the linkage type for a `MonoItem`.
 ///
 /// See <https://llvm.org/docs/LangRef.html#linkage-types> for more details about these variants.
-#[derive(Copy, Clone, PartialEq, Debug, TyEncodable, TyDecodable, HashStable)]
+#[derive(Copy, Clone, PartialEq, Debug, Encodable, Decodable, HashStable_Generic)]
 pub enum Linkage {
     External,
     AvailableExternally,
@@ -20,14 +20,14 @@ pub enum Linkage {
     Common,
 }
 
-#[derive(Copy, Clone, PartialEq, Debug, HashStable)]
+#[derive(Copy, Clone, PartialEq, Debug, HashStable_Generic)]
 pub enum Visibility {
     Default,
     Hidden,
     Protected,
 }
 
-#[derive(Clone, TyEncodable, TyDecodable, HashStable)]
+#[derive(Clone, Encodable, Decodable, HashStable_Generic)]
 pub struct CodegenFnAttrs {
     pub flags: CodegenFnAttrFlags,
     /// Parsed representation of the `#[inline]` attribute
@@ -65,7 +65,7 @@ pub struct CodegenFnAttrs {
 }
 
 bitflags! {
-    #[derive(TyEncodable, TyDecodable, HashStable)]
+    #[derive(Encodable, Decodable, HashStable_Generic)]
     pub struct CodegenFnAttrFlags: u32 {
         /// `#[cold]`: a hint to LLVM that this function, when called, is never on
         /// the hot path.
diff --git a/compiler/rustc_crate/src/lib.rs b/compiler/rustc_crate/src/lib.rs
@@ -2,9 +2,12 @@
 #![feature(once_cell)]
 #![feature(or_patterns)]
 
+#[macro_use]
+extern crate bitflags;
 #[macro_use]
 extern crate rustc_macros;
 
+pub mod codegen_fn_attrs;
 pub mod cstore;
 
 /// Requirements for a `StableHashingContext` to be used in this crate.
diff --git a/compiler/rustc_middle/src/middle/mod.rs b/compiler/rustc_middle/src/middle/mod.rs
@@ -2,7 +2,6 @@ use crate::ty::TyCtxt;
 use rustc_crate::cstore::{LibSource, LinkagePreference};
 use rustc_span::def_id::{CrateNum, LOCAL_CRATE};
 
-pub mod codegen_fn_attrs;
 pub mod dependency_format;
 pub mod exported_symbols;
 pub mod lang_items;
diff --git a/compiler/rustc_middle/src/mir/mono.rs b/compiler/rustc_middle/src/mir/mono.rs
@@ -1,8 +1,8 @@
 use crate::dep_graph::{DepConstructor, DepNode, WorkProduct, WorkProductId};
 use crate::ich::{NodeIdHashingMode, StableHashingContext};
-use crate::middle::codegen_fn_attrs::{Linkage, Visibility};
 use crate::ty::{subst::InternalSubsts, Instance, InstanceDef, SymbolName, TyCtxt};
 use rustc_attr::InlineAttr;
+use rustc_crate::codegen_fn_attrs::{Linkage, Visibility};
 use rustc_data_structures::base_n;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
diff --git a/compiler/rustc_middle/src/ty/instance.rs b/compiler/rustc_middle/src/ty/instance.rs
@@ -1,7 +1,7 @@
-use crate::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use crate::ty::print::{FmtPrinter, Printer};
 use crate::ty::subst::{InternalSubsts, Subst};
 use crate::ty::{self, SubstsRef, Ty, TyCtxt, TypeFoldable};
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_errors::ErrorReported;
 use rustc_hir::def::Namespace;
 use rustc_hir::def_id::{CrateNum, DefId};
diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs
@@ -1,8 +1,8 @@
 use crate::ich::StableHashingContext;
-use crate::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use crate::mir::{GeneratorLayout, GeneratorSavedLocal};
 use crate::ty::subst::Subst;
 use crate::ty::{self, subst::SubstsRef, ReprOptions, Ty, TyCtxt, TypeFoldable};
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 
 use rustc_ast::{self as ast, IntTy, UintTy};
 use rustc_attr as attr;
diff --git a/compiler/rustc_middle/src/ty/query/mod.rs b/compiler/rustc_middle/src/ty/query/mod.rs
@@ -3,7 +3,6 @@ use crate::hir::exports::Export;
 use crate::hir::map;
 use crate::infer::canonical::{self, Canonical};
 use crate::lint::LintLevelMap;
-use crate::middle::codegen_fn_attrs::CodegenFnAttrs;
 use crate::middle::exported_symbols::{ExportedSymbol, SymbolExportLevel};
 use crate::middle::lib_features::LibFeatures;
 use crate::middle::privacy::AccessLevels;
@@ -29,6 +28,7 @@ use crate::traits::{self, ImplSource};
 use crate::ty::subst::{GenericArg, SubstsRef};
 use crate::ty::util::AlwaysRequiresDrop;
 use crate::ty::{self, AdtSizedConstraint, CrateInherentImpls, ParamEnvAnd, Ty, TyCtxt};
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_crate::cstore::{
     CrateDepKind, CrateSource, ExternCrate, ForeignModule, LinkagePreference, NativeLib,
 };
diff --git a/compiler/rustc_middle/src/ty/util.rs b/compiler/rustc_middle/src/ty/util.rs
@@ -1,7 +1,6 @@
 //! Miscellaneous type-system utilities that are too small to deserve their own modules.
 
 use crate::ich::NodeIdHashingMode;
-use crate::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use crate::ty::fold::TypeFolder;
 use crate::ty::layout::IntegerExt;
 use crate::ty::query::TyCtxtAt;
@@ -11,6 +10,7 @@ use crate::ty::{self, DefIdTree, List, Ty, TyCtxt, TypeFoldable};
 use rustc_apfloat::Float as _;
 use rustc_ast as ast;
 use rustc_attr::{self as attr, SignedInt, UnsignedInt};
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_errors::ErrorReported;
diff --git a/compiler/rustc_mir/Cargo.toml b/compiler/rustc_mir/Cargo.toml
@@ -15,6 +15,7 @@ tracing = "0.1"
 polonius-engine = "0.12.0"
 regex = "1"
 rustc_middle = { path = "../rustc_middle" }
+rustc_crate = { path = "../rustc_crate" }
 rustc_attr = { path = "../rustc_attr" }
 rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_errors = { path = "../rustc_errors" }
diff --git a/compiler/rustc_mir/src/monomorphize/collector.rs b/compiler/rustc_mir/src/monomorphize/collector.rs
@@ -176,6 +176,7 @@
 
 use crate::monomorphize;
 
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::sync::{par_iter, MTLock, MTRef, ParallelIterator};
 use rustc_errors::{ErrorReported, FatalError};
@@ -184,7 +185,6 @@ use rustc_hir::def_id::{DefId, DefIdMap, LocalDefId, LOCAL_CRATE};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::lang_items::LangItem;
 use rustc_index::bit_set::GrowableBitSet;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::mir::interpret::{AllocId, ConstValue};
 use rustc_middle::mir::interpret::{ErrorHandled, GlobalAlloc, Scalar};
 use rustc_middle::mir::mono::{InstantiationMode, MonoItem};
diff --git a/compiler/rustc_mir/src/monomorphize/partitioning/default.rs b/compiler/rustc_mir/src/monomorphize/partitioning/default.rs
@@ -1,10 +1,10 @@
 use std::collections::hash_map::Entry;
 
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrFlags, Linkage, Visibility};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_hir::definitions::DefPathDataName;
-use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, Linkage, Visibility};
 use rustc_middle::middle::exported_symbols::SymbolExportLevel;
 use rustc_middle::mir::mono::{CodegenUnit, CodegenUnitNameBuilder};
 use rustc_middle::mir::mono::{InstantiationMode, MonoItem};
diff --git a/compiler/rustc_mir/src/monomorphize/partitioning/mod.rs b/compiler/rustc_mir/src/monomorphize/partitioning/mod.rs
@@ -95,10 +95,10 @@
 mod default;
 mod merging;
 
+use rustc_crate::codegen_fn_attrs::Linkage;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::sync;
 use rustc_hir::def_id::{CrateNum, DefIdSet, LOCAL_CRATE};
-use rustc_middle::middle::codegen_fn_attrs::Linkage;
 use rustc_middle::mir::mono::{CodegenUnit, MonoItem};
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::query::Providers;
diff --git a/compiler/rustc_mir/src/transform/inline.rs b/compiler/rustc_mir/src/transform/inline.rs
@@ -1,10 +1,10 @@
 //! Inlining pass for MIR functions
 
 use rustc_attr as attr;
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_hir as hir;
 use rustc_index::bit_set::BitSet;
 use rustc_index::vec::Idx;
-use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_middle::mir::visit::*;
 use rustc_middle::mir::*;
 use rustc_middle::ty::subst::Subst;
diff --git a/compiler/rustc_passes/src/dead.rs b/compiler/rustc_passes/src/dead.rs
@@ -2,6 +2,7 @@
 // closely. The idea is that all reachable symbols are live, codes called
 // from live codes are live, and everything else is dead.
 
+use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 use rustc_hir::def::{CtorOf, DefKind, Res};
@@ -10,7 +11,6 @@ use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::{Node, PatKind, TyKind};
 use rustc_middle::hir::map::Map;
-use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::middle::privacy;
 use rustc_middle::ty::{self, DefIdTree, TyCtxt};
 use rustc_session::lint;
diff --git a/compiler/rustc_passes/src/reachable.rs b/compiler/rustc_passes/src/reachable.rs
@@ -5,6 +5,7 @@
 // makes all other generics or inline functions that it references
 // reachable as well.
 
+use rustc_crate::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
@@ -13,7 +14,6 @@ use rustc_hir::def_id::{CrateNum, DefId, LocalDefId};
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::Node;
-use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_middle::middle::privacy;
 use rustc_middle::ty::query::Providers;
 use rustc_middle::ty::{self, DefIdTree, TyCtxt};
diff --git a/compiler/rustc_symbol_mangling/Cargo.toml b/compiler/rustc_symbol_mangling/Cargo.toml
@@ -13,6 +13,7 @@ punycode = "0.4.0"
 rustc-demangle = "0.1.18"
 
 rustc_ast = { path = "../rustc_ast" }
+rustc_crate = { path = "../rustc_crate" }
 rustc_span = { path = "../rustc_span" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_hir = { path = "../rustc_hir" }
diff --git a/compiler/rustc_symbol_mangling/src/lib.rs b/compiler/rustc_symbol_mangling/src/lib.rs
diff --git a/compiler/rustc_typeck/Cargo.toml b/compiler/rustc_typeck/Cargo.toml
diff --git a/compiler/rustc_typeck/src/collect.rs b/compiler/rustc_typeck/src/collect.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use rustc_middle::middle::codegen_fn_attrs::{Linkage as RLinkage, Visibility};`
	`1`	`+use rustc_crate::codegen_fn_attrs::{Linkage as RLinkage, Visibility};`
`2`	`2`	`use rustc_middle::mir::mono::MonoItem;`
`3`	`3`
`4`	`4`	`use crate::prelude::*;`