Fix merge fallout of privacy changes

12 files changed, 70 insertions, 14 deletions

diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs
index ad190dfcfb1..3f2c55a55b8 100644
--- a/src/librustc/metadata/encoder.rs
+++ b/src/librustc/metadata/encoder.rs
@@ -623,6 +623,7 @@ fn encode_info_for_mod(ecx: &EncodeContext,
     }
 
     encode_path(ecx, ebml_w, path, ast_map::path_mod(name));
+    encode_visibility(ebml_w, vis);
 
     // Encode the reexports of this module, if this module is public.
     if vis == public {
diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs
index f395231124b..fb4b76c7c91 100644
--- a/src/librustc/middle/privacy.rs
+++ b/src/librustc/middle/privacy.rs
@@ -64,20 +64,27 @@ impl<'self> Visitor<()> for ParentVisitor<'self> {
                     }
                 }
             }
+
+            // Trait methods are always considered "public", but if the trait is
+            // private then we need some private item in the chain from the
+            // method to the root. In this case, if the trait is private, then
+            // parent all the methods to the trait to indicate that they're
+            // private.
+            ast::item_trait(_, _, ref methods) if item.vis != ast::public => {
+                for m in methods.iter() {
+                    match *m {
+                        ast::provided(ref m) => self.parents.insert(m.id, item.id),
+                        ast::required(ref m) => self.parents.insert(m.id, item.id),
+                    };
+                }
+            }
+
             _ => {}
         }
         visit::walk_item(self, item, ());
         self.curparent = prev;
     }
 
-    fn visit_trait_method(&mut self, m: &ast::trait_method, _: ()) {
-        match *m {
-            ast::provided(ref m) => self.parents.insert(m.id, self.curparent),
-            ast::required(ref m) => self.parents.insert(m.id, self.curparent),
-        };
-        visit::walk_trait_method(self, m, ());
-    }
-
     fn visit_foreign_item(&mut self, a: @ast::foreign_item, _: ()) {
         self.parents.insert(a.id, self.curparent);
         visit::walk_foreign_item(self, a, ());
@@ -85,7 +92,12 @@ impl<'self> Visitor<()> for ParentVisitor<'self> {
 
     fn visit_fn(&mut self, a: &visit::fn_kind, b: &ast::fn_decl,
                 c: &ast::Block, d: Span, id: ast::NodeId, _: ()) {
-        self.parents.insert(id, self.curparent);
+        // We already took care of some trait methods above, otherwise things
+        // like impl methods and pub trait methods are parented to the
+        // containing module, not the containing trait.
+        if !self.parents.contains_key(&id) {
+            self.parents.insert(id, self.curparent);
+        }
         visit::walk_fn(self, a, b, c, d, id, ());
     }
 
diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs
index 447f1075585..156cb741af3 100644
--- a/src/librustc/middle/resolve.rs
+++ b/src/librustc/middle/resolve.rs
@@ -1649,7 +1649,15 @@ impl Resolver {
                 external crate) building external def, priv {:?}",
                vis);
         let is_public = vis == ast::public;
-        if is_public {
+        let is_exported = is_public && match new_parent {
+            ModuleReducedGraphParent(module) => {
+                match module.def_id {
+                    None => true,
+                    Some(did) => self.external_exports.contains(&did)
+                }
+            }
+        };
+        if is_exported {
             self.external_exports.insert(def_id_of_def(def));
         }
         match def {
@@ -1725,7 +1733,7 @@ impl Resolver {
                   if explicit_self != sty_static {
                       interned_method_names.insert(method_name.name);
                   }
-                  if is_public {
+                  if is_exported {
                       self.external_exports.insert(method_def_id);
                   }
               }
@@ -1952,7 +1960,7 @@ impl Resolver {
     /// Builds the reduced graph rooted at the 'use' directive for an external
     /// crate.
     fn build_reduced_graph_for_external_crate(&mut self,
-                                                  root: @mut Module) {
+                                              root: @mut Module) {
         do csearch::each_top_level_item_of_crate(self.session.cstore,
                                                  root.def_id.unwrap().crate)
                 |def_like, ident, visibility| {
diff --git a/src/librustc/middle/trans/context.rs b/src/librustc/middle/trans/context.rs
index 2b3874e0bf0..bb1e32bf34e 100644
--- a/src/librustc/middle/trans/context.rs
+++ b/src/librustc/middle/trans/context.rs
@@ -16,7 +16,6 @@ use lib::llvm::{llvm, TargetData, TypeNames};
 use lib::llvm::mk_target_data;
 use metadata::common::LinkMeta;
 use middle::astencode;
-use middle::privacy;
 use middle::resolve;
 use middle::trans::adt;
 use middle::trans::base;
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs
index cb45c6f78eb..a46e115a503 100644
--- a/src/libstd/task/mod.rs
+++ b/src/libstd/task/mod.rs
@@ -1069,7 +1069,7 @@ fn test_try_fail() {
 
 #[cfg(test)]
 fn get_sched_id() -> int {
-    do Local::borrow |sched: &mut ::rt::sched::Scheduler| {
+    do Local::borrow |sched: &mut ::rt::shouldnt_be_public::Scheduler| {
         sched.sched_id() as int
     }
 }
diff --git a/src/test/compile-fail/glob-resolve1.rs b/src/test/compile-fail/glob-resolve1.rs
index a0004f98ecf..7363fb6d0b2 100644
--- a/src/test/compile-fail/glob-resolve1.rs
+++ b/src/test/compile-fail/glob-resolve1.rs
@@ -10,6 +10,8 @@
 
 // Make sure that globs only bring in public things.
 
+#[feature(globs)];
+
 use bar::*;
 
 mod bar {
diff --git a/src/test/compile-fail/issue-4366-2.rs b/src/test/compile-fail/issue-4366-2.rs
index 4530267f35f..6764b489b62 100644
--- a/src/test/compile-fail/issue-4366-2.rs
+++ b/src/test/compile-fail/issue-4366-2.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(globs)];
 
 // ensures that 'use foo:*' doesn't import non-public item
 
diff --git a/src/test/compile-fail/privacy1.rs b/src/test/compile-fail/privacy1.rs
index 2e2b53331ca..0d4dbc86dce 100644
--- a/src/test/compile-fail/privacy1.rs
+++ b/src/test/compile-fail/privacy1.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(globs)];
 #[no_std]; // makes debugging this test *a lot* easier (during resolve)
 
 mod bar {
diff --git a/src/test/compile-fail/privacy2.rs b/src/test/compile-fail/privacy2.rs
index e8e21021ccc..98772b0c67b 100644
--- a/src/test/compile-fail/privacy2.rs
+++ b/src/test/compile-fail/privacy2.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(globs)];
 #[no_std]; // makes debugging this test *a lot* easier (during resolve)
 
 // Test to make sure that globs don't leak in regular `use` statements.
diff --git a/src/test/compile-fail/privacy3.rs b/src/test/compile-fail/privacy3.rs
index 523d4cd4b8d..3308be4a12e 100644
--- a/src/test/compile-fail/privacy3.rs
+++ b/src/test/compile-fail/privacy3.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(globs)];
 #[no_std]; // makes debugging this test *a lot* easier (during resolve)
 
 // Test to make sure that private items imported through globs remain private
diff --git a/src/test/compile-fail/privacy4.rs b/src/test/compile-fail/privacy4.rs
index 88a9b2f3058..4e33536b2b0 100644
--- a/src/test/compile-fail/privacy4.rs
+++ b/src/test/compile-fail/privacy4.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(globs)];
 #[no_std]; // makes debugging this test *a lot* easier (during resolve)
 
 // Test to make sure that private items imported through globs remain private
diff --git a/src/test/run-pass/privacy1.rs b/src/test/run-pass/privacy1.rs
new file mode 100644
index 00000000000..7a07c970902
--- /dev/null
+++ b/src/test/run-pass/privacy1.rs
@@ -0,0 +1,29 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub mod test2 {
+    // This used to generate an ICE (make sure that default functions are
+    // parented to their trait to find the first private thing as the trait).
+
+    struct B;
+    trait A { fn foo(&self) {} }
+    impl A for B {}
+
+    mod tests {
+        use super::A;
+        fn foo() {
+            let a = super::B;
+            a.foo();
+        }
+    }
+}
+
+
+pub fn main() {}