about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-03-28 17:55:05 +0200
committerGitHub <noreply@github.com>2018-03-28 17:55:05 +0200
commit43f56ce131e5064ab756e37ddcd39755c5c4a98b (patch)
tree80f3f370ac4df9d02b363d520ca0e8293e5ae96d
parentd87c19db6df9189a2beb43e7998d0cc5548878b3 (diff)
parent7c442e5c9b46de225f8903352b7dfc5552b297de (diff)
downloadrust-43f56ce131e5064ab756e37ddcd39755c5c4a98b.tar.gz
rust-43f56ce131e5064ab756e37ddcd39755c5c4a98b.zip
Rollup merge of #49243 - murarth:stabilize-retain, r=BurntSushi
Stabilize method `String::retain`

Closes #43874
-rw-r--r--src/doc/unstable-book/src/library-features/string-retain.md23
-rw-r--r--src/liballoc/string.rs4
2 files changed, 1 insertions, 26 deletions
diff --git a/src/doc/unstable-book/src/library-features/string-retain.md b/src/doc/unstable-book/src/library-features/string-retain.md
deleted file mode 100644
index 049444aa49b..00000000000
--- a/src/doc/unstable-book/src/library-features/string-retain.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# `string_retain`
-
-The tracking issue for this feature is: [#43874]
-
-[#43874]: https://github.com/rust-lang/rust/issues/43874
-
-------------------------
-
-Retains only the characters specified by the predicate.
-
-In other words, remove all characters `c` such that `f(c)` returns `false`.
-This method operates in place and preserves the order of the retained
-characters.
-
-```rust
-#![feature(string_retain)]
-
-let mut s = String::from("f_o_ob_ar");
-
-s.retain(|c| c != '_');
-
-assert_eq!(s, "foobar");
-```
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index e253122ffd6..599d66e8391 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -1177,8 +1177,6 @@ impl String {
     /// # Examples
     ///
     /// ```
-    /// #![feature(string_retain)]
-    ///
     /// let mut s = String::from("f_o_ob_ar");
     ///
     /// s.retain(|c| c != '_');
@@ -1186,7 +1184,7 @@ impl String {
     /// assert_eq!(s, "foobar");
     /// ```
     #[inline]
-    #[unstable(feature = "string_retain", issue = "43874")]
+    #[stable(feature = "string_retain", since = "1.26.0")]
     pub fn retain<F>(&mut self, mut f: F)
         where F: FnMut(char) -> bool
     {