diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-08-09 20:09:47 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-08-10 07:33:21 -0700 |
| commit | 68f40d215eae0b0370807368ba58edd0befc8bcb (patch) | |
| tree | 95a98f92e428469fff2ec31cec7f0b9dc4b3fe18 /src/libsyntax/ext | |
| parent | 4062b84f4a5926f1037535903b13b99b6806f490 (diff) | |
| download | rust-68f40d215eae0b0370807368ba58edd0befc8bcb.tar.gz rust-68f40d215eae0b0370807368ba58edd0befc8bcb.zip | |
std: Rename Iterator.transform -> .map
cc #5898
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/build.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/cfg.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/decodable.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/generic.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/rand.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/ifmt.rs | 14 | ||||
| -rw-r--r-- | src/libsyntax/ext/source_util.rs | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 1902e510935..65032642fda 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -702,7 +702,7 @@ impl AstBuilder for @ExtCtxt { } fn variant(&self, span: span, name: ident, tys: ~[ast::Ty]) -> ast::variant { - let args = tys.move_iter().transform(|ty| { + let args = tys.move_iter().map(|ty| { ast::variant_arg { ty: ty, id: self.next_id() } }).collect(); diff --git a/src/libsyntax/ext/cfg.rs b/src/libsyntax/ext/cfg.rs index 069cac01036..5f9437fd253 100644 --- a/src/libsyntax/ext/cfg.rs +++ b/src/libsyntax/ext/cfg.rs @@ -39,7 +39,7 @@ pub fn expand_cfg(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree]) -> base::MacR // test_cfg searches for meta items looking like `cfg(foo, ...)` let in_cfg = &[cx.meta_list(sp, @"cfg", cfgs)]; - let matches_cfg = attr::test_cfg(cx.cfg(), in_cfg.iter().transform(|&x| x)); + let matches_cfg = attr::test_cfg(cx.cfg(), in_cfg.iter().map(|&x| x)); let e = cx.expr_bool(sp, matches_cfg); MRExpr(e) } diff --git a/src/libsyntax/ext/deriving/decodable.rs b/src/libsyntax/ext/deriving/decodable.rs index 59b7da16c2b..1abfe246f9d 100644 --- a/src/libsyntax/ext/deriving/decodable.rs +++ b/src/libsyntax/ext/deriving/decodable.rs @@ -90,7 +90,7 @@ fn decodable_substructure(cx: @ExtCtxt, span: span, } } Right(ref fields) => { - let fields = do fields.iter().enumerate().transform |(i, f)| { + let fields = do fields.iter().enumerate().map |(i, f)| { cx.field_imm(span, *f, getarg(cx.str_of(*f), i)) }.collect(); cx.expr_struct_ident(span, substr.type_ident, fields) @@ -132,7 +132,7 @@ fn decodable_substructure(cx: @ExtCtxt, span: span, } } Right(ref fields) => { - let fields = do fields.iter().enumerate().transform |(i, f)| { + let fields = do fields.iter().enumerate().map |(i, f)| { cx.field_imm(span, *f, getarg(i)) }.collect(); cx.expr_struct_ident(span, name, fields) diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs index fb1e6bf1913..a1abe47e090 100644 --- a/src/libsyntax/ext/deriving/generic.rs +++ b/src/libsyntax/ext/deriving/generic.rs @@ -590,7 +590,7 @@ impl<'self> MethodDef<'self> { // transpose raw_fields let fields = match raw_fields { [ref self_arg, .. rest] => { - do self_arg.iter().enumerate().transform |(i, &(opt_id, field))| { + do self_arg.iter().enumerate().map |(i, &(opt_id, field))| { let other_fields = do rest.map |l| { match &l[i] { &(_, ex) => ex @@ -750,7 +750,7 @@ impl<'self> MethodDef<'self> { let field_tuples = do self_vec.iter() .zip(enum_matching_fields.iter()) - .transform |(&(id, self_f), other)| { + .map |(&(id, self_f), other)| { (id, self_f, (*other).clone()) }.collect(); substructure = EnumMatching(variant_index, variant, field_tuples); diff --git a/src/libsyntax/ext/deriving/rand.rs b/src/libsyntax/ext/deriving/rand.rs index 2966a8c114d..e55a96f77ff 100644 --- a/src/libsyntax/ext/deriving/rand.rs +++ b/src/libsyntax/ext/deriving/rand.rs @@ -95,7 +95,7 @@ fn rand_substructure(cx: @ExtCtxt, span: span, substr: &Substructure) -> @expr { let rand_variant = cx.expr_binary(span, ast::rem, rv_call, variant_count); - let mut arms = do variants.iter().enumerate().transform |(i, id_sum)| { + let mut arms = do variants.iter().enumerate().map |(i, id_sum)| { let i_expr = cx.expr_uint(span, i); let pat = cx.pat_lit(span, i_expr); diff --git a/src/libsyntax/ext/ifmt.rs b/src/libsyntax/ext/ifmt.rs index de700466d9e..a44201544d5 100644 --- a/src/libsyntax/ext/ifmt.rs +++ b/src/libsyntax/ext/ifmt.rs @@ -353,9 +353,9 @@ impl Context { let trans_method = |method: &parse::Method| { let method = match *method { parse::Select(ref arms, ref default) => { - let arms = arms.iter().transform(|arm| { + let arms = arms.iter().map(|arm| { let p = self.ecx.path_global(sp, rtpath("SelectArm")); - let result = arm.result.iter().transform(|p| { + let result = arm.result.iter().map(|p| { self.trans_piece(p) }).collect(); let s = arm.selector.to_managed(); @@ -368,7 +368,7 @@ impl Context { self.ecx.expr_vec_slice(sp, result)), ]) }).collect(); - let default = default.iter().transform(|p| { + let default = default.iter().map(|p| { self.trans_piece(p) }).collect(); self.ecx.expr_call_global(sp, rtpath("Select"), ~[ @@ -381,9 +381,9 @@ impl Context { Some(i) => { some(self.ecx.expr_uint(sp, i)) } None => { none() } }; - let arms = arms.iter().transform(|arm| { + let arms = arms.iter().map(|arm| { let p = self.ecx.path_global(sp, rtpath("PluralArm")); - let result = arm.result.iter().transform(|p| { + let result = arm.result.iter().map(|p| { self.trans_piece(p) }).collect(); let (lr, selarg) = match arm.selector { @@ -408,7 +408,7 @@ impl Context { self.ecx.expr_vec_slice(sp, result)), ]) }).collect(); - let default = default.iter().transform(|p| { + let default = default.iter().map(|p| { self.trans_piece(p) }).collect(); self.ecx.expr_call_global(sp, rtpath("Plural"), ~[ @@ -575,7 +575,7 @@ impl Context { Some(self.format_arg(e.span, Right(name), lname)); } - let args = names.move_iter().transform(|a| a.unwrap()); + let args = names.move_iter().map(|a| a.unwrap()); let mut args = locals.move_iter().chain_(args); // Next, build up the actual call to the sprintf function. diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 71903b9aa02..031f0fb4199 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -105,7 +105,7 @@ pub fn expand_include_bin(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree]) let file = get_single_str_from_tts(cx, sp, tts, "include_bin!"); match io::read_whole_file(&res_rel_file(cx, sp, &Path(file))) { result::Ok(src) => { - let u8_exprs: ~[@ast::expr] = src.iter().transform(|char| cx.expr_u8(sp, *char)).collect(); + let u8_exprs: ~[@ast::expr] = src.iter().map(|char| cx.expr_u8(sp, *char)).collect(); base::MRExpr(cx.expr_vec(sp, u8_exprs)) } result::Err(ref e) => { |
