Implement consuming iterators for ~[], remove vec::{consume, consume_reverse, map_consume}.
This commit is contained in:
parent
55f155521d
commit
eee6775642
14 changed files with 123 additions and 158 deletions
|
|
@ -24,7 +24,6 @@ use std::io::{WriterUtil, ReaderUtil};
|
|||
use std::io;
|
||||
use std::str;
|
||||
use std::to_str;
|
||||
use std::vec;
|
||||
|
||||
use serialize::Encodable;
|
||||
use serialize;
|
||||
|
|
@ -941,7 +940,7 @@ impl serialize::Decoder for Decoder {
|
|||
let name = match self.stack.pop() {
|
||||
String(s) => s,
|
||||
List(list) => {
|
||||
do vec::consume_reverse(list) |_i, v| {
|
||||
for list.consume_rev_iter().advance |v| {
|
||||
self.stack.push(v);
|
||||
}
|
||||
match self.stack.pop() {
|
||||
|
|
@ -1059,7 +1058,7 @@ impl serialize::Decoder for Decoder {
|
|||
let len = match self.stack.pop() {
|
||||
List(list) => {
|
||||
let len = list.len();
|
||||
do vec::consume_reverse(list) |_i, v| {
|
||||
for list.consume_rev_iter().advance |v| {
|
||||
self.stack.push(v);
|
||||
}
|
||||
len
|
||||
|
|
|
|||
|
|
@ -78,11 +78,10 @@ fn map_slices<A:Copy + Send,B:Copy + Send>(
|
|||
info!("num_tasks: %?", (num_tasks, futures.len()));
|
||||
assert_eq!(num_tasks, futures.len());
|
||||
|
||||
let r = do vec::map_consume(futures) |ys| {
|
||||
do futures.consume_iter().transform |ys| {
|
||||
let mut ys = ys;
|
||||
ys.get()
|
||||
};
|
||||
r
|
||||
}.collect()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -477,7 +477,7 @@ fn run_tests(opts: &TestOpts,
|
|||
}
|
||||
|
||||
// All benchmarks run at the end, in serial.
|
||||
do vec::consume(filtered_benchs) |_, b| {
|
||||
for filtered_benchs.consume_iter().advance |b| {
|
||||
callback(TeWait(copy b.desc));
|
||||
run_test(!opts.run_benchmarks, b, ch.clone());
|
||||
let (test, result) = p.recv();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue