diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs index 71a32dc112f..d5f0ca9f507 100644 --- a/src/rustdoc/attr_pass.rs +++ b/src/rustdoc/attr_pass.rs @@ -144,6 +144,7 @@ fn fold_enum( { variants: do par::map(doc.variants) |variant| { + let variant = *variant; let desc = do astsrv::exec(srv) |ctxt| { match ctxt.ast_map.get(doc_id) { ast_map::node_item(@{ diff --git a/src/rustdoc/desc_to_brief_pass.rs b/src/rustdoc/desc_to_brief_pass.rs index 3fcce7db6c4..b8946ce17b0 100644 --- a/src/rustdoc/desc_to_brief_pass.rs +++ b/src/rustdoc/desc_to_brief_pass.rs @@ -44,7 +44,7 @@ fn fold_trait(fold: fold::Fold<()>, doc: doc::TraitDoc) -> doc::TraitDoc { { methods: par::map(doc.methods, |doc| { brief: extract(doc.desc), - .. doc + .. *doc }), .. doc } @@ -56,7 +56,7 @@ fn fold_impl(fold: fold::Fold<()>, doc: doc::ImplDoc) -> doc::ImplDoc { { methods: par::map(doc.methods, |doc| { brief: extract(doc.desc), - .. doc + .. *doc }), .. doc } diff --git a/src/rustdoc/fold.rs b/src/rustdoc/fold.rs index 5d2d5d1f8b9..28dbdaeea80 100644 --- a/src/rustdoc/fold.rs +++ b/src/rustdoc/fold.rs @@ -179,7 +179,7 @@ fn default_any_fold_mod( doc::ModDoc_({ item: fold.fold_item(fold, doc.item), items: par::map(doc.items, |ItemTag, copy fold| { - fold_ItemTag(fold, ItemTag) + fold_ItemTag(fold, *ItemTag) }), .. *doc }) @@ -205,7 +205,7 @@ fn default_par_fold_mod( doc::ModDoc_({ item: fold.fold_item(fold, doc.item), items: par::map(doc.items, |ItemTag, copy fold| { - fold_ItemTag(fold, ItemTag) + fold_ItemTag(fold, *ItemTag) }), .. *doc }) @@ -218,7 +218,7 @@ fn default_any_fold_nmod( { item: fold.fold_item(fold, doc.item), fns: par::map(doc.fns, |FnDoc, copy fold| { - fold.fold_fn(fold, FnDoc) + fold.fold_fn(fold, *FnDoc) }), .. doc } @@ -244,7 +244,7 @@ fn default_par_fold_nmod( { item: fold.fold_item(fold, doc.item), fns: par::map(doc.fns, |FnDoc, copy fold| { - fold.fold_fn(fold, FnDoc) + fold.fold_fn(fold, *FnDoc) }), .. doc } diff --git a/src/rustdoc/markdown_index_pass.rs b/src/rustdoc/markdown_index_pass.rs index 8ebe401dc14..3bd74d6ffe2 100644 --- a/src/rustdoc/markdown_index_pass.rs +++ b/src/rustdoc/markdown_index_pass.rs @@ -58,7 +58,7 @@ fn build_mod_index( ) -> doc::Index { { 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 { { entries: par::map(doc.fns, |doc| { - item_to_entry(doc::FnTag(doc), config) + item_to_entry(doc::FnTag(*doc), config) }) } } diff --git a/src/rustdoc/sectionalize_pass.rs b/src/rustdoc/sectionalize_pass.rs index 2203707ed21..088ca4d51bd 100644 --- a/src/rustdoc/sectionalize_pass.rs +++ b/src/rustdoc/sectionalize_pass.rs @@ -42,7 +42,7 @@ fn fold_trait(fold: fold::Fold<()>, doc: doc::TraitDoc) -> doc::TraitDoc { { desc: desc, sections: sections, - ..method + .. *method } }, .. doc @@ -59,7 +59,7 @@ fn fold_impl(fold: fold::Fold<()>, doc: doc::ImplDoc) -> doc::ImplDoc { { desc: desc, sections: sections, - .. method + .. *method } }, .. doc diff --git a/src/rustdoc/text_pass.rs b/src/rustdoc/text_pass.rs index 0da3491c364..b929cd0aa91 100644 --- a/src/rustdoc/text_pass.rs +++ b/src/rustdoc/text_pass.rs @@ -60,7 +60,7 @@ fn fold_enum(fold: fold::Fold, doc: doc::EnumDoc) -> doc::EnumDoc { variants: do par::map(doc.variants) |variant, copy fold| { { desc: maybe_apply_op(fold.ctxt, variant.desc), - .. variant + .. *variant } }, .. doc @@ -82,7 +82,7 @@ fn apply_to_methods(op: Op, docs: ~[doc::MethodDoc]) -> ~[doc::MethodDoc] { brief: maybe_apply_op(op, doc.brief), desc: maybe_apply_op(op, doc.desc), sections: apply_to_sections(op, doc.sections), - .. doc + .. *doc } } } diff --git a/src/rustdoc/tystr_pass.rs b/src/rustdoc/tystr_pass.rs index 5e2d141318a..08ad3ea3ecf 100644 --- a/src/rustdoc/tystr_pass.rs +++ b/src/rustdoc/tystr_pass.rs @@ -112,6 +112,7 @@ fn fold_enum( { variants: do par::map(doc.variants) |variant| { + let variant = *variant; let sig = do astsrv::exec(srv) |ctxt| { match ctxt.ast_map.get(doc_id) { ast_map::node_item(@{ @@ -161,7 +162,7 @@ fn merge_methods( do par::map(docs) |doc| { { sig: get_method_sig(srv, item_id, doc.name), - .. doc + .. *doc } } } diff --git a/src/rustdoc/unindent_pass.rs b/src/rustdoc/unindent_pass.rs index aa31892d466..2f38c20e900 100644 --- a/src/rustdoc/unindent_pass.rs +++ b/src/rustdoc/unindent_pass.rs @@ -63,11 +63,11 @@ fn unindent(s: ~str) -> ~str { if vec::is_not_empty(lines) { let unindented = ~[str::trim(vec::head(lines))] + do par::map(vec::tail(lines)) |line| { - if str::is_whitespace(line) { - line + if str::is_whitespace(*line) { + *line } else { - assert str::len(line) >= min_indent; - str::slice(line, min_indent, str::len(line)) + assert str::len(*line) >= min_indent; + str::slice(*line, min_indent, str::len(*line)) } }; str::connect(unindented, ~"\n")