about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-02-24 07:55:34 +0000
committerbors <bors@rust-lang.org>2018-02-24 07:55:34 +0000
commit6070d3e47e5e9f15575a3bd33583358b52bc6eda (patch)
tree1277310a9582461e3b0dbe8db1ceb6f5f173f3c9 /src/liballoc
parentb0a8620ed639d5085d7e1cca3626681a6e4e328e (diff)
parentb26442a3cb12e988f70d9805b8bbfae52fd20d7d (diff)
downloadrust-6070d3e47e5e9f15575a3bd33583358b52bc6eda.tar.gz
rust-6070d3e47e5e9f15575a3bd33583358b52bc6eda.zip
Auto merge of #48476 - Manishearth:rollup, r=Manishearth
Rollup of 12 pull requests

- Successful merges: #47933, #48072, #48083, #48123, #48157, #48219, #48221, #48245, #48429, #48436, #48438, #48472
- Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/linked_list.rs4
-rw-r--r--src/liballoc/string.rs2
-rw-r--r--src/liballoc/vec.rs4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc/linked_list.rs b/src/liballoc/linked_list.rs
index 65be087b35e..ec579e3fd68 100644
--- a/src/liballoc/linked_list.rs
+++ b/src/liballoc/linked_list.rs
@@ -747,8 +747,8 @@ impl<T> LinkedList<T> {
     /// Creates an iterator which uses a closure to determine if an element should be removed.
     ///
     /// If the closure returns true, then the element is removed and yielded.
-    /// If the closure returns false, it will try again, and call the closure on the next element,
-    /// seeing if it passes the test.
+    /// If the closure returns false, the element will remain in the list and will not be yielded
+    /// by the iterator.
     ///
     /// Note that `drain_filter` lets you mutate every element in the filter closure, regardless of
     /// whether you choose to keep or remove it.
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 8d99d0bc8f4..409d2ab287e 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -364,7 +364,7 @@ impl String {
     ///
     /// Given that the `String` is empty, this will not allocate any initial
     /// buffer. While that means that this initial operation is very
-    /// inexpensive, but may cause excessive allocation later, when you add
+    /// inexpensive, it may cause excessive allocation later when you add
     /// data. If you have an idea of how much data the `String` will hold,
     /// consider the [`with_capacity`] method to prevent excessive
     /// re-allocation.
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index 39a4d271bd6..3c9b6b94b44 100644
--- a/src/liballoc/vec.rs
+++ b/src/liballoc/vec.rs
@@ -1966,8 +1966,8 @@ impl<T> Vec<T> {
     /// Creates an iterator which uses a closure to determine if an element should be removed.
     ///
     /// If the closure returns true, then the element is removed and yielded.
-    /// If the closure returns false, it will try again, and call the closure
-    /// on the next element, seeing if it passes the test.
+    /// If the closure returns false, the element will remain in the vector and will not be yielded
+    /// by the iterator.
     ///
     /// Using this method is equivalent to the following code:
     ///