squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rename Result::unwrap_infallible to into_ok

Browse source
This commit is contained in:
Mikhail Zabaluev 2019-11-04 14:05:15 +02:00
parent 9a99a2159b
commit 6f0672c08b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libcore/result.rs
View file

@ -1109,11 +1109,11 @@ impl<T, E: Into<!>> Result<T, E> {
/// Ok("this is fine".into())
/// }
///
/// let s: String = only_good_news().unwrap_infallible();
/// let s: String = only_good_news().into_ok();
/// println!("{}", s);
/// ```
#[inline]
pub fn unwrap_infallible(self) -> T {
pub fn into_ok(self) -> T {
match self {
Ok(x) => x,
Err(e) => e.into(),

6
src/libcore/tests/result.rs
View file

@ -198,12 +198,12 @@ pub fn test_unwrap_or_default() {
}
#[test]
pub fn test_unwrap_infallible() {
pub fn test_into_ok() {
fn infallible_op() -> Result<isize, !> {
Ok(666)
}
assert_eq!(infallible_op().unwrap_infallible(), 666);
assert_eq!(infallible_op().into_ok(), 666);
enum MyNeverToken {}
impl From<MyNeverToken> for ! {
@ -216,7 +216,7 @@ pub fn test_unwrap_infallible() {
Ok(667)
}
assert_eq!(infallible_op2().unwrap_infallible(), 667);
assert_eq!(infallible_op2().into_ok(), 667);
}
#[test]