From decf395221c986d41947266febf05ae18909b0e4 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 27 Apr 2015 13:47:19 -0400 Subject: [PATCH] Implement retain for vec_deque --- src/libcollections/vec_deque.rs | 36 +++++++++++++++++++++++++++++ src/libcollectionstest/lib.rs | 1 + src/libcollectionstest/vec_deque.rs | 9 ++++++++ 3 files changed, 46 insertions(+) diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs index 3032b13855ba3..f70906f84b869 100644 --- a/src/libcollections/vec_deque.rs +++ b/src/libcollections/vec_deque.rs @@ -1395,6 +1395,42 @@ impl VecDeque { // naive impl self.extend(other.drain()); } + + /// Retains only the elements specified by the predicate. + /// + /// In other words, remove all elements `e` such that `f(&e)` returns false. + /// This method operates in place and preserves the order of the retained + /// elements. + /// + /// # Examples + /// + /// ``` + /// # #![feature(vec_deque_retain)] + /// use std::collections::VecDeque; + /// + /// let mut buf = VecDeque::new(); + /// buf.extend(1..5); + /// buf.retain(|&x| x%2 == 0); + /// + /// let v: Vec<_> = buf.into_iter().collect(); + /// assert_eq!(&v[..], &[2, 4]); + /// ``` + #[unstable(feature = "vec_deque_retain", + reason = "new API, waiting for dust to settle")] + pub fn retain(&mut self, mut f: F) where F: FnMut(&T) -> bool { + let len = self.len(); + let mut del = 0; + for i in 0..len { + if !f(&self[i]) { + del += 1; + } else if del > 0 { + self.swap(i-del, i); + } + } + if del > 0 { + self.truncate(len - del); + } + } } impl VecDeque { diff --git a/src/libcollectionstest/lib.rs b/src/libcollectionstest/lib.rs index 57a95633b678f..c5edc4e621b67 100644 --- a/src/libcollectionstest/lib.rs +++ b/src/libcollectionstest/lib.rs @@ -21,6 +21,7 @@ #![feature(into_cow)] #![feature(step_by)] #![cfg_attr(test, feature(str_char))] +#![cfg_attr(test, feature(vec_deque_retain))] #[macro_use] extern crate log; diff --git a/src/libcollectionstest/vec_deque.rs b/src/libcollectionstest/vec_deque.rs index 12323286f6b4b..7870447281bc1 100644 --- a/src/libcollectionstest/vec_deque.rs +++ b/src/libcollectionstest/vec_deque.rs @@ -885,3 +885,12 @@ fn test_append() { assert_eq!(b.iter().cloned().collect::>(), [1, 2, 3, 4, 5, 6]); assert_eq!(a.iter().cloned().collect::>(), []); } + +#[test] +fn test_retain() { + let mut buf = VecDeque::new(); + buf.extend(1..5); + buf.retain(|&x| x % 2 == 0); + let v: Vec<_> = buf.into_iter().collect(); + assert_eq!(&v[..], &[2, 4]); +}