bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename Result::ok_or_err to Result::into_ok_or_err

Browse source
This commit is contained in:
Thom Chiovoloni 2021-02-17 08:54:52 -08:00
parent 7d303661cd
commit 2711b011e6
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
library/core/src/result.rs
View file

@ -1294,16 +1294,16 @@ impl<T> Result<T, T> {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(ok_or_err)] /// #![feature(result_into_ok_or_err)]
/// let ok: Result<u32, u32> = Ok(3); /// let ok: Result<u32, u32> = Ok(3);
/// let err: Result<u32, u32> = Err(4); /// let err: Result<u32, u32> = Err(4);
/// ///
/// assert_eq!(ok.ok_or_err(), 3); /// assert_eq!(ok.into_ok_or_err(), 3);
/// assert_eq!(err.ok_or_err(), 4); /// assert_eq!(err.into_ok_or_err(), 4);
/// ``` /// ```
#[inline] #[inline]
#[unstable(feature = "ok_or_err", reason = "newly added", issue = "none")] #[unstable(feature = "result_into_ok_or_err", reason = "newly added", issue = "none")]
pub const fn ok_or_err(self) -> T { pub const fn into_ok_or_err(self) -> T {
match self { match self {
Ok(v) => v, Ok(v) => v,
Err(v) => v, Err(v) => v,

2
library/core/tests/lib.rs
View file

@ -65,7 +65,7 @@
#![feature(never_type)] #![feature(never_type)]
#![feature(unwrap_infallible)] #![feature(unwrap_infallible)]
#![feature(option_result_unwrap_unchecked)] #![feature(option_result_unwrap_unchecked)]
#![feature(ok_or_err)] #![feature(result_into_ok_or_err)]
#![feature(option_unwrap_none)] #![feature(option_unwrap_none)]
#![feature(peekable_peek_mut)] #![feature(peekable_peek_mut)]
#![feature(once_cell)] #![feature(once_cell)]

4
library/core/tests/result.rs
View file

@ -100,8 +100,8 @@ fn test_ok_or_err() {
let ok: Result<isize, isize> = Ok(100); let ok: Result<isize, isize> = Ok(100);
let err: Result<isize, isize> = Err(200); let err: Result<isize, isize> = Err(200);
assert_eq!(ok.ok_or_err(), 100); assert_eq!(ok.into_ok_or_err(), 100);
assert_eq!(err.ok_or_err(), 200); assert_eq!(err.into_ok_or_err(), 200);
} }
#[test] #[test]