user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #119954 - scottmcm:option-unwrap-failed, r=WaffleLapkin

Browse source 
Split out `option::unwrap_failed` like we have `result::unwrap_failed`

...and like `option::expect_failed`
This commit is contained in:
bors 2024-01-16 15:32:39 +00:00
commit bf2637f4e8
8 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
library/core/src/option.rs
View file

@ -921,14 +921,14 @@ impl<T> Option<T> {
/// let x: Option<&str> = None;
/// assert_eq!(x.unwrap(), "air"); // fails
/// ```
#[inline]
#[inline(always)]
#[track_caller]
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_option", issue = "67441")]
pub const fn unwrap(self) -> T {
match self {
Some(val) => val,
None => panic("called `Option::unwrap()` on a `None` value"),
None => unwrap_failed(),
}
}
@ -1970,6 +1970,14 @@ impl<T, E> Option<Result<T, E>> {
}
}
#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
#[cfg_attr(feature = "panic_immediate_abort", inline)]
#[cold]
#[track_caller]
const fn unwrap_failed() -> ! {
panic("called `Option::unwrap()` on a `None` value")
}
// This is a separate function to reduce the code size of .expect() itself.
#[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
#[cfg_attr(feature = "panic_immediate_abort", inline)]