about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLzu Tao <taolzu@gmail.com>2019-05-27 09:07:47 +0000
committerLzu Tao <taolzu@gmail.com>2019-06-05 02:16:06 +0000
commit1fa50b3ab809ec63b8b44a9f8a3a78b6d5ba41e3 (patch)
treecd0b5d14eb6c332a70235a786665fbfd9e0d98b5
parent81eb15210a0c43820b146cd9ae6fd2062e1b2922 (diff)
downloadrust-1fa50b3ab809ec63b8b44a9f8a3a78b6d5ba41e3.tar.gz
rust-1fa50b3ab809ec63b8b44a9f8a3a78b6d5ba41e3.zip
Stabilize Option::xor
-rw-r--r--src/libcore/option.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 6b7f491effb..7f1b53a1b8b 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -725,8 +725,6 @@ impl<T> Option<T> {
     /// # Examples
     ///
     /// ```
-    /// #![feature(option_xor)]
-    ///
     /// let x = Some(2);
     /// let y: Option<u32> = None;
     /// assert_eq!(x.xor(y), Some(2));
@@ -744,7 +742,7 @@ impl<T> Option<T> {
     /// assert_eq!(x.xor(y), None);
     /// ```
     #[inline]
-    #[unstable(feature = "option_xor", issue = "50512")]
+    #[stable(feature = "option_xor", since = "1.37.0")]
     pub fn xor(self, optb: Option<T>) -> Option<T> {
         match (self, optb) {
             (Some(a), None) => Some(a),