dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rustdoc: Remove structural records from tests. Fixes build breakage

This commit is contained in:
Tim Chevalier 2013-01-29 19:45:53 -08:00
parent 0aef28dd6d
commit 87acde8826
14 changed files with 75 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustdoc/attr_pass.rs
View File

@ -70,13 +70,13 @@ fn fold_crate(
};
doc::CrateDoc {
topmod: doc::ModDoc_(doc::ModDoc_ {
topmod: doc::ModDoc {
item: doc::ItemDoc {
name: option::get_or_default(attrs.name, doc.topmod.name()),
.. doc.topmod.item
},
.. *doc.topmod
})
.. doc.topmod
}
}
}

4
src/librustdoc/config.rs
View File

@ -256,7 +256,7 @@ fn maybe_find_pandoc(
#[test]
fn should_find_pandoc() {
let config = {
let config = Config {
output_format: PandocHtml,
.. default_config(&Path("test"))
};
@ -273,7 +273,7 @@ fn should_find_pandoc() {
#[test]
fn should_error_with_no_pandoc() {
let config = {
let config = Config {
output_format: PandocHtml,
.. default_config(&Path("test"))
};

14
src/librustdoc/doc.rs
View File

@ -22,15 +22,10 @@ use core::vec;
pub type AstId = int;
#[deriving_eq]
pub struct Doc_ {
pub struct Doc {
pages: ~[Page]
}
#[deriving_eq]
pub enum Doc {
Doc_(Doc_)
}
#[deriving_eq]
pub enum Page {
CratePage(CrateDoc),
@ -93,17 +88,12 @@ pub struct SimpleItemDoc {
}
#[deriving_eq]
pub struct ModDoc_ {
pub struct ModDoc {
item: ItemDoc,
items: ~[ItemTag],
index: Option<Index>
}
#[deriving_eq]
pub enum ModDoc {
ModDoc_(ModDoc_)
}
#[deriving_eq]
pub struct NmodDoc {
item: ItemDoc,

8
src/librustdoc/extract.rs
View File

@ -57,13 +57,13 @@ pub fn extract(
crate: @ast::crate,
+default_name: ~str
) -> doc::Doc {
doc::Doc_(doc::Doc_ {
doc::Doc {
pages: ~[
doc::CratePage(doc::CrateDoc {
topmod: top_moddoc_from_crate(crate, default_name),
})
]
})
}
}
fn top_moddoc_from_crate(
@ -90,7 +90,7 @@ fn moddoc_from_mod(
+itemdoc: doc::ItemDoc,
module_: ast::_mod
) -> doc::ModDoc {
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
item: itemdoc,
items: do vec::filter_map(module_.items) |item| {
let ItemDoc = mk_itemdoc(item.id, to_str(item.ident));
@ -144,7 +144,7 @@ fn moddoc_from_mod(
}
},
index: None
})
}
}
fn nmoddoc_from_mod(

24
src/librustdoc/fold.rs
View File

@ -158,7 +158,7 @@ pub fn default_par_fold<T:Owned Clone>(+ctxt: T) -> Fold<T> {
}
pub fn default_seq_fold_doc<T>(fold: &Fold<T>, +doc: doc::Doc) -> doc::Doc {
doc::Doc_(doc::Doc_ {
doc::Doc {
pages: do vec::map(doc.pages) |page| {
match *page {
doc::CratePage(doc) => {
@ -169,8 +169,8 @@ pub fn default_seq_fold_doc<T>(fold: &Fold<T>, +doc: doc::Doc) -> doc::Doc {
}
}
},
.. *doc
})
.. doc
}
}
pub fn default_seq_fold_crate<T>(
@ -194,26 +194,26 @@ pub fn default_any_fold_mod<T:Owned Clone>(
+doc: doc::ModDoc
) -> doc::ModDoc {
let fold_copy = fold.clone();
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
item: (fold.fold_item)(fold, doc.item),
items: par::map(doc.items, |ItemTag, move fold_copy| {
fold_ItemTag(&fold_copy, *ItemTag)
}),
.. *doc
})
.. doc
}
}
pub fn default_seq_fold_mod<T>(
fold: &Fold<T>,
+doc: doc::ModDoc
) -> doc::ModDoc {
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
item: (fold.fold_item)(fold, doc.item),
items: vec::map(doc.items, |ItemTag| {
fold_ItemTag(fold, *ItemTag)
}),
.. *doc
})
.. doc
}
}
pub fn default_par_fold_mod<T:Owned Clone>(
@ -221,13 +221,13 @@ pub fn default_par_fold_mod<T:Owned Clone>(
+doc: doc::ModDoc
) -> doc::ModDoc {
let fold_copy = fold.clone();
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
item: (fold.fold_item)(fold, doc.item),
items: par::map(doc.items, |ItemTag, move fold_copy| {
fold_ItemTag(&fold_copy, *ItemTag)
}),
.. *doc
})
.. doc
}
}
pub fn default_any_fold_nmod<T:Owned Clone>(

21
src/librustdoc/markdown_index_pass.rs
View File

@ -54,10 +54,10 @@ fn fold_mod(
let doc = fold::default_any_fold_mod(fold, doc);
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
index: Some(build_mod_index(doc, fold.ctxt)),
.. *doc
})
.. doc
}
}
fn fold_nmod(
@ -180,13 +180,13 @@ fn should_index_mod_contents() {
config::DocPerCrate,
~"mod a { } fn b() { }"
);
assert doc.cratemod().index.get().entries[0] == {
assert doc.cratemod().index.get().entries[0] == doc::IndexEntry {
kind: ~"Module",
name: ~"a",
brief: None,
link: ~"#module-a"
};
assert doc.cratemod().index.get().entries[1] == {
assert doc.cratemod().index.get().entries[1] == doc::IndexEntry {
kind: ~"Function",
name: ~"b",
brief: None,
@ -200,13 +200,13 @@ fn should_index_mod_contents_multi_page() {
config::DocPerMod,
~"mod a { } fn b() { }"
);
assert doc.cratemod().index.get().entries[0] == {
assert doc.cratemod().index.get().entries[0] == doc::IndexEntry {
kind: ~"Module",
name: ~"a",
brief: None,
link: ~"a.html"
};
assert doc.cratemod().index.get().entries[1] == {
assert doc.cratemod().index.get().entries[1] == doc::IndexEntry {
kind: ~"Function",
name: ~"b",
brief: None,
@ -220,7 +220,7 @@ fn should_index_foreign_mod_pages() {
config::DocPerMod,
~"extern mod a { }"
);
assert doc.cratemod().index.get().entries[0] == {
assert doc.cratemod().index.get().entries[0] == doc::IndexEntry {
kind: ~"Foreign module",
name: ~"a",
brief: None,
@ -244,7 +244,8 @@ fn should_index_foreign_mod_contents() {
config::DocPerCrate,
~"extern mod a { fn b(); }"
);
assert doc.cratemod().nmods()[0].index.get().entries[0] == {
assert doc.cratemod().nmods()[0].index.get().entries[0]
== doc::IndexEntry {
kind: ~"Function",
name: ~"b",
brief: None,
@ -268,7 +269,7 @@ mod test {
pub fn mk_doc(output_style: config::OutputStyle, +source: ~str)
-> doc::Doc {
do astsrv::from_str(source) |srv| {
let config = {
let config = config::Config {
output_style: output_style,
.. config::default_config(&Path("whatever"))
};

16
src/librustdoc/markdown_pass.rs
View File

@ -573,20 +573,20 @@ fn should_insert_blank_line_after_fn_signature() {
#[test]
fn should_correctly_indent_fn_signature() {
let doc = test::create_doc(~"fn a() { }");
let doc = doc::Doc_({
let doc = doc::Doc{
pages: ~[
doc::CratePage({
topmod: doc::ModDoc_({
items: ~[doc::FnTag({
doc::CratePage(doc::CrateDoc{
topmod: doc::ModDoc{
items: ~[doc::FnTag(doc::SimpleItemDoc{
sig: Some(~"line 1\nline 2"),
.. doc.cratemod().fns()[0]
})],
.. *doc.cratemod()
}),
.. doc.cratemod()
},
.. doc.CrateDoc()
})
]
});
};
let markdown = test::write_markdown_str(doc);
assert str::contains(markdown, ~" line 1\n line 2");
}
@ -863,7 +863,7 @@ mod test {
fn create_doc_srv(+source: ~str) -> (astsrv::Srv, doc::Doc) {
do astsrv::from_str(source) |srv| {
let config = {
let config = config::Config {
output_style: config::DocPerCrate,
.. config::default_config(&Path("whatever"))
};

7
src/librustdoc/markdown_writer.rs
View File

@ -11,6 +11,7 @@
use core::prelude::*;
use config;
use config::Config;
use doc::ItemUtils;
use doc;
use pass::Pass;
@ -228,7 +229,7 @@ pub fn make_filename(
#[test]
fn should_use_markdown_file_name_based_off_crate() {
let config = {
let config = Config {
output_dir: Path("output/dir"),
output_format: config::Markdown,
output_style: config::DocPerCrate,
@ -242,7 +243,7 @@ fn should_use_markdown_file_name_based_off_crate() {
#[test]
fn should_name_html_crate_file_name_index_html_when_doc_per_mod() {
let config = {
let config = Config {
output_dir: Path("output/dir"),
output_format: config::PandocHtml,
output_style: config::DocPerMod,
@ -256,7 +257,7 @@ fn should_name_html_crate_file_name_index_html_when_doc_per_mod() {
#[test]
fn should_name_mod_file_names_by_path() {
let config = {
let config = Config {
output_dir: Path("output/dir"),
output_format: config::PandocHtml,
output_style: config::DocPerMod,

10
src/librustdoc/page_pass.rs
View File

@ -76,9 +76,9 @@ fn make_doc_from_pages(page_port: PagePort) -> doc::Doc {
break;
}
}
doc::Doc_(doc::Doc_ {
doc::Doc {
pages: pages
})
}
}
fn find_pages(doc: doc::Doc, page_chan: PageChan) {
@ -128,7 +128,7 @@ fn fold_mod(
}
fn strip_mod(doc: doc::ModDoc) -> doc::ModDoc {
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
items: do doc.items.filtered |item| {
match *item {
doc::ModTag(_) => false,
@ -136,8 +136,8 @@ fn strip_mod(doc: doc::ModDoc) -> doc::ModDoc {
_ => true
}
},
.. *doc
})
.. doc
}
}
fn fold_nmod(

24
src/librustdoc/pass.rs
View File

@ -45,39 +45,39 @@ fn test_run_passes() {
_srv: astsrv::Srv,
+doc: doc::Doc
) -> doc::Doc {
doc::Doc_({
doc::Doc{
pages: ~[
doc::CratePage({
topmod: doc::ModDoc_({
item: {
doc::CratePage(doc::CrateDoc{
topmod: doc::ModDoc{
item: doc::ItemDoc {
name: doc.cratemod().name() + ~"two",
.. doc.cratemod().item
},
items: ~[],
index: None
})
}
})
]
})
}
}
fn pass2(
_srv: astsrv::Srv,
+doc: doc::Doc
) -> doc::Doc {
doc::Doc_({
doc::Doc{
pages: ~[
doc::CratePage({
topmod: doc::ModDoc_({
item: {
doc::CratePage(doc::CrateDoc{
topmod: doc::ModDoc{
item: doc::ItemDoc {
name: doc.cratemod().name() + ~"three",
.. doc.cratemod().item
},
items: ~[],
index: None
})
}
})
]
})
}
}
let source = ~"";
do astsrv::from_str(source) |srv| {

6
src/librustdoc/path_pass.rs
View File

@ -68,10 +68,10 @@ fn fold_mod(fold: &fold::Fold<Ctxt>, +doc: doc::ModDoc) -> doc::ModDoc {
let doc = fold::default_any_fold_mod(fold, doc);
if !is_topmod { fold.ctxt.path.pop(); }
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
item: (fold.fold_item)(fold, doc.item),
.. *doc
})
.. doc
}
}
fn fold_nmod(fold: &fold::Fold<Ctxt>, +doc: doc::NmodDoc) -> doc::NmodDoc {

6
src/librustdoc/prune_hidden_pass.rs
View File

@ -42,12 +42,12 @@ fn fold_mod(
) -> doc::ModDoc {
let doc = fold::default_any_fold_mod(fold, doc);
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
items: do doc.items.filtered |ItemTag| {
!is_hidden(fold.ctxt, ItemTag.item())
},
.. *doc
})
.. doc
}
}
fn is_hidden(srv: astsrv::Srv, doc: doc::ItemDoc) -> bool {

6
src/librustdoc/prune_private_pass.rs
View File

@ -48,12 +48,12 @@ fn fold_mod(
) -> doc::ModDoc {
let doc = fold::default_any_fold_mod(fold, doc);
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
items: doc.items.filtered(|ItemTag| {
is_visible(fold.ctxt, ItemTag.item())
}),
.. *doc
})
.. doc
}
}
fn is_visible(srv: astsrv::Srv, doc: doc::ItemDoc) -> bool {

6
src/librustdoc/sort_pass.rs
View File

@ -55,10 +55,10 @@ fn fold_mod(
+doc: doc::ModDoc
) -> doc::ModDoc {
let doc = fold::default_any_fold_mod(fold, doc);
doc::ModDoc_(doc::ModDoc_ {
doc::ModDoc {
items: sort::merge_sort(doc.items, fold.ctxt.op),
.. *doc
})
.. doc
}
}
#[test]