Move rustc_middle::middle::dependency_format to rustc_crate.

Author: cjgillot

compiler/rustc_codegen_cranelift/src/allocator.rs

@@ -13,7 +13,7 @@ pub(crate) fn codegen(
     unwind_context: &mut UnwindContext<'_>,
 ) -> bool {
     let any_dynamic_crate = tcx.dependency_formats(LOCAL_CRATE).iter().any(|(_, list)| {
-        use rustc_middle::middle::dependency_format::Linkage;
+        use rustc_crate::dependency_format::Linkage;
         list.iter().any(|&linkage| linkage == Linkage::Dynamic)
     });
     if any_dynamic_crate {

compiler/rustc_codegen_cranelift/src/driver/jit.rs

@@ -109,7 +109,7 @@ pub(super) fn run_jit(tcx: TyCtxt<'_>) -> ! {
 }
 
 fn load_imported_symbols_for_jit(tcx: TyCtxt<'_>) -> Vec<(String, *const u8)> {
-    use rustc_middle::middle::dependency_format::Linkage;
+    use rustc_crate::dependency_format::Linkage;
 
     let mut dylib_paths = Vec::new();
 

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -1,9 +1,9 @@
 use rustc_crate::cstore::{EncodedMetadata, LibSource, NativeLib};
+use rustc_crate::dependency_format::Linkage;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::temp_dir::MaybeTempDir;
 use rustc_fs_util::fix_windows_verbatim_for_gcc;
 use rustc_hir::def_id::CrateNum;
-use rustc_middle::middle::dependency_format::Linkage;
 use rustc_session::config::{self, CFGuard, CrateType, DebugInfo};
 use rustc_session::config::{OutputFilenames, OutputType, PrintRequest, SanitizerSet};
 use rustc_session::output::{check_file_is_writeable, invalid_output_for_target, out_filename};

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -10,9 +10,9 @@ use std::io::{self, BufWriter};
 use std::mem;
 use std::path::{Path, PathBuf};
 
+use rustc_crate::dependency_format::Linkage;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
-use rustc_middle::middle::dependency_format::Linkage;
 use rustc_middle::ty::TyCtxt;
 use rustc_serialize::{json, Encoder};
 use rustc_session::config::{self, CrateType, DebugInfo, LinkerPluginLto, Lto, OptLevel, Strip};

compiler/rustc_codegen_ssa/src/base.rs

@@ -521,7 +521,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::middle::dependency_format::Linkage;
+        use rustc_crate::dependency_format::Linkage;
         list.iter().any(|&linkage| linkage == Linkage::Dynamic)
     });
     let allocator_module = if any_dynamic_crate {

compiler/rustc_codegen_ssa/src/lib.rs

@@ -21,12 +21,12 @@ extern crate tracing;
 extern crate rustc_middle;
 
 use rustc_crate::cstore::{CrateSource, EncodedMetadata, LibSource, NativeLib};
+use rustc_crate::dependency_format::Dependencies;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::sync::Lrc;
 use rustc_hir::def_id::CrateNum;
 use rustc_hir::LangItem;
 use rustc_middle::dep_graph::WorkProduct;
-use rustc_middle::middle::dependency_format::Dependencies;
 use rustc_middle::ty::query::Providers;
 use rustc_session::config::{OutputFilenames, OutputType, RUST_CGU_EXT};
 use rustc_span::symbol::Symbol;

compiler/rustc_middle/src/middle/dependency_format.rs renamed to compiler/rustc_crate/src/dependency_format.rs

@@ -19,7 +19,7 @@ pub type DependencyList = Vec<Linkage>;
 /// This is local to the tcx, and is generally relevant to one session.
 pub type Dependencies = Vec<(CrateType, DependencyList)>;
 
-#[derive(Copy, Clone, PartialEq, Debug, HashStable, Encodable, Decodable)]
+#[derive(Copy, Clone, PartialEq, Debug, HashStable_Generic, Encodable, Decodable)]
 pub enum Linkage {
     NotLinked,
     IncludedFromDylib,

compiler/rustc_crate/src/lib.rs

@@ -9,6 +9,7 @@ extern crate rustc_macros;
 
 pub mod codegen_fn_attrs;
 pub mod cstore;
+pub mod dependency_format;
 
 /// Requirements for a `StableHashingContext` to be used in this crate.
 /// This is a hack to allow using the `HashStable_Generic` derive macro

compiler/rustc_metadata/src/dependency_format.rs

@@ -55,9 +55,9 @@ use crate::creader::CStore;
 
 use rustc_crate::cstore::CrateDepKind;
 use rustc_crate::cstore::LinkagePreference::{self, RequireDynamic, RequireStatic};
+use rustc_crate::dependency_format::{Dependencies, DependencyList, Linkage};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def_id::CrateNum;
-use rustc_middle::middle::dependency_format::{Dependencies, DependencyList, Linkage};
 use rustc_middle::middle::used_crates;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::CrateType;

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -3,6 +3,7 @@ use crate::rmeta::*;
 
 use rustc_ast as ast;
 use rustc_crate::cstore::{EncodedMetadata, ForeignModule, LinkagePreference, NativeLib};
+use rustc_crate::dependency_format::Linkage;
 use rustc_data_structures::fingerprint::{Fingerprint, FingerprintEncoder};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexSet};
 use rustc_data_structures::stable_hasher::StableHasher;
@@ -17,7 +18,6 @@ use rustc_hir::{AnonConst, GenericParamKind};
 use rustc_index::bit_set::GrowableBitSet;
 use rustc_index::vec::Idx;
 use rustc_middle::hir::map::Map;
-use rustc_middle::middle::dependency_format::Linkage;
 use rustc_middle::middle::exported_symbols::{
     metadata_symbol_name, ExportedSymbol, SymbolExportLevel,
 };