rustdoc: Add consts to the doc tree

3 files changed, 15 insertions, 4 deletions

diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
index 7ccd50b9649..2ca1c7612f7 100644
--- a/src/rustdoc/doc.rs
+++ b/src/rustdoc/doc.rs
@@ -13,7 +13,14 @@ type moddoc = ~{
     brief: option<str>,
     desc: option<str>,
     mods: modlist,
-    fns: fnlist
+    fns: fnlist,
+    consts: constlist
+};
+
+type constdoc = ~{
+    id: ast_id,
+    name: str,
+    ty: option<str>
 };
 
 type fndoc = ~{
@@ -39,4 +46,5 @@ type retdoc = {
 
 // Just to break the structural recursive types
 enum modlist = [moddoc];
+enum constlist = [constdoc];
 enum fnlist = [fndoc];
diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs
index 9ce5bfed4fe..e508ac1271c 100644
--- a/src/rustdoc/extract.rs
+++ b/src/rustdoc/extract.rs
@@ -65,7 +65,8 @@ fn moddoc_from_mod(
                     none
                   }
                 }
-            })
+            }),
+        consts: doc::constlist([])
     }
 }
 
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index 7d43b73eb98..257df26a6df 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -46,7 +46,8 @@ fn test_run_passes() {
                 brief: none,
                 desc: none,
                 mods: doc::modlist([]),
-                fns: doc::fnlist([])
+                fns: doc::fnlist([]),
+                consts: doc::constlist([])
             }
         }
     }
@@ -62,7 +63,8 @@ fn test_run_passes() {
                 brief: none,
                 desc: none,
                 mods: doc::modlist([]),
-                fns: doc::fnlist([])
+                fns: doc::fnlist([]),
+                consts: doc::constlist([])
             }
         }
     }