Skip to content

Commit 08dc72f

Browse files
author
blake2-ppc
committed
deque: Implement FromIterator
So that deque can be used with IteratorUtil::collect()
1 parent 40ce0b7 commit 08dc72f

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

src/libextra/deque.rs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use std::uint;
1414
use std::vec;
1515
use std::cast::transmute;
16+
use std::iterator::FromIterator;
1617

1718
static INITIAL_CAPACITY: uint = 32u; // 2^5
1819

@@ -253,6 +254,16 @@ fn get<'r, T>(elts: &'r [Option<T>], i: uint) -> &'r T {
253254
match elts[i] { Some(ref t) => t, _ => fail!() }
254255
}
255256

257+
impl<A, T: Iterator<A>> FromIterator<A, T> for Deque<A> {
258+
fn from_iterator(iterator: &mut T) -> Deque<A> {
259+
let mut deq = Deque::new();
260+
for iterator.advance |elt| {
261+
deq.add_back(elt);
262+
}
263+
deq
264+
}
265+
}
266+
256267
#[cfg(test)]
257268
mod tests {
258269
use super::*;
@@ -545,4 +556,20 @@ mod tests {
545556
}
546557
assert_eq!(d.rev_iter().collect::<~[&int]>(), ~[&4,&3,&2,&1,&0,&6,&7,&8]);
547558
}
559+
560+
#[test]
561+
fn test_from_iterator() {
562+
use std::iterator;
563+
let v = ~[1,2,3,4,5,6,7];
564+
let deq: Deque<int> = v.iter().transform(|&x| x).collect();
565+
let u: ~[int] = deq.iter().transform(|&x| x).collect();
566+
assert_eq!(u, v);
567+
568+
let mut seq = iterator::Counter::new(0u, 2).take_(256);
569+
let deq: Deque<uint> = seq.collect();
570+
for deq.iter().enumerate().advance |(i, &x)| {
571+
assert_eq!(2*i, x);
572+
}
573+
assert_eq!(deq.len(), 256);
574+
}
548575
}

0 commit comments

Comments
 (0)