From 7985c6f8ecf680dcc960bb2ccc0c787274a449de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= <john.kare.alsaker@gmail.com>
Date: Wed, 6 Mar 2019 04:50:50 +0100
Subject: [PATCH] Rename check_privacy to check_private_in_public

---
 src/librustc/dep_graph/dep_node.rs | 2 +-
 src/librustc/ty/query/config.rs    | 4 ++--
 src/librustc/ty/query/mod.rs       | 2 +-
 src/librustc/ty/query/plumbing.rs  | 2 +-
 src/librustc_interface/passes.rs   | 4 ++--
 src/librustc_privacy/lib.rs        | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs
index a46ffffe94cb..41a4a8031006 100644
--- a/src/librustc/dep_graph/dep_node.rs
+++ b/src/librustc/dep_graph/dep_node.rs
@@ -456,7 +456,7 @@ define_dep_nodes!( <'tcx>
     [eval_always] CoherenceInherentImplOverlapCheck,
     [] CoherenceCheckTrait(DefId),
     [eval_always] PrivacyAccessLevels(CrateNum),
-    [eval_always] CheckPrivacy(CrateNum),
+    [eval_always] CheckPrivateInPublic(CrateNum),
     [eval_always] Analysis(CrateNum),
 
     // Represents the MIR for a fn; also used as the task node for
diff --git a/src/librustc/ty/query/config.rs b/src/librustc/ty/query/config.rs
index 0fef90c945e9..835a8314959a 100644
--- a/src/librustc/ty/query/config.rs
+++ b/src/librustc/ty/query/config.rs
@@ -369,9 +369,9 @@ impl<'tcx> QueryDescription<'tcx> for queries::privacy_access_levels<'tcx> {
     }
 }
 
-impl<'tcx> QueryDescription<'tcx> for queries::check_privacy<'tcx> {
+impl<'tcx> QueryDescription<'tcx> for queries::check_private_in_public<'tcx> {
     fn describe(_: TyCtxt<'_, '_, '_>, _: CrateNum) -> Cow<'static, str> {
-        "privacy checking".into()
+        "checking for private elements in public interfaces".into()
     }
 }
 
diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs
index cb72ad6fe8bd..8804ed22264c 100644
--- a/src/librustc/ty/query/mod.rs
+++ b/src/librustc/ty/query/mod.rs
@@ -352,7 +352,7 @@ define_queries! { <'tcx>
 
         /// Performs part of the privacy check and computes "access levels".
         [] fn privacy_access_levels: PrivacyAccessLevels(CrateNum) -> Lrc<AccessLevels>,
-        [] fn check_privacy: CheckPrivacy(CrateNum) -> (),
+        [] fn check_private_in_public: CheckPrivateInPublic(CrateNum) -> (),
     },
 
     Other {
diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs
index ff2639da1365..e3276ba0bea7 100644
--- a/src/librustc/ty/query/plumbing.rs
+++ b/src/librustc/ty/query/plumbing.rs
@@ -1251,7 +1251,7 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>,
             force!(crate_inherent_impls_overlap_check, LOCAL_CRATE)
         },
         DepKind::PrivacyAccessLevels => { force!(privacy_access_levels, LOCAL_CRATE); }
-        DepKind::CheckPrivacy => { force!(check_privacy, LOCAL_CRATE); }
+        DepKind::CheckPrivateInPublic => { force!(check_private_in_public, LOCAL_CRATE); }
         DepKind::MirBuilt => { force!(mir_built, def_id!()); }
         DepKind::MirConstQualif => { force!(mir_const_qualif, def_id!()); }
         DepKind::MirConst => { force!(mir_const, def_id!()); }
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs
index 2066747a6ffb..8277615b4650 100644
--- a/src/librustc_interface/passes.rs
+++ b/src/librustc_interface/passes.rs
@@ -281,8 +281,8 @@ fn analysis<'tcx>(
                 tcx.ensure().privacy_access_levels(LOCAL_CRATE);
             });
             parallel!({
-                time(sess, "privacy checking", || {
-                    tcx.ensure().check_privacy(LOCAL_CRATE);
+                time(sess, "private in public", || {
+                    tcx.ensure().check_private_in_public(LOCAL_CRATE);
                 });
             }, {
                 time(sess, "death checking", || middle::dead::check_crate(tcx));
diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
index 372a92306942..5443f08debf7 100644
--- a/src/librustc_privacy/lib.rs
+++ b/src/librustc_privacy/lib.rs
@@ -1760,7 +1760,7 @@ impl<'a, 'tcx> Visitor<'tcx> for PrivateItemsInPublicInterfacesVisitor<'a, 'tcx>
 pub fn provide(providers: &mut Providers<'_>) {
     *providers = Providers {
         privacy_access_levels,
-        check_privacy,
+        check_private_in_public,
         check_mod_privacy,
         ..*providers
     };
@@ -1820,7 +1820,7 @@ fn privacy_access_levels<'tcx>(
     Lrc::new(visitor.access_levels)
 }
 
-fn check_privacy<'tcx>(tcx: TyCtxt<'_, 'tcx, 'tcx>, krate: CrateNum) {
+fn check_private_in_public<'tcx>(tcx: TyCtxt<'_, 'tcx, 'tcx>, krate: CrateNum) {
     assert_eq!(krate, LOCAL_CRATE);
 
     let access_levels = tcx.privacy_access_levels(LOCAL_CRATE);