diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-01-28 14:00:35 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-01-29 11:38:44 -0800 |
| commit | bfd8a14065fee0eaaa9393c4b333e9b9075fd367 (patch) | |
| tree | 2d8d536dfd7c640f27c50e4d92e35810826e83b5 /src/rustdoc | |
| parent | 2740a6b6052206a381933812cfe9337a7ed2db60 (diff) | |
rustdoc: Create an item tag to hold doc for all item types
Diffstat (limited to 'src/rustdoc')
| -rw-r--r-- | src/rustdoc/doc.rs | 9 | ||||
| -rw-r--r-- | src/rustdoc/extract.rs | 1 | ||||
| -rwxr-xr-x | src/rustdoc/rustdoc.rs | 2 |
3 files changed, 12 insertions, 0 deletions
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([]), |