Skip to content

Commit 68f40d2

Browse files
erickterickt
committed
std: Rename Iterator.transform -> .map
cc rust-lang#5898
1 parent 4062b84 commit 68f40d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+188
-189
lines changed

‎src/compiletest/header.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ fn parse_check_line(line: &str) -> Option<~str> {
142142
fn parse_exec_env(line: &str) -> Option<(~str, ~str)> {
143143
do parse_name_value_directive(line, ~"exec-env").map |nv| {
144144
// nv is either FOO or FOO=BAR
145-
let mut strs: ~[~str] = nv.splitn_iter('=', 1).transform(|s| s.to_owned()).collect();
145+
let mut strs: ~[~str] = nv.splitn_iter('=', 1).map(|s| s.to_owned()).collect();
146146

147147
match strs.len() {
148148
1u => (strs.pop(), ~""),

‎src/compiletest/runtest.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,13 @@ fn check_expected_errors(expected_errors: ~[errors::ExpectedError],
350350
fatal(~"process did not return an error status");
351351
}
352352

353-
let prefixes = expected_errors.iter().transform(|ee| {
353+
let prefixes = expected_errors.iter().map(|ee| {
354354
fmt!("%s:%u:", testfile.to_str(), ee.line)
355355
}).collect::<~[~str]>();
356356

357357
fn to_lower( s : &str ) -> ~str {
358358
let i = s.iter();
359-
let c : ~[char] = i.transform( |c| {
359+
let c : ~[char] = i.map( |c| {
360360
if c.is_ascii() {
361361
c.to_ascii().to_lower().to_char()
362362
} else {
@@ -760,7 +760,7 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps,
760760
let cmdline = make_cmdline("", args.prog, args.args);
761761

762762
// get bare program string
763-
let mut tvec: ~[~str] = args.prog.split_iter('/').transform(|ts| ts.to_owned()).collect();
763+
let mut tvec: ~[~str] = args.prog.split_iter('/').map(|ts| ts.to_owned()).collect();
764764
let prog_short = tvec.pop();
765765

766766
// copy to target

‎src/libextra/bitv.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ impl BitvSet {
869869
let min = num::min(self.bitv.storage.len(), other.bitv.storage.len());
870870
self.bitv.storage.slice(0, min).iter().enumerate()
871871
.zip(Repeat::new(&other.bitv.storage))
872-
.transform(|((i, &w), o_store)| (i * uint::bits, w, o_store[i]))
872+
.map(|((i, &w), o_store)| (i * uint::bits, w, o_store[i]))
873873
}
874874

875875
/// Visits each word in self or other that extends beyond the other. This
@@ -888,11 +888,11 @@ impl BitvSet {
888888
if olen < slen {
889889
self.bitv.storage.slice_from(olen).iter().enumerate()
890890
.zip(Repeat::new(olen))
891-
.transform(|((i, &w), min)| (true, (i + min) * uint::bits, w))
891+
.map(|((i, &w), min)| (true, (i + min) * uint::bits, w))
892892
} else {
893893
other.bitv.storage.slice_from(slen).iter().enumerate()
894894
.zip(Repeat::new(slen))
895-
.transform(|((i, &w), min)| (false, (i + min) * uint::bits, w))
895+
.map(|((i, &w), min)| (false, (i + min) * uint::bits, w))
896896
}
897897
}
898898
}

‎src/libextra/dlist.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ impl<A: Eq> Eq for DList<A> {
600600

601601
impl<A: Clone> Clone for DList<A> {
602602
fn clone(&self) -> DList<A> {
603-
self.iter().transform(|x| x.clone()).collect()
603+
self.iter().map(|x| x.clone()).collect()
604604
}
605605
}
606606

@@ -690,7 +690,7 @@ mod tests {
690690

691691
#[cfg(test)]
692692
fn list_from<T: Clone>(v: &[T]) -> DList<T> {
693-
v.iter().transform(|x| (*x).clone()).collect()
693+
v.iter().map(|x| (*x).clone()).collect()
694694
}
695695

696696
#[test]
@@ -1014,7 +1014,7 @@ mod tests {
10141014
fn bench_collect_into(b: &mut test::BenchHarness) {
10151015
let v = &[0, ..64];
10161016
do b.iter {
1017-
let _: DList<int> = v.iter().transform(|x| *x).collect();
1017+
let _: DList<int> = v.iter().map(|x| *x).collect();
10181018
}
10191019
}
10201020

@@ -1075,31 +1075,31 @@ mod tests {
10751075
#[bench]
10761076
fn bench_iter(b: &mut test::BenchHarness) {
10771077
let v = &[0, ..128];
1078-
let m: DList<int> = v.iter().transform(|&x|x).collect();
1078+
let m: DList<int> = v.iter().map(|&x|x).collect();
10791079
do b.iter {
10801080
assert!(m.iter().len_() == 128);
10811081
}
10821082
}
10831083
#[bench]
10841084
fn bench_iter_mut(b: &mut test::BenchHarness) {
10851085
let v = &[0, ..128];
1086-
let mut m: DList<int> = v.iter().transform(|&x|x).collect();
1086+
let mut m: DList<int> = v.iter().map(|&x|x).collect();
10871087
do b.iter {
10881088
assert!(m.mut_iter().len_() == 128);
10891089
}
10901090
}
10911091
#[bench]
10921092
fn bench_iter_rev(b: &mut test::BenchHarness) {
10931093
let v = &[0, ..128];
1094-
let m: DList<int> = v.iter().transform(|&x|x).collect();
1094+
let m: DList<int> = v.iter().map(|&x|x).collect();
10951095
do b.iter {
10961096
assert!(m.rev_iter().len_() == 128);
10971097
}
10981098
}
10991099
#[bench]
11001100
fn bench_iter_mut_rev(b: &mut test::BenchHarness) {
11011101
let v = &[0, ..128];
1102-
let mut m: DList<int> = v.iter().transform(|&x|x).collect();
1102+
let mut m: DList<int> = v.iter().map(|&x|x).collect();
11031103
do b.iter {
11041104
assert!(m.mut_rev_iter().len_() == 128);
11051105
}

‎src/libextra/fileinput.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ a literal `-`.
353353
*/
354354
// XXX: stupid, unclear name
355355
pub fn pathify(vec: &[~str], stdin_hyphen : bool) -> ~[Option<Path>] {
356-
vec.iter().transform(|str| {
356+
vec.iter().map(|str| {
357357
if stdin_hyphen && "-" == *str {
358358
None
359359
} else {

‎src/libextra/getopts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ pub mod groups {
647647

648648
let desc_sep = "\n" + " ".repeat(24);
649649

650-
let mut rows = opts.iter().transform(|optref| {
650+
let mut rows = opts.iter().map(|optref| {
651651
let OptGroup{short_name: short_name,
652652
long_name: long_name,
653653
hint: hint,

‎src/libextra/num/bigint.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ impl Mul<BigUint, BigUint> for BigUint {
287287
if n == 1 { return (*a).clone(); }
288288

289289
let mut carry = 0;
290-
let mut prod = do a.data.iter().transform |ai| {
290+
let mut prod = do a.data.iter().map |ai| {
291291
let (hi, lo) = BigDigit::from_uint(
292292
(*ai as uint) * (n as uint) + (carry as uint)
293293
);
@@ -625,7 +625,7 @@ impl BigUint {
625625
if n_bits == 0 || self.is_zero() { return (*self).clone(); }
626626

627627
let mut carry = 0;
628-
let mut shifted = do self.data.iter().transform |elem| {
628+
let mut shifted = do self.data.iter().map |elem| {
629629
let (hi, lo) = BigDigit::from_uint(
630630
(*elem as uint) << n_bits | (carry as uint)
631631
);

‎src/libextra/par.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn map_slices<A:Clone + Send,B:Clone + Send>(
7777
info!("num_tasks: %?", (num_tasks, futures.len()));
7878
assert_eq!(num_tasks, futures.len());
7979

80-
do futures.move_iter().transform |ys| {
80+
do futures.move_iter().map |ys| {
8181
let mut ys = ys;
8282
ys.get()
8383
}.collect()
@@ -90,7 +90,7 @@ pub fn map<A:Clone + Send,B:Clone + Send>(
9090
vec::concat(map_slices(xs, || {
9191
let f = fn_factory();
9292
let result: ~fn(uint, &[A]) -> ~[B] =
93-
|_, slice| slice.iter().transform(|x| f(x)).collect();
93+
|_, slice| slice.iter().map(|x| f(x)).collect();
9494
result
9595
}))
9696
}
@@ -102,7 +102,7 @@ pub fn mapi<A:Clone + Send,B:Clone + Send>(
102102
let slices = map_slices(xs, || {
103103
let f = fn_factory();
104104
let result: ~fn(uint, &[A]) -> ~[B] = |base, slice| {
105-
slice.iter().enumerate().transform(|(i, x)| {
105+
slice.iter().enumerate().map(|(i, x)| {
106106
f(i + base, x)
107107
}).collect()
108108
};

‎src/libextra/priority_queue.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ mod tests {
367367
fn test_from_iter() {
368368
let xs = ~[9u, 8, 7, 6, 5, 4, 3, 2, 1];
369369

370-
let mut q: PriorityQueue<uint> = xs.rev_iter().transform(|&x| x).collect();
370+
let mut q: PriorityQueue<uint> = xs.rev_iter().map(|&x| x).collect();
371371

372372
for &x in xs.iter() {
373373
assert_eq!(q.pop(), x);

‎src/libextra/ringbuf.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -692,8 +692,8 @@ mod tests {
692692
fn test_from_iterator() {
693693
use std::iterator;
694694
let v = ~[1,2,3,4,5,6,7];
695-
let deq: RingBuf<int> = v.iter().transform(|&x| x).collect();
696-
let u: ~[int] = deq.iter().transform(|&x| x).collect();
695+
let deq: RingBuf<int> = v.iter().map(|&x| x).collect();
696+
let u: ~[int] = deq.iter().map(|&x| x).collect();
697697
assert_eq!(u, v);
698698

699699
let mut seq = iterator::count(0u, 2).take_(256);

‎src/libextra/terminfo/parm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables)
105105
*dst = (*src).clone();
106106
}
107107

108-
for c in cap.iter().transform(|&x| x) {
108+
for c in cap.iter().map(|&x| x) {
109109
let cur = c as char;
110110
let mut old_state = state;
111111
match state {

‎src/libextra/terminfo/parser/compiled.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> {
214214
}
215215

216216
let names_str = str::from_bytes(file.read_bytes(names_bytes as uint - 1)); // don't read NUL
217-
let term_names: ~[~str] = names_str.split_iter('|').transform(|s| s.to_owned()).collect();
217+
let term_names: ~[~str] = names_str.split_iter('|').map(|s| s.to_owned()).collect();
218218

219219
file.read_byte(); // consume NUL
220220

‎src/libextra/test.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -526,10 +526,10 @@ impl ConsoleTestState {
526526

527527
pub fn fmt_metrics(mm: &MetricMap) -> ~str {
528528
let v : ~[~str] = mm.iter()
529-
.transform(|(k,v)| fmt!("%s: %f (+/- %f)",
530-
*k,
531-
v.value as float,
532-
v.noise as float))
529+
.map(|(k,v)| fmt!("%s: %f (+/- %f)",
530+
*k,
531+
v.value as float,
532+
v.noise as float))
533533
.collect();
534534
v.connect(", ")
535535
}

‎src/libextra/treemap.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ mod test_treemap {
12591259
fn test_from_iter() {
12601260
let xs = ~[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6)];
12611261

1262-
let map: TreeMap<int, int> = xs.iter().transform(|&x| x).collect();
1262+
let map: TreeMap<int, int> = xs.iter().map(|&x| x).collect();
12631263

12641264
for &(k, v) in xs.iter() {
12651265
assert_eq!(map.find(&k), Some(&v));
@@ -1558,7 +1558,7 @@ mod test_set {
15581558
fn test_from_iter() {
15591559
let xs = ~[1, 2, 3, 4, 5, 6, 7, 8, 9];
15601560

1561-
let set: TreeSet<int> = xs.iter().transform(|&x| x).collect();
1561+
let set: TreeSet<int> = xs.iter().map(|&x| x).collect();
15621562

15631563
for x in xs.iter() {
15641564
assert!(set.contains(x));

‎src/librustc/back/rpath.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn get_sysroot_absolute_rt_lib(sess: session::Session) -> Path {
4949
}
5050

5151
pub fn rpaths_to_flags(rpaths: &[Path]) -> ~[~str] {
52-
rpaths.iter().transform(|rpath| fmt!("-Wl,-rpath,%s",rpath.to_str())).collect()
52+
rpaths.iter().map(|rpath| fmt!("-Wl,-rpath,%s",rpath.to_str())).collect()
5353
}
5454

5555
fn get_rpaths(os: session::os,
@@ -100,7 +100,7 @@ fn get_rpaths(os: session::os,
100100
fn get_rpaths_relative_to_output(os: session::os,
101101
output: &Path,
102102
libs: &[Path]) -> ~[Path] {
103-
libs.iter().transform(|a| get_rpath_relative_to_output(os, output, a)).collect()
103+
libs.iter().map(|a| get_rpath_relative_to_output(os, output, a)).collect()
104104
}
105105

106106
pub fn get_rpath_relative_to_output(os: session::os,
@@ -123,7 +123,7 @@ pub fn get_rpath_relative_to_output(os: session::os,
123123
}
124124

125125
fn get_absolute_rpaths(libs: &[Path]) -> ~[Path] {
126-
libs.iter().transform(|a| get_absolute_rpath(a)).collect()
126+
libs.iter().map(|a| get_absolute_rpath(a)).collect()
127127
}
128128

129129
pub fn get_absolute_rpath(lib: &Path) -> Path {

‎src/librustc/driver/driver.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ pub fn build_configuration(sess: Session, argv0: @str, input: &input) ->
120120
// Convert strings provided as --cfg [cfgspec] into a crate_cfg
121121
fn parse_cfgspecs(cfgspecs: ~[~str],
122122
demitter: diagnostic::Emitter) -> ast::CrateConfig {
123-
do cfgspecs.move_iter().transform |s| {
123+
do cfgspecs.move_iter().map |s| {
124124
let sess = parse::new_parse_sess(Some(demitter));
125125
parse::parse_meta_from_source_str(@"cfgspec", s.to_managed(), ~[], sess)
126126
}.collect::<ast::CrateConfig>()
@@ -726,7 +726,7 @@ pub fn build_session_options(binary: @str,
726726
let addl_lib_search_paths = getopts::opt_strs(matches, "L").map(|s| Path(*s));
727727
let linker = getopts::opt_maybe_str(matches, "linker");
728728
let linker_args = getopts::opt_strs(matches, "link-args").flat_map( |a| {
729-
a.split_iter(' ').transform(|arg| arg.to_owned()).collect()
729+
a.split_iter(' ').map(|arg| arg.to_owned()).collect()
730730
});
731731

732732
let cfg = parse_cfgspecs(getopts::opt_strs(matches, "cfg"), demitter);
@@ -737,7 +737,7 @@ pub fn build_session_options(binary: @str,
737737
let custom_passes = match getopts::opt_maybe_str(matches, "passes") {
738738
None => ~[],
739739
Some(s) => {
740-
s.split_iter(|c: char| c == ' ' || c == ',').transform(|s| {
740+
s.split_iter(|c: char| c == ' ' || c == ',').map(|s| {
741741
s.trim().to_owned()
742742
}).collect()
743743
}

‎src/librustc/front/config.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ fn fold_item_underscore(cx: @Context, item: &ast::item_,
102102
let item = match *item {
103103
ast::item_impl(ref a, ref b, ref c, ref methods) => {
104104
let methods = methods.iter().filter(|m| method_in_cfg(cx, **m))
105-
.transform(|x| *x).collect();
105+
.map(|x| *x).collect();
106106
ast::item_impl((*a).clone(), (*b).clone(), (*c).clone(), methods)
107107
}
108108
ast::item_trait(ref a, ref b, ref methods) => {
109109
let methods = methods.iter().filter(|m| trait_method_in_cfg(cx, *m) )
110-
.transform(|x| (*x).clone()).collect();
110+
.map(|x| (*x).clone()).collect();
111111
ast::item_trait((*a).clone(), (*b).clone(), methods)
112112
}
113113
ref item => (*item).clone(),
@@ -180,5 +180,5 @@ fn trait_method_in_cfg(cx: @Context, meth: &ast::trait_method) -> bool {
180180
// Determine if an item should be translated in the current crate
181181
// configuration based on the item's attributes
182182
fn in_cfg(cfg: &[@ast::MetaItem], attrs: &[ast::Attribute]) -> bool {
183-
attr::test_cfg(cfg, attrs.iter().transform(|x| *x))
183+
attr::test_cfg(cfg, attrs.iter().map(|x| *x))
184184
}

‎src/librustc/front/test.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ fn fold_mod(cx: @mut TestCtxt,
126126

127127
let mod_nomain = ast::_mod {
128128
view_items: m.view_items.clone(),
129-
items: m.items.iter().transform(|i| nomain(cx, *i)).collect(),
129+
items: m.items.iter().map(|i| nomain(cx, *i)).collect(),
130130
};
131131

132132
fold::noop_fold_mod(&mod_nomain, fld)
@@ -236,7 +236,7 @@ fn is_ignored(cx: @mut TestCtxt, i: @ast::item) -> bool {
236236
do i.attrs.iter().any |attr| {
237237
// check ignore(cfg(foo, bar))
238238
"ignore" == attr.name() && match attr.meta_item_list() {
239-
Some(ref cfgs) => attr::test_cfg(cx.crate.config, cfgs.iter().transform(|x| *x)),
239+
Some(ref cfgs) => attr::test_cfg(cx.crate.config, cfgs.iter().map(|x| *x)),
240240
None => true
241241
}
242242
}

‎src/librustc/metadata/creader.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ fn warn_if_multiple_versions(e: @mut Env,
8383
*crate_cache[crate_cache.len() - 1].metas
8484
);
8585

86-
let vec: ~[Either<cache_entry, cache_entry>] = crate_cache.iter().transform(|&entry| {
86+
let vec: ~[Either<cache_entry, cache_entry>] = crate_cache.iter().map(|&entry| {
8787
let othername = loader::crate_name_from_metas(*entry.metas);
8888
if name == othername {
8989
Left(entry)

‎src/librustc/middle/cfg/construct.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -112,23 +112,23 @@ impl CFGBuilder {
112112
ast::pat_enum(_, Some(ref subpats)) |
113113
ast::pat_tup(ref subpats) => {
114114
let pats_exit =
115-
self.pats_all(subpats.iter().transform(|p| *p), pred);
115+
self.pats_all(subpats.iter().map(|p| *p), pred);
116116
self.add_node(pat.id, [pats_exit])
117117
}
118118

119119
ast::pat_struct(_, ref subpats, _) => {
120120
let pats_exit =
121-
self.pats_all(subpats.iter().transform(|f| f.pat), pred);
121+
self.pats_all(subpats.iter().map(|f| f.pat), pred);
122122
self.add_node(pat.id, [pats_exit])
123123
}
124124

125125
ast::pat_vec(ref pre, ref vec, ref post) => {
126126
let pre_exit =
127-
self.pats_all(pre.iter().transform(|p| *p), pred);
127+
self.pats_all(pre.iter().map(|p| *p), pred);
128128
let vec_exit =
129-
self.pats_all(vec.iter().transform(|p| *p), pre_exit);
129+
self.pats_all(vec.iter().map(|p| *p), pre_exit);
130130
let post_exit =
131-
self.pats_all(post.iter().transform(|p| *p), vec_exit);
131+
self.pats_all(post.iter().map(|p| *p), vec_exit);
132132
self.add_node(pat.id, [post_exit])
133133
}
134134
}
@@ -376,7 +376,7 @@ impl CFGBuilder {
376376
ast::expr_struct(_, ref fields, base) => {
377377
let base_exit = self.opt_expr(base, pred);
378378
let field_exprs: ~[@ast::expr] =
379-
fields.iter().transform(|f| f.expr).collect();
379+
fields.iter().map(|f| f.expr).collect();
380380
self.straightline(expr, base_exit, field_exprs)
381381
}
382382

0 commit comments

Comments
 (0)