about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-17 16:51:55 +0000
committerbors <bors@rust-lang.org>2018-04-17 16:51:55 +0000
commit9379bcdd0b4ef06303e8c4e3e7c3fd79882372cc (patch)
tree5877bf1dd379fc86c6cceee692cc54a941800347 /src/liballoc
parent881a7cd86ef1001bdfa9590878ca24e57794302f (diff)
parent92d29c1267cffd65e80648ea463221f765236ebb (diff)
downloadrust-9379bcdd0b4ef06303e8c4e3e7c3fd79882372cc.tar.gz
rust-9379bcdd0b4ef06303e8c4e3e7c3fd79882372cc.zip
Auto merge of #50033 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 4 pull requests

Successful merges:

 - #49699 (Removed 'proc' from the reserved keywords list)
 - #49966 (Multiple query search)
 - #50013 (Remove no longer necessary comparison to Vec::splice.)
 - #50032 (rustdoc: Don't include private paths in all.html)

Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/string.rs3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 11fb82c09d3..2f84d5f7f86 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -1521,9 +1521,6 @@ impl String {
     /// and replaces it with the given string.
     /// The given string doesn't need to be the same length as the range.
     ///
-    /// Note: Unlike [`Vec::splice`], the replacement happens eagerly, and this
-    /// method does not return the removed chars.
-    ///
     /// # Panics
     ///
     /// Panics if the starting point or end point do not lie on a [`char`]