about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authormoe <35686186+csmoe@users.noreply.github.com>2018-02-17 22:22:26 +0800
committerGitHub <noreply@github.com>2018-02-17 22:22:26 +0800
commit2cf683edc0c0481906749517cbefe631f7ed79d9 (patch)
tree8d2e8a91d176ed9193747a0d85f91b57d3c13ddb /src/liballoc
parent0be2dc8d9b4765e59cf9bbf3d342de00fa1b9aec (diff)
parentb85bd51c944f8cbe3a9c4cc95b61e08e5f338052 (diff)
downloadrust-2cf683edc0c0481906749517cbefe631f7ed79d9.tar.gz
rust-2cf683edc0c0481906749517cbefe631f7ed79d9.zip
Merge branch 'master' into inform_type_annotations
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/vec.rs17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index b26979c7f6d..5c7f8ef7321 100644
--- a/src/liballoc/vec.rs
+++ b/src/liballoc/vec.rs
@@ -805,22 +805,7 @@ impl<T> Vec<T> {
     pub fn retain<F>(&mut self, mut f: F)
         where F: FnMut(&T) -> bool
     {
-        let len = self.len();
-        let mut del = 0;
-        {
-            let v = &mut **self;
-
-            for i in 0..len {
-                if !f(&v[i]) {
-                    del += 1;
-                } else if del > 0 {
-                    v.swap(i - del, i);
-                }
-            }
-        }
-        if del > 0 {
-            self.truncate(len - del);
-        }
+        self.drain_filter(|x| !f(x));
     }
 
     /// Removes all but the first of consecutive elements in the vector that resolve to the same