---

yaml
---
r: 97613
b: refs/heads/snap-stage3
c: 5948079
h: refs/heads/master
i:
  97611: 9d16423
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 79e144ed64866d5a6d2c5f1789cca80d1627578e
+refs/heads/snap-stage3: 594807951f0a7761ad31642168fd3728b78923dc
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustdoc/html/render.rs

@@ -157,6 +157,7 @@ pub struct Cache {
     priv stack: ~[~str],
     priv parent_stack: ~[ast::NodeId],
     priv search_index: ~[IndexItem],
+    priv privmod: bool,
 }
 
 /// Helper struct to render all source code to HTML pages
@@ -241,6 +242,7 @@ pub fn run(mut crate: clean::Crate, dst: Path) {
         parent_stack: ~[],
         search_index: ~[],
         extern_locations: HashMap::new(),
+        privmod: false,
     };
     cache.stack.push(crate.name.clone());
     crate = cache.fold_crate(crate);
@@ -455,6 +457,16 @@ impl<'a> SourceCollector<'a> {
 
 impl DocFolder for Cache {
     fn fold_item(&mut self, item: clean::Item) -> Option<clean::Item> {
+        // If this is a private module, we don't want it in the search index.
+        let orig_privmod = match item.inner {
+            clean::ModuleItem(..) => {
+                let prev = self.privmod;
+                self.privmod = prev || item.visibility != Some(ast::public);
+                prev
+            }
+            _ => self.privmod,
+        };
+
         // Register any generics to their corresponding string. This is used
         // when pretty-printing types
         match item.inner {
@@ -530,7 +542,7 @@ impl DocFolder for Cache {
                     _ => Some((None, self.stack.as_slice()))
                 };
                 match parent {
-                    Some((parent, path)) => {
+                    Some((parent, path)) if !self.privmod => {
                         self.search_index.push(IndexItem {
                             ty: shortty(&item),
                             name: s.to_owned(),
@@ -539,7 +551,7 @@ impl DocFolder for Cache {
                             parent: parent,
                         });
                     }
-                    None => {}
+                    Some(..) | None => {}
                 }
             }
             None => {}
@@ -612,8 +624,12 @@ impl DocFolder for Cache {
                     // Private modules may survive the strip-private pass if
                     // they contain impls for public types, but those will get
                     // stripped here
-                    clean::Item { inner: clean::ModuleItem(ref m), .. }
-                            if m.items.len() == 0 => None,
+                    clean::Item { inner: clean::ModuleItem(ref m),
+                                  visibility, .. }
+                            if (m.items.len() == 0 &&
+                                item.doc_value().is_none()) ||
+                               visibility != Some(ast::public) => None,
+
                     i => Some(i),
                 }
             }
@@ -622,6 +638,7 @@ impl DocFolder for Cache {
 
         if pushed { self.stack.pop(); }
         if parent_pushed { self.parent_stack.pop(); }
+        self.privmod = orig_privmod;
         return ret;
     }
 }