Move rustc_middle::middle::privacy to rustc_crate.

Author: cjgillot

Cargo.lock

@@ -3857,6 +3857,7 @@ dependencies = [
  "rustc_ast",
  "rustc_ast_pretty",
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -4080,6 +4081,7 @@ name = "rustc_privacy"
 version = "0.0.0"
 dependencies = [
  "rustc_attr",
+ "rustc_crate",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",

compiler/rustc_crate/src/lib.rs

@@ -14,6 +14,7 @@ pub mod codegen_fn_attrs;
 pub mod cstore;
 pub mod dependency_format;
 pub mod limits;
+pub mod privacy;
 
 #[derive(HashStable_Generic)]
 pub struct LibFeatures {

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

@@ -4,12 +4,11 @@
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::HirId;
-use rustc_macros::HashStable;
 use std::fmt;
 use std::hash::Hash;
 
 // Accessibility levels, sorted in ascending order
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, HashStable)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, HashStable_Generic)]
 pub enum AccessLevel {
     /// Superset of `AccessLevel::Reachable` used to mark impl Trait items.
     ReachableFromImplTrait,

compiler/rustc_lint/Cargo.toml

@@ -10,6 +10,7 @@ unicode-security = "0.0.5"
 rustc_middle = { path = "../rustc_middle" }
 rustc_ast_pretty = { path = "../rustc_ast_pretty" }
 rustc_attr = { path = "../rustc_attr" }
+rustc_crate = { path = "../rustc_crate" }
 rustc_errors = { path = "../rustc_errors" }
 rustc_hir = { path = "../rustc_hir" }
 rustc_target = { path = "../rustc_target" }

compiler/rustc_lint/src/context.rs

@@ -20,6 +20,7 @@ use crate::levels::LintLevelsBuilder;
 use crate::passes::{EarlyLintPassObject, LateLintPassObject};
 use rustc_ast as ast;
 use rustc_ast::util::lev_distance::find_best_match_for_name;
+use rustc_crate::privacy::AccessLevels;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync;
 use rustc_errors::{add_elided_lifetime_in_path_suggestion, struct_span_err, Applicability};
@@ -28,7 +29,6 @@ use rustc_hir::def::Res;
 use rustc_hir::def_id::{CrateNum, DefId};
 use rustc_hir::definitions::{DefPathData, DisambiguatedDefPathData};
 use rustc_middle::lint::LintDiagnosticBuilder;
-use rustc_middle::middle::privacy::AccessLevels;
 use rustc_middle::middle::stability;
 use rustc_middle::ty::layout::{LayoutError, TyAndLayout};
 use rustc_middle::ty::print::with_no_trimmed_paths;

compiler/rustc_middle/src/arena.rs

@@ -75,7 +75,7 @@ macro_rules! arena_types {
                     rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::Ty<'tcx>>
                 >,
             [few] all_traits: Vec<rustc_hir::def_id::DefId>,
-            [few] privacy_access_levels: rustc_middle::middle::privacy::AccessLevels,
+            [few] privacy_access_levels: rustc_crate::privacy::AccessLevels,
             [few] foreign_module: rustc_crate::cstore::ForeignModule,
             [few] foreign_modules: Vec<rustc_crate::cstore::ForeignModule>,
             [] upvars_mentioned: rustc_data_structures::fx::FxIndexMap<rustc_hir::HirId, rustc_hir::Upvar>,

compiler/rustc_middle/src/ich/impls_ty.rs

@@ -184,10 +184,10 @@ impl<'a> HashStable<StableHashingContext<'a>> for ty::FloatVid {
     }
 }
 
-impl<'a> HashStable<StableHashingContext<'a>> for crate::middle::privacy::AccessLevels {
+impl<'a> HashStable<StableHashingContext<'a>> for rustc_crate::privacy::AccessLevels {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
         hcx.with_node_id_hashing_mode(NodeIdHashingMode::HashDefPath, |hcx| {
-            let crate::middle::privacy::AccessLevels { ref map } = *self;
+            let rustc_crate::privacy::AccessLevels { ref map } = *self;
 
             map.hash_stable(hcx, hasher);
         });

compiler/rustc_middle/src/middle/mod.rs

@@ -4,7 +4,6 @@ use rustc_span::def_id::{CrateNum, LOCAL_CRATE};
 
 pub mod exported_symbols;
 pub mod lang_items;
-pub mod privacy;
 pub mod region;
 pub mod resolve_lifetime;
 pub mod stability;

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::privacy::AccessLevels;
 use crate::middle::region;
 use crate::middle::resolve_lifetime::{ObjectLifetimeDefault, Region, ResolveLifetimes};
 use crate::middle::stability::{self, DeprecationEntry};
@@ -31,6 +30,7 @@ use rustc_crate::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_crate::cstore::{
     CrateDepKind, CrateSource, ExternCrate, ForeignModule, LinkagePreference, NativeLib,
 };
+use rustc_crate::privacy::AccessLevels;
 use rustc_crate::LibFeatures;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};

compiler/rustc_passes/src/dead.rs

@@ -3,6 +3,7 @@
 // from live codes are live, and everything else is dead.
 
 use rustc_crate::codegen_fn_attrs::CodegenFnAttrFlags;
+use rustc_crate::privacy;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 use rustc_hir::def::{CtorOf, DefKind, Res};
@@ -11,7 +12,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::privacy;
 use rustc_middle::ty::{self, DefIdTree, TyCtxt};
 use rustc_session::lint;