diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-13 01:49:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 01:49:24 +0200 |
| commit | b35aeae5b443e9c3b2ae66eb40c6e31be36d2dcd (patch) | |
| tree | 2cb96657a49e455822d68e71fcbcea4f518ad72f /src/libcore | |
| parent | 2887008e0ce0824be4e0e9562c22ea397b165c97 (diff) | |
| parent | 1fa50b3ab809ec63b8b44a9f8a3a78b6d5ba41e3 (diff) | |
| download | rust-b35aeae5b443e9c3b2ae66eb40c6e31be36d2dcd.tar.gz rust-b35aeae5b443e9c3b2ae66eb40c6e31be36d2dcd.zip | |
Rollup merge of #60376 - lzutao:stabilize-option_xor, r=SimonSapin
Stabilize Option::xor FCP done in https://github.com/rust-lang/rust/issues/50512#issuecomment-469527554 . Closes #50512 .
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/option.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index c75ecb059e8..eec4b149ddc 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), |