---

yaml
---
r: 10875
b: refs/heads/master
c: bfd8a14
h: refs/heads/master
i:
  10873: 4c4e9a7
  10871: af64f96
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2740a6b6052206a381933812cfe9337a7ed2db60
+refs/heads/master: bfd8a14065fee0eaaa9393c4b333e9b9075fd367
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/doc.rs

@@ -6,12 +6,21 @@ type cratedoc = ~{
     topmod: moddoc,
 };
 
+enum itemtag {
+    modtag(moddoc),
+    consttag(constdoc),
+    fntag(fndoc),
+    enumtag(enumdoc),
+    restag(resdoc)
+}
+
 type moddoc = ~{
     id: ast_id,
     name: str,
     path: [str],
     brief: option<str>,
     desc: option<str>,
+    items: [itemtag],
     mods: modlist,
     fns: fnlist,
     consts: constlist,

trunk/src/rustdoc/extract.rs

@@ -43,6 +43,7 @@ fn moddoc_from_mod(
         path: [],
         brief: none,
         desc: none,
+        items: [],
         mods: doc::modlist(
             vec::filter_map(module.items) {|item|
                 alt item.node {

trunk/src/rustdoc/rustdoc.rs

@@ -49,6 +49,7 @@ fn test_run_passes() {
                 path: [],
                 brief: none,
                 desc: none,
+                items: [],
                 mods: doc::modlist([]),
                 fns: doc::fnlist([]),
                 consts: doc::constlist([]),
@@ -68,6 +69,7 @@ fn test_run_passes() {
                 path: [],
                 brief: none,
                 desc: none,
+                items: [],
                 mods: doc::modlist([]),
                 fns: doc::fnlist([]),
                 consts: doc::constlist([]),