about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-19 10:11:54 -0700
committerbors <bors@rust-lang.org>2014-03-19 10:11:54 -0700
commit7532d20a17dce417e9040e31623e7fcf01971db7 (patch)
treea7879f5f69de528f172a4e3bbd64e7e511e8aa54
parent61d5bc5d2da87190c199f3303ef4c75613fdfb96 (diff)
parent7180b5de4452095b032e6c77a77d8c6f81c4f6d3 (diff)
downloadrust-7532d20a17dce417e9040e31623e7fcf01971db7.tar.gz
rust-7532d20a17dce417e9040e31623e7fcf01971db7.zip
auto merge of #12879 : Aatch/rust/rustdoc-mod-privacy, r=alexcrichton
Modules don't actually inherit privacy, so anything other than Public should be considered private.

Fixes #12801

cc @cmr
-rw-r--r--src/librustdoc/passes.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/librustdoc/passes.rs b/src/librustdoc/passes.rs
index 3360e389c44..e167f0ad9ee 100644
--- a/src/librustdoc/passes.rs
+++ b/src/librustdoc/passes.rs
@@ -128,7 +128,8 @@ impl<'a> fold::DocFolder for Stripper<'a> {
                 }
             }
 
-            clean::ViewItemItem(..) => {
+            clean::ViewItemItem(..) |
+            clean::ModuleItem(..) => {
                 if i.visibility != Some(ast::Public) {
                     return None
                 }
@@ -140,9 +141,6 @@ impl<'a> fold::DocFolder for Stripper<'a> {
                 }
             }
 
-            // handled below
-            clean::ModuleItem(..) => {}
-
             // trait impls for private items should be stripped
             clean::ImplItem(clean::Impl{ for_: clean::ResolvedPath{ id: ref for_id, .. }, .. }) => {
                 if !self.exported_items.contains(for_id) {