user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

std: Rename Iterator.transform -> .map

Browse source 
cc #5898
This commit is contained in:
Erick Tryzelaar 2013-08-09 20:09:47 -07:00
parent 4062b84f4a
commit 68f40d215e
72 changed files with 188 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/attr_parser.rs
View file

@ -27,7 +27,7 @@ pub struct CrateAttrs {
fn doc_metas(attrs: ~[ast::Attribute]) -> ~[@ast::MetaItem] {
attrs.iter()
.filter(|at| "doc" == at.name())
.transform(|at| at.desugar_doc().meta())
.map(|at| at.desugar_doc().meta())
.collect()
}

8
src/librustdoc/attr_pass.rs
View file

@ -123,7 +123,7 @@ fn fold_enum(
let doc = fold::default_seq_fold_enum(fold, doc);
doc::EnumDoc {
variants: do doc.variants.iter().transform |variant| {
variants: do doc.variants.iter().map |variant| {
let variant = (*variant).clone();
let desc = {
let variant = variant.clone();
@ -182,7 +182,7 @@ fn merge_method_attrs(
ast_map::node_item(@ast::item {
node: ast::item_trait(_, _, ref methods), _
}, _) => {
methods.iter().transform(|method| {
methods.iter().map(|method| {
match (*method).clone() {
ast::required(ty_m) => {
(to_str(ty_m.ident),
@ -197,7 +197,7 @@ fn merge_method_attrs(
ast_map::node_item(@ast::item {
node: ast::item_impl(_, _, _, ref methods), _
}, _) => {
methods.iter().transform(|method| {
methods.iter().map(|method| {
(to_str(method.ident),
attr_parser::parse_desc(method.attrs.clone()))
}).collect()
@ -206,7 +206,7 @@ fn merge_method_attrs(
}
};
do docs.iter().zip(attrs.iter()).transform |(doc, attrs)| {
do docs.iter().zip(attrs.iter()).map |(doc, attrs)| {
assert!(doc.name == attrs.first());
let desc = attrs.second();

6
src/librustdoc/extract.rs
View file

@ -185,7 +185,7 @@ fn enumdoc_from_enum(
fn variantdocs_from_variants(
variants: ~[ast::variant]
) -> ~[doc::VariantDoc] {
variants.iter().transform(variantdoc_from_variant).collect()
variants.iter().map(variantdoc_from_variant).collect()
}
fn variantdoc_from_variant(variant: &ast::variant) -> doc::VariantDoc {
@ -202,7 +202,7 @@ fn traitdoc_from_trait(
) -> doc::TraitDoc {
doc::TraitDoc {
item: itemdoc,
methods: do methods.iter().transform |method| {
methods: do methods.iter().map |method| {
match (*method).clone() {
ast::required(ty_m) => {
doc::MethodDoc {
@ -238,7 +238,7 @@ fn impldoc_from_impl(
bounds_str: None,
trait_types: ~[],
self_ty: None,
methods: do methods.iter().transform |method| {
methods: do methods.iter().map |method| {
doc::MethodDoc {
name: to_str(method.ident),
brief: None,

14
src/librustdoc/fold.rs
View file

@ -153,7 +153,7 @@ pub fn default_par_fold<T:Clone>(ctxt: T) -> Fold<T> {
pub fn default_seq_fold_doc<T>(fold: &Fold<T>, doc: doc::Doc) -> doc::Doc {
doc::Doc {
pages: do doc.pages.iter().transform |page| {
pages: do doc.pages.iter().map |page| {
match (*page).clone() {
doc::CratePage(doc) => {
doc::CratePage((fold.fold_crate)(fold, doc))
@ -189,7 +189,7 @@ pub fn default_any_fold_mod<T:Clone>(
) -> doc::ModDoc {
doc::ModDoc {
item: (fold.fold_item)(fold, doc.item.clone()),
items: doc.items.iter().transform(|ItemTag| {
items: doc.items.iter().map(|ItemTag| {
fold_ItemTag(fold, (*ItemTag).clone())
}).collect(),
.. doc
@ -202,7 +202,7 @@ pub fn default_seq_fold_mod<T>(
) -> doc::ModDoc {
doc::ModDoc {
item: (fold.fold_item)(fold, doc.item.clone()),
items: doc.items.iter().transform(|ItemTag| {
items: doc.items.iter().map(|ItemTag| {
fold_ItemTag(fold, (*ItemTag).clone())
}).collect(),
.. doc
@ -215,7 +215,7 @@ pub fn default_par_fold_mod<T:Clone>(
) -> doc::ModDoc {
doc::ModDoc {
item: (fold.fold_item)(fold, doc.item.clone()),
items: doc.items.iter().transform(|ItemTag| {
items: doc.items.iter().map(|ItemTag| {
fold_ItemTag(fold, (*ItemTag).clone())
}).collect(),
.. doc
@ -228,7 +228,7 @@ pub fn default_any_fold_nmod<T:Clone>(
) -> doc::NmodDoc {
doc::NmodDoc {
item: (fold.fold_item)(fold, doc.item.clone()),
fns: doc.fns.iter().transform(|FnDoc| {
fns: doc.fns.iter().map(|FnDoc| {
(fold.fold_fn)(fold, (*FnDoc).clone())
}).collect(),
.. doc
@ -241,7 +241,7 @@ pub fn default_seq_fold_nmod<T>(
) -> doc::NmodDoc {
doc::NmodDoc {
item: (fold.fold_item)(fold, doc.item.clone()),
fns: doc.fns.iter().transform(|FnDoc| {
fns: doc.fns.iter().map(|FnDoc| {
(fold.fold_fn)(fold, (*FnDoc).clone())
}).collect(),
.. doc
@ -254,7 +254,7 @@ pub fn default_par_fold_nmod<T:Clone>(
) -> doc::NmodDoc {
doc::NmodDoc {
item: (fold.fold_item)(fold, doc.item.clone()),
fns: doc.fns.iter().transform(|FnDoc| {
fns: doc.fns.iter().map(|FnDoc| {
(fold.fold_fn)(fold, (*FnDoc).clone())
}).collect(),
.. doc

2
src/librustdoc/page_pass.rs
View file

@ -123,7 +123,7 @@ fn strip_mod(doc: doc::ModDoc) -> doc::ModDoc {
doc::ModTag(_) | doc::NmodTag(_) => false,
_ => true
}
}.transform(|x| (*x).clone()).collect::<~[doc::ItemTag]>(),
}.map(|x| (*x).clone()).collect::<~[doc::ItemTag]>(),
.. doc.clone()
}
}

2
src/librustdoc/prune_hidden_pass.rs
View file

@ -43,7 +43,7 @@ fn fold_mod(
doc::ModDoc {
items: do doc.items.iter().filter |item_tag| {
!is_hidden(fold.ctxt.clone(), item_tag.item())
}.transform(|x| (*x).clone()).collect(),
}.map(|x| (*x).clone()).collect(),
.. doc
}
}

4
src/librustdoc/prune_private_pass.rs
View file

@ -91,7 +91,7 @@ fn strip_priv_methods(
ast::private => false,
ast::inherited => item_vis == ast::public
}
}.transform(|x| (*x).clone()).collect();
}.map(|x| (*x).clone()).collect();
doc::ImplDoc {
methods: methods,
@ -126,7 +126,7 @@ fn fold_mod(
is_visible(fold.ctxt.clone(), item_tag.item())
}
}
}).transform(|x| (*x).clone()).collect(),
}).map(|x| (*x).clone()).collect(),
.. doc
}
}

4
src/librustdoc/tystr_pass.rs
View file

@ -124,7 +124,7 @@ fn fold_enum(
let srv = fold.ctxt.clone();
doc::EnumDoc {
variants: do doc.variants.iter().transform |variant| {
variants: do doc.variants.iter().map |variant| {
let sig = {
let variant = (*variant).clone();
do astsrv::exec(srv.clone()) |ctxt| {
@ -169,7 +169,7 @@ fn merge_methods(
item_id: doc::AstId,
docs: ~[doc::MethodDoc]
) -> ~[doc::MethodDoc] {
do docs.iter().transform |doc| {
do docs.iter().map |doc| {
doc::MethodDoc {
sig: get_method_sig(srv.clone(), item_id, doc.name.clone()),
.. (*doc).clone()