---

yaml
---
r: 32744
b: refs/heads/dist-snap
c: 60443d4
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: c32cde16ab1cd7d8483d176591c22dbac3520833
+refs/heads/dist-snap: 60443d48881bfbc7a305e807390e74b327f100b8
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustdoc/prune_private_pass.rs

@@ -0,0 +1,65 @@
+//! Prune things that are private
+
+export mk_pass;
+
+fn mk_pass() -> Pass {
+    {
+        name: ~"prune_private",
+        f: run
+    }
+}
+
+fn run(srv: astsrv::Srv, doc: doc::Doc) -> doc::Doc {
+    let fold = fold::Fold({
+        fold_mod: fold_mod,
+        .. *fold::default_any_fold(srv)
+    });
+    fold.fold_doc(fold, doc)
+}
+
+fn fold_mod(
+    fold: fold::Fold<astsrv::Srv>,
+    doc: doc::ModDoc
+) -> doc::ModDoc {
+    let doc = fold::default_any_fold_mod(fold, doc);
+
+    doc::ModDoc_({
+        items: do doc.items.filter |ItemTag| {
+            is_visible(fold.ctxt, ItemTag.item())
+        },
+        .. *doc
+    })
+}
+
+fn is_visible(srv: astsrv::Srv, doc: doc::ItemDoc) -> bool {
+    use syntax::ast_map;
+    use syntax::ast;
+
+    let id = doc.id;
+
+    do astsrv::exec(srv) |ctxt| {
+        match ctxt.ast_map.get(id) {
+            ast_map::node_item(item, _) => {
+                item.vis == ast::public
+            }
+            _ => util::unreachable()
+        }
+    }
+}
+
+#[test]
+fn should_prune_items_without_pub_modifier() {
+    let doc = test::mk_doc(~"mod a { }");
+    assert vec::is_empty(doc.cratemod().mods());
+}
+
+#[cfg(test)]
+mod test {
+    fn mk_doc(source: ~str) -> doc::Doc {
+        do astsrv::from_str(source) |srv| {
+            let doc = extract::from_srv(srv, ~"");
+            run(srv, doc)
+        }
+    }
+}
+

branches/dist-snap/src/rustdoc/rustdoc.rc

@@ -49,3 +49,4 @@ mod sort_item_type_pass;
 mod page_pass;
 mod sectionalize_pass;
 mod escape_pass;
+mod prune_private_pass;

branches/dist-snap/src/rustdoc/rustdoc.rs

@@ -53,6 +53,9 @@ fn run(config: Config) {
             escape_pass::mk_pass(),
             // Remove things marked doc(hidden)
             prune_hidden_pass::mk_pass(),
+            // Remove things that are private
+            // XXX enable this after 'export' is removed in favor of 'pub'
+            // prune_private_pass::mk_pass(),
             // Extract brief documentation from the full descriptions
             desc_to_brief_pass::mk_pass(),
             // Massage the text to remove extra indentation