---

yaml
---
r: 7903
b: refs/heads/snap-stage3
c: 55e69eb
h: refs/heads/master
i:
  7901: 927856c
  7899: 2a9687e
  7895: c3b1c43
  7887: 1868dc7
  7871: 6e0c5e7
v: v3

Author: brson

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: dbe2928c4d3cae6cf2b0392ffbf5aa4c21da1344
+refs/heads/snap-stage3: 55e69eb4582e2cb1c3b744f4661ca0c2fad139a8
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rustdoc/doc.rs

@@ -122,4 +122,16 @@ impl util for moddoc {
             }
         }
     }
-}
+}
+
+impl util for itemtag {
+    fn name() -> str {
+        alt self {
+          doc::modtag(~{name, _}) { name }
+          doc::fntag(~{name, _}) { name }
+          doc::consttag(~{name, _}) { name }
+          doc::enumtag(~{name, _}) { name }
+          doc::restag(~{name, _}) { name }
+        }
+    }
+}

branches/snap-stage3/src/rustdoc/prune_unexported_pass.rs

@@ -67,13 +67,6 @@ fn exported_items_from(
     is_exported: fn(astsrv::srv, str) -> bool
 ) -> [doc::itemtag] {
     vec::filter_map(doc.items) { |itemtag|
-        let name = alt itemtag {
-          doc::modtag(~{name, _}) { name }
-          doc::fntag(~{name, _}) { name }
-          doc::consttag(~{name, _}) { name }
-          doc::enumtag(~{name, _}) { name }
-          doc::restag(~{name, _}) { name }
-        };
         let itemtag = alt itemtag {
           doc::enumtag(enumdoc) {
             // Also need to check variant exportedness
@@ -84,7 +77,7 @@ fn exported_items_from(
           }
           _ { itemtag }
         };
-        if is_exported(srv, name) {
+        if is_exported(srv, itemtag.name()) {
             some(itemtag)
         } else {
             none