From bfd8a14065fee0eaaa9393c4b333e9b9075fd367 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sat, 28 Jan 2012 14:00:35 -0800
Subject: [PATCH] rustdoc: Create an item tag to hold doc for all item types

---
 src/rustdoc/doc.rs     | 9 +++++++++
 src/rustdoc/extract.rs | 1 +
 src/rustdoc/rustdoc.rs | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
index 0a54aea21f1..2620771348a 100644
--- a/src/rustdoc/doc.rs
+++ b/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,
diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
index f5d2f613aa7..947faa42e6a 100644
--- a/src/rustdoc/extract.rs
+++ b/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 {
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index 6c9d05260b3..55cd74c3a7a 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/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([]),