rustdoc: Fix build errors

This commit is contained in:
Brian Anderson 2012-09-28 17:17:20 -07:00
parent 8766c2e35b
commit ed42f26a48
8 changed files with 19 additions and 17 deletions

View File

@ -144,6 +144,7 @@ fn fold_enum(
{ {
variants: do par::map(doc.variants) |variant| { variants: do par::map(doc.variants) |variant| {
let variant = *variant;
let desc = do astsrv::exec(srv) |ctxt| { let desc = do astsrv::exec(srv) |ctxt| {
match ctxt.ast_map.get(doc_id) { match ctxt.ast_map.get(doc_id) {
ast_map::node_item(@{ ast_map::node_item(@{

View File

@ -44,7 +44,7 @@ fn fold_trait(fold: fold::Fold<()>, doc: doc::TraitDoc) -> doc::TraitDoc {
{ {
methods: par::map(doc.methods, |doc| { methods: par::map(doc.methods, |doc| {
brief: extract(doc.desc), brief: extract(doc.desc),
.. doc .. *doc
}), }),
.. doc .. doc
} }
@ -56,7 +56,7 @@ fn fold_impl(fold: fold::Fold<()>, doc: doc::ImplDoc) -> doc::ImplDoc {
{ {
methods: par::map(doc.methods, |doc| { methods: par::map(doc.methods, |doc| {
brief: extract(doc.desc), brief: extract(doc.desc),
.. doc .. *doc
}), }),
.. doc .. doc
} }

View File

@ -179,7 +179,7 @@ fn default_any_fold_mod<T:Send Copy>(
doc::ModDoc_({ doc::ModDoc_({
item: fold.fold_item(fold, doc.item), item: fold.fold_item(fold, doc.item),
items: par::map(doc.items, |ItemTag, copy fold| { items: par::map(doc.items, |ItemTag, copy fold| {
fold_ItemTag(fold, ItemTag) fold_ItemTag(fold, *ItemTag)
}), }),
.. *doc .. *doc
}) })
@ -205,7 +205,7 @@ fn default_par_fold_mod<T:Send Copy>(
doc::ModDoc_({ doc::ModDoc_({
item: fold.fold_item(fold, doc.item), item: fold.fold_item(fold, doc.item),
items: par::map(doc.items, |ItemTag, copy fold| { items: par::map(doc.items, |ItemTag, copy fold| {
fold_ItemTag(fold, ItemTag) fold_ItemTag(fold, *ItemTag)
}), }),
.. *doc .. *doc
}) })
@ -218,7 +218,7 @@ fn default_any_fold_nmod<T:Send Copy>(
{ {
item: fold.fold_item(fold, doc.item), item: fold.fold_item(fold, doc.item),
fns: par::map(doc.fns, |FnDoc, copy fold| { fns: par::map(doc.fns, |FnDoc, copy fold| {
fold.fold_fn(fold, FnDoc) fold.fold_fn(fold, *FnDoc)
}), }),
.. doc .. doc
} }
@ -244,7 +244,7 @@ fn default_par_fold_nmod<T:Send Copy>(
{ {
item: fold.fold_item(fold, doc.item), item: fold.fold_item(fold, doc.item),
fns: par::map(doc.fns, |FnDoc, copy fold| { fns: par::map(doc.fns, |FnDoc, copy fold| {
fold.fold_fn(fold, FnDoc) fold.fold_fn(fold, *FnDoc)
}), }),
.. doc .. doc
} }

View File

@ -58,7 +58,7 @@ fn build_mod_index(
) -> doc::Index { ) -> doc::Index {
{ {
entries: par::map(doc.items, |doc| { entries: par::map(doc.items, |doc| {
item_to_entry(doc, config) item_to_entry(*doc, config)
}) })
} }
} }
@ -69,7 +69,7 @@ fn build_nmod_index(
) -> doc::Index { ) -> doc::Index {
{ {
entries: par::map(doc.fns, |doc| { entries: par::map(doc.fns, |doc| {
item_to_entry(doc::FnTag(doc), config) item_to_entry(doc::FnTag(*doc), config)
}) })
} }
} }

View File

@ -42,7 +42,7 @@ fn fold_trait(fold: fold::Fold<()>, doc: doc::TraitDoc) -> doc::TraitDoc {
{ {
desc: desc, desc: desc,
sections: sections, sections: sections,
..method .. *method
} }
}, },
.. doc .. doc
@ -59,7 +59,7 @@ fn fold_impl(fold: fold::Fold<()>, doc: doc::ImplDoc) -> doc::ImplDoc {
{ {
desc: desc, desc: desc,
sections: sections, sections: sections,
.. method .. *method
} }
}, },
.. doc .. doc

View File

@ -60,7 +60,7 @@ fn fold_enum(fold: fold::Fold<Op>, doc: doc::EnumDoc) -> doc::EnumDoc {
variants: do par::map(doc.variants) |variant, copy fold| { variants: do par::map(doc.variants) |variant, copy fold| {
{ {
desc: maybe_apply_op(fold.ctxt, variant.desc), desc: maybe_apply_op(fold.ctxt, variant.desc),
.. variant .. *variant
} }
}, },
.. doc .. doc
@ -82,7 +82,7 @@ fn apply_to_methods(op: Op, docs: ~[doc::MethodDoc]) -> ~[doc::MethodDoc] {
brief: maybe_apply_op(op, doc.brief), brief: maybe_apply_op(op, doc.brief),
desc: maybe_apply_op(op, doc.desc), desc: maybe_apply_op(op, doc.desc),
sections: apply_to_sections(op, doc.sections), sections: apply_to_sections(op, doc.sections),
.. doc .. *doc
} }
} }
} }

View File

@ -112,6 +112,7 @@ fn fold_enum(
{ {
variants: do par::map(doc.variants) |variant| { variants: do par::map(doc.variants) |variant| {
let variant = *variant;
let sig = do astsrv::exec(srv) |ctxt| { let sig = do astsrv::exec(srv) |ctxt| {
match ctxt.ast_map.get(doc_id) { match ctxt.ast_map.get(doc_id) {
ast_map::node_item(@{ ast_map::node_item(@{
@ -161,7 +162,7 @@ fn merge_methods(
do par::map(docs) |doc| { do par::map(docs) |doc| {
{ {
sig: get_method_sig(srv, item_id, doc.name), sig: get_method_sig(srv, item_id, doc.name),
.. doc .. *doc
} }
} }
} }

View File

@ -63,11 +63,11 @@ fn unindent(s: ~str) -> ~str {
if vec::is_not_empty(lines) { if vec::is_not_empty(lines) {
let unindented = ~[str::trim(vec::head(lines))] let unindented = ~[str::trim(vec::head(lines))]
+ do par::map(vec::tail(lines)) |line| { + do par::map(vec::tail(lines)) |line| {
if str::is_whitespace(line) { if str::is_whitespace(*line) {
line *line
} else { } else {
assert str::len(line) >= min_indent; assert str::len(*line) >= min_indent;
str::slice(line, min_indent, str::len(line)) str::slice(*line, min_indent, str::len(*line))
} }
}; };
str::connect(unindented, ~"\n") str::connect(unindented, ~"\n")