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