Skip to content

Commit b35aeae

Browse files
authored
Rollup merge of rust-lang#60376 - lzutao:stabilize-option_xor, r=SimonSapin
Stabilize Option::xor FCP done in rust-lang#50512 (comment) . Closes rust-lang#50512 .
2 parents 2887008 + 1fa50b3 commit b35aeae

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/libcore/option.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,8 +725,6 @@ impl<T> Option<T> {
725725
/// # Examples
726726
///
727727
/// ```
728-
/// #![feature(option_xor)]
729-
///
730728
/// let x = Some(2);
731729
/// let y: Option<u32> = None;
732730
/// assert_eq!(x.xor(y), Some(2));
@@ -744,7 +742,7 @@ impl<T> Option<T> {
744742
/// assert_eq!(x.xor(y), None);
745743
/// ```
746744
#[inline]
747-
#[unstable(feature = "option_xor", issue = "50512")]
745+
#[stable(feature = "option_xor", since = "1.37.0")]
748746
pub fn xor(self, optb: Option<T>) -> Option<T> {
749747
match (self, optb) {
750748
(Some(a), None) => Some(a),

0 commit comments

Comments
 (0)