Move rustc_middle::middle::cstore to rustc_crate.

Author: cjgillot

Cargo.lock

@@ -3525,6 +3525,7 @@ dependencies = [
  "rustc_ast",
  "rustc_attr",
  "rustc_codegen_ssa",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -3557,6 +3558,7 @@ dependencies = [
  "rustc_apfloat",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_fs_util",
@@ -3574,6 +3576,34 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "rustc_crate"
+version = "0.0.0"
+dependencies = [
+ "bitflags",
+ "chalk-ir",
+ "measureme",
+ "polonius-engine",
+ "rustc-rayon-core",
+ "rustc_apfloat",
+ "rustc_arena",
+ "rustc_ast",
+ "rustc_attr",
+ "rustc_data_structures",
+ "rustc_errors",
+ "rustc_feature",
+ "rustc_hir",
+ "rustc_index",
+ "rustc_macros",
+ "rustc_query_system",
+ "rustc_serialize",
+ "rustc_session",
+ "rustc_span",
+ "rustc_target",
+ "smallvec 1.4.2",
+ "tracing",
+]
+
 [[package]]
 name = "rustc_data_structures"
 version = "0.0.0"
@@ -3611,6 +3641,7 @@ dependencies = [
  "rustc_ast",
  "rustc_ast_pretty",
  "rustc_codegen_ssa",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
@@ -3780,6 +3811,7 @@ dependencies = [
  "rustc_builtin_macros",
  "rustc_codegen_llvm",
  "rustc_codegen_ssa",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -3878,6 +3910,7 @@ dependencies = [
  "memmap",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -3911,6 +3944,7 @@ dependencies = [
  "rustc_arena",
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -4011,6 +4045,7 @@ version = "0.0.0"
 dependencies = [
  "rustc_ast",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
@@ -4029,6 +4064,7 @@ name = "rustc_plugin_impl"
 version = "0.0.0"
 dependencies = [
  "rustc_ast",
+ "rustc_crate",
  "rustc_errors",
  "rustc_hir",
  "rustc_lint",
@@ -4080,6 +4116,7 @@ dependencies = [
  "rustc_ast_lowering",
  "rustc_ast_pretty",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -4102,6 +4139,7 @@ dependencies = [
  "rls-span",
  "rustc_ast",
  "rustc_ast_pretty",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_hir_pretty",

compiler/rustc_codegen_cranelift/src/driver/aot.rs

@@ -5,9 +5,9 @@ use std::path::PathBuf;
 
 use rustc_codegen_ssa::back::linker::LinkerInfo;
 use rustc_codegen_ssa::{CodegenResults, CompiledModule, CrateInfo, ModuleKind};
+use rustc_crate::cstore::EncodedMetadata;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
-use rustc_middle::middle::cstore::EncodedMetadata;
 use rustc_middle::mir::mono::CodegenUnit;
 use rustc_session::cgu_reuse_tracker::CguReuse;
 use rustc_session::config::{DebugInfo, OutputType};

compiler/rustc_codegen_cranelift/src/driver/mod.rs

@@ -3,8 +3,8 @@
 
 use std::any::Any;
 
+use rustc_crate::cstore::EncodedMetadata;
 use rustc_middle::middle::codegen_fn_attrs::{Linkage as RLinkage, Visibility};
-use rustc_middle::middle::cstore::EncodedMetadata;
 use rustc_middle::mir::mono::MonoItem;
 
 use crate::prelude::*;

compiler/rustc_codegen_cranelift/src/lib.rs

@@ -18,6 +18,7 @@ extern crate snap;
 extern crate rustc_middle;
 extern crate rustc_ast;
 extern crate rustc_codegen_ssa;
+extern crate rustc_crate;
 extern crate rustc_data_structures;
 extern crate rustc_errors;
 extern crate rustc_fs_util;
@@ -37,9 +38,9 @@ use std::any::Any;
 
 use rustc_codegen_ssa::traits::CodegenBackend;
 use rustc_codegen_ssa::CodegenResults;
+use rustc_crate::cstore::{EncodedMetadata, MetadataLoader};
 use rustc_errors::ErrorReported;
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
-use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoader};
 use rustc_middle::ty::query::Providers;
 use rustc_session::config::OutputFilenames;
 use rustc_session::Session;

compiler/rustc_codegen_cranelift/src/metadata.rs

@@ -5,10 +5,10 @@ use std::fs::File;
 use std::path::Path;
 
 use rustc_codegen_ssa::METADATA_FILENAME;
+use rustc_crate::cstore::{EncodedMetadata, MetadataLoader};
 use rustc_data_structures::owning_ref::OwningRef;
 use rustc_data_structures::rustc_erase_owner;
 use rustc_data_structures::sync::MetadataRef;
-use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoader};
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config;
 use rustc_target::spec::Target;

compiler/rustc_codegen_llvm/Cargo.toml

@@ -18,6 +18,7 @@ rustc_middle = { path = "../rustc_middle" }
 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" }

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::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::cstore::EncodedMetadata;
 use rustc_middle::middle::exported_symbols;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::{DebugInfo, SanitizerSet};

compiler/rustc_codegen_llvm/src/lib.rs

@@ -23,10 +23,10 @@ use rustc_codegen_ssa::back::write::{CodegenContext, FatLTOInput, ModuleConfig};
 use rustc_codegen_ssa::traits::*;
 use rustc_codegen_ssa::ModuleCodegen;
 use rustc_codegen_ssa::{CodegenResults, CompiledModule};
+use rustc_crate::cstore::{EncodedMetadata, MetadataLoaderDyn};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{ErrorReported, FatalError, Handler};
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
-use rustc_middle::middle::cstore::{EncodedMetadata, MetadataLoaderDyn};
 use rustc_middle::ty::{self, TyCtxt};
 use rustc_session::config::{OptLevel, OutputFilenames, PrintRequest};
 use rustc_session::Session;

compiler/rustc_codegen_llvm/src/metadata.rs

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

compiler/rustc_codegen_ssa/Cargo.toml

@@ -20,6 +20,7 @@ pathdiff = "0.2.0"
 
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_ast = { path = "../rustc_ast" }
+rustc_crate = { path = "../rustc_crate" }
 rustc_span = { path = "../rustc_span" }
 rustc_middle = { path = "../rustc_middle" }
 rustc_apfloat = { path = "../rustc_apfloat" }