about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorLzu Tao <taolzu@gmail.com>2019-11-20 09:42:02 +0000
committerLzu Tao <taolzu@gmail.com>2019-12-02 06:25:12 +0000
commit8cae411ae3f8fb2cc2c14218a6f5a87462016e95 (patch)
tree223d3bdc493d6d1cfe73b4413c44ed235171bf0d /src
parentf5c81e0a986e4285d3d0fd781a1bd475753eb12c (diff)
downloadrust-8cae411ae3f8fb2cc2c14218a6f5a87462016e95.tar.gz
rust-8cae411ae3f8fb2cc2c14218a6f5a87462016e95.zip
stabilize Result::map_or
Diffstat (limited to 'src')
-rw-r--r--src/libcore/result.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libcore/result.rs b/src/libcore/result.rs
index 1a0845f3a6d..fb4dc62d8c1 100644
--- a/src/libcore/result.rs
+++ b/src/libcore/result.rs
@@ -520,7 +520,6 @@ impl<T, E> Result<T, E> {
     /// # Examples
     ///
     /// ```
-    /// #![feature(result_map_or)]
     /// let x: Result<_, &str> = Ok("foo");
     /// assert_eq!(x.map_or(42, |v| v.len()), 3);
     ///
@@ -528,7 +527,7 @@ impl<T, E> Result<T, E> {
     /// assert_eq!(x.map_or(42, |v| v.len()), 42);
     /// ```
     #[inline]
-    #[unstable(feature = "result_map_or", issue = "66293")]
+    #[stable(feature = "result_map_or", since = "1.41.0")]
     pub fn map_or<U, F: FnOnce(T) -> U>(self, default: U, f: F) -> U {
         match self {
             Ok(t) => f(t),