Move rustc_middle::middle::lib_features to rustc_crate.

Author: cjgillot

compiler/rustc_crate/src/lib.rs

@@ -7,10 +7,33 @@ extern crate bitflags;
 #[macro_use]
 extern crate rustc_macros;
 
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_span::symbol::Symbol;
+
 pub mod codegen_fn_attrs;
 pub mod cstore;
 pub mod dependency_format;
 
+#[derive(HashStable_Generic)]
+pub struct LibFeatures {
+    // A map from feature to stabilisation version.
+    pub stable: FxHashMap<Symbol, Symbol>,
+    pub unstable: FxHashSet<Symbol>,
+}
+
+impl LibFeatures {
+    pub fn to_vec(&self) -> Vec<(Symbol, Option<Symbol>)> {
+        let mut all_features: Vec<_> = self
+            .stable
+            .iter()
+            .map(|(f, s)| (*f, Some(*s)))
+            .chain(self.unstable.iter().map(|f| (*f, None)))
+            .collect();
+        all_features.sort_unstable_by_key(|f| f.0.as_str());
+        all_features
+    }
+}
+
 /// Requirements for a `StableHashingContext` to be used in this crate.
 /// This is a hack to allow using the `HashStable_Generic` derive macro
 /// instead of implementing everything in librustc_middle.

compiler/rustc_middle/src/middle/mod.rs

@@ -4,30 +4,6 @@ use rustc_span::def_id::{CrateNum, LOCAL_CRATE};
 
 pub mod exported_symbols;
 pub mod lang_items;
-pub mod lib_features {
-    use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-    use rustc_span::symbol::Symbol;
-
-    #[derive(HashStable)]
-    pub struct LibFeatures {
-        // A map from feature to stabilisation version.
-        pub stable: FxHashMap<Symbol, Symbol>,
-        pub unstable: FxHashSet<Symbol>,
-    }
-
-    impl LibFeatures {
-        pub fn to_vec(&self) -> Vec<(Symbol, Option<Symbol>)> {
-            let mut all_features: Vec<_> = self
-                .stable
-                .iter()
-                .map(|(f, s)| (*f, Some(*s)))
-                .chain(self.unstable.iter().map(|f| (*f, None)))
-                .collect();
-            all_features.sort_unstable_by_key(|f| f.0.as_str());
-            all_features
-        }
-    }
-}
 pub mod limits;
 pub mod privacy;
 pub mod region;

compiler/rustc_middle/src/ty/context.rs

@@ -6,7 +6,6 @@ use crate::hir::exports::ExportMap;
 use crate::ich::{NodeIdHashingMode, StableHashingContext};
 use crate::infer::canonical::{Canonical, CanonicalVarInfo, CanonicalVarInfos};
 use crate::lint::{struct_lint_level, LintDiagnosticBuilder, LintSource};
-use crate::middle;
 use crate::middle::resolve_lifetime::{self, ObjectLifetimeDefault};
 use crate::middle::stability;
 use crate::mir::interpret::{self, Allocation, ConstValue, Scalar};
@@ -1188,7 +1187,7 @@ impl<'tcx> TyCtxt<'tcx> {
         self.sess.consider_optimizing(&cname, msg)
     }
 
-    pub fn lib_features(self) -> &'tcx middle::lib_features::LibFeatures {
+    pub fn lib_features(self) -> &'tcx rustc_crate::LibFeatures {
         self.get_lib_features(LOCAL_CRATE)
     }
 

compiler/rustc_middle/src/ty/query/mod.rs

@@ -4,7 +4,6 @@ use crate::hir::map;
 use crate::infer::canonical::{self, Canonical};
 use crate::lint::LintLevelMap;
 use crate::middle::exported_symbols::{ExportedSymbol, SymbolExportLevel};
-use crate::middle::lib_features::LibFeatures;
 use crate::middle::privacy::AccessLevels;
 use crate::middle::region;
 use crate::middle::resolve_lifetime::{ObjectLifetimeDefault, Region, ResolveLifetimes};
@@ -32,6 +31,7 @@ use rustc_crate::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_crate::cstore::{
     CrateDepKind, CrateSource, ExternCrate, ForeignModule, LinkagePreference, NativeLib,
 };
+use rustc_crate::LibFeatures;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};
 use rustc_data_structures::stable_hasher::StableVec;

compiler/rustc_passes/src/lib_features.rs

@@ -5,11 +5,11 @@
 // (unlike lang features), which means we need to collect them instead.
 
 use rustc_ast::{Attribute, MetaItem, MetaItemKind};
+use rustc_crate::LibFeatures;
 use rustc_errors::struct_span_err;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_middle::hir::map::Map;
-use rustc_middle::middle::lib_features::LibFeatures;
 use rustc_middle::ty::query::Providers;
 use rustc_middle::ty::TyCtxt;
 use rustc_span::symbol::Symbol;