diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs index 1aee7682a32..fc687222171 100644 --- a/src/rustdoc/doc.rs +++ b/src/rustdoc/doc.rs @@ -15,7 +15,8 @@ type moddoc = ~{ mods: modlist, fns: fnlist, consts: constlist, - enums: enumlist + enums: enumlist, + resources: resourcelist }; type constdoc = ~{ @@ -62,8 +63,18 @@ type variantdoc = ~{ sig: option }; +type resourcedoc = ~{ + id: ast_id, + name: str, + brief: option, + desc: option, + args: [argdoc], + sig: option +}; + // Just to break the structural recursive types enum modlist = [moddoc]; enum constlist = [constdoc]; enum fnlist = [fndoc]; -enum enumlist = [enumdoc]; \ No newline at end of file +enum enumlist = [enumdoc]; +enum resourcelist = [resourcedoc]; diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs index 3c204d17c30..fd383e074e8 100644 --- a/src/rustdoc/extract.rs +++ b/src/rustdoc/extract.rs @@ -87,7 +87,8 @@ fn moddoc_from_mod( none } } - }) + }), + resources: doc::resourcelist([]) } } diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs index 4574dd8429c..68d5f5412b4 100755 --- a/src/rustdoc/rustdoc.rs +++ b/src/rustdoc/rustdoc.rs @@ -52,7 +52,8 @@ fn test_run_passes() { mods: doc::modlist([]), fns: doc::fnlist([]), consts: doc::constlist([]), - enums: doc::enumlist([]) + enums: doc::enumlist([]), + resources: doc::resourcelist([]) } } } @@ -70,7 +71,8 @@ fn test_run_passes() { mods: doc::modlist([]), fns: doc::fnlist([]), consts: doc::constlist([]), - enums: doc::enumlist([]) + enums: doc::enumlist([]), + resources: doc::resourcelist([]) } } }