From 165b0b618cbe83bf15d40742bd2cb9db935097d6 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Mon, 15 Aug 2016 22:43:25 +0000
Subject: [PATCH] Check privacy in `resolve_name_in_module`.

---
 src/librustc_resolve/lib.rs             | 19 ++-----------------
 src/librustc_resolve/resolve_imports.rs |  5 ++++-
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index d514d7e906a..68964396405 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -1304,9 +1304,6 @@ fn search_parent_externals<'a>(this: &mut Resolver<'a>, needle: Name, module: Mo
                     // Check to see whether there are type bindings, and, if
                     // so, whether there is a module within.
                     if let Some(module_def) = binding.module() {
-                        if let Some(span) = span {
-                            self.check_privacy(name, binding, span);
-                        }
                         search_module = module_def;
                     } else {
                         let msg = format!("Not a module `{}`", name);
@@ -2614,10 +2611,7 @@ fn resolve_module_relative_path(&mut self,
         let name = segments.last().unwrap().identifier.name;
         let result =
             self.resolve_name_in_module(containing_module, name, namespace, false, Some(span));
-        result.success().map(|binding| {
-            self.check_privacy(name, binding, span);
-            binding
-        }).ok_or(false)
+        result.success().ok_or(false)
     }
 
     /// Invariant: This must be called only during main resolution, not during
@@ -2656,10 +2650,7 @@ fn resolve_crate_relative_path<T>(&mut self, span: Span, segments: &[T], namespa
         let name = segments.last().unwrap().name();
         let result =
             self.resolve_name_in_module(containing_module, name, namespace, false, Some(span));
-        result.success().map(|binding| {
-            self.check_privacy(name, binding, span);
-            binding
-        }).ok_or(false)
+        result.success().ok_or(false)
     }
 
     fn with_no_errors<T, F>(&mut self, f: F) -> T
@@ -3276,12 +3267,6 @@ fn is_accessible(&self, vis: ty::Visibility) -> bool {
         vis.is_at_least(self.current_vis, self)
     }
 
-    fn check_privacy(&mut self, name: Name, binding: &'a NameBinding<'a>, span: Span) {
-        if !self.is_accessible(binding.vis) {
-            self.privacy_errors.push(PrivacyError(span, name, binding));
-        }
-    }
-
     fn report_privacy_errors(&self) {
         if self.privacy_errors.len() == 0 { return }
         let mut reported_spans = HashSet::new();
diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index 6e1128c6773..0757ff7ddbf 100644
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -165,8 +165,11 @@ pub fn resolve_name_in_module(&mut self,
                 if !allow_private_imports && binding.is_import() && !binding.is_pseudo_public() {
                     return Failed(None);
                 }
-                if record_used.is_some() {
+                if let Some(span) = record_used {
                     self.record_use(name, ns, binding);
+                    if !self.is_accessible(binding.vis) {
+                        self.privacy_errors.push(PrivacyError(span, name, binding));
+                    }
                 }
                 Success(binding)
             });
-- 
2.44.0