diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs index 10fa5022a7a6..40953f7aec7f 100644 --- a/src/rustdoc/attr_pass.rs +++ b/src/rustdoc/attr_pass.rs @@ -52,9 +52,8 @@ fn fold_crate( ~{ topmod: ~{ - name: option::from_maybe(doc.topmod.name, attrs.name), - mods: doc.topmod.mods, - fns: doc.topmod.fns + name: option::from_maybe(doc.topmod.name, attrs.name) + with *doc.topmod } } } diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs index 11a6702a7a6c..c601cbfe3655 100644 --- a/src/rustdoc/doc.rs +++ b/src/rustdoc/doc.rs @@ -8,6 +8,8 @@ type cratedoc = ~{ type moddoc = ~{ name: str, + brief: option, + desc: option, mods: modlist, fns: fnlist }; diff --git a/src/rustdoc/extract.rs b/src/rustdoc/extract.rs index 559c2fc47ab7..3411432ce226 100644 --- a/src/rustdoc/extract.rs +++ b/src/rustdoc/extract.rs @@ -38,6 +38,8 @@ fn moddoc_from_mod( ) -> doc::moddoc { ~{ name: name, + brief: none, + desc: none, mods: doc::modlist( vec::filter_map(module.items) {|item| alt item.node { diff --git a/src/rustdoc/fold.rs b/src/rustdoc/fold.rs index 58b0724b29d5..da6a4d35c3e9 100644 --- a/src/rustdoc/fold.rs +++ b/src/rustdoc/fold.rs @@ -87,9 +87,9 @@ fn default_seq_fold_mod( doc: doc::moddoc ) -> doc::moddoc { ~{ - name: doc.name, mods: fold.fold_modlist(fold, doc.mods), fns: fold.fold_fnlist(fold, doc.fns) + with *doc } } diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs index 2abb6b4718bc..ba58c4909023 100755 --- a/src/rustdoc/rustdoc.rs +++ b/src/rustdoc/rustdoc.rs @@ -27,6 +27,8 @@ fn test_run_passes() { ~{ topmod: ~{ name: doc.topmod.name + "two", + brief: none, + desc: none, mods: doc::modlist([]), fns: doc::fnlist([]) } @@ -39,6 +41,8 @@ fn test_run_passes() { ~{ topmod: ~{ name: doc.topmod.name + "three", + brief: none, + desc: none, mods: doc::modlist([]), fns: doc::fnlist([]) }