diff options
| -rw-r--r-- | src/libextra/deque.rs | 29 | ||||
| -rw-r--r-- | src/libextra/serialize.rs | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/src/libextra/deque.rs b/src/libextra/deque.rs index c537167946c..9e19d8746a4 100644 --- a/src/libextra/deque.rs +++ b/src/libextra/deque.rs @@ -77,16 +77,6 @@ impl<T> Deque<T> { get(self.elts, idx) } - /// Iterate over the elements in the deque - pub fn each(&self, f: &fn(&T) -> bool) -> bool { - self.eachi(|_i, e| f(e)) - } - - /// Iterate over the elements in the deque by index - pub fn eachi(&self, f: &fn(uint, &T) -> bool) -> bool { - uint::range(0, self.nelts, |i| f(i, self.get(i as int))) - } - /// Remove and return the first element in the deque /// /// Fails if the deque is empty @@ -515,25 +505,6 @@ mod tests { } #[test] - fn test_eachi() { - let mut deq = Deque::new(); - deq.add_back(1); - deq.add_back(2); - deq.add_back(3); - - for deq.eachi |i, e| { - assert_eq!(*e, i + 1); - } - - deq.pop_front(); - - for deq.eachi |i, e| { - assert_eq!(*e, i + 2); - } - - } - - #[test] fn test_with_capacity() { let mut d = Deque::with_capacity(0); d.add_back(1); diff --git a/src/libextra/serialize.rs b/src/libextra/serialize.rs index 66b178f49f7..b1383948bf7 100644 --- a/src/libextra/serialize.rs +++ b/src/libextra/serialize.rs @@ -682,7 +682,7 @@ impl< > Encodable<S> for Deque<T> { fn encode(&self, s: &mut S) { do s.emit_seq(self.len()) |s| { - for self.eachi |i, e| { + for self.iter().enumerate().advance |(i, e)| { s.emit_seq_elt(i, |s| e.encode(s)); } } |