Use cold functions for panic formatting Option::expect, Result::unwrap etc

Option::expect, Result::unwrap, unwrap_err, expect

These methods are marked inline, but insert a big chunk of formatting
code, as well as other error path related code, such as deallocating
a std::io::Error if you have one.

We can explicitly separate out that code path into a function that is
never inline, since the panicking case should always be rare.
This commit is contained in:
Ulrik Sverdrup 2016-01-22 17:06:34 +01:00
parent 46dcffd05b
commit 30be6a666d
2 changed files with 30 additions and 7 deletions

View File

@ -295,10 +295,16 @@ impl<T> Option<T> {
pub fn expect(self, msg: &str) -> T {
match self {
Some(val) => val,
None => panic!("{}", msg),
None => Self::expect_failed(msg),
}
}
#[inline(never)]
#[cold]
fn expect_failed(msg: &str) -> ! {
panic!("{}", msg)
}
/// Moves the value `v` out of the `Option<T>` if it is `Some(v)`.
///
/// # Panics

View File

@ -684,11 +684,16 @@ impl<T, E: fmt::Debug> Result<T, E> {
pub fn unwrap(self) -> T {
match self {
Ok(t) => t,
Err(e) =>
panic!("called `Result::unwrap()` on an `Err` value: {:?}", e)
Err(e) => Self::unwrap_failed(e),
}
}
#[inline(never)]
#[cold]
fn unwrap_failed(error: E) -> ! {
panic!("called `Result::unwrap()` on an `Err` value: {:?}", error)
}
/// Unwraps a result, yielding the content of an `Ok`.
///
/// # Panics
@ -706,9 +711,15 @@ impl<T, E: fmt::Debug> Result<T, E> {
pub fn expect(self, msg: &str) -> T {
match self {
Ok(t) => t,
Err(e) => panic!("{}: {:?}", msg, e),
Err(e) => Self::expect_failed(msg, e),
}
}
#[inline(never)]
#[cold]
fn expect_failed(msg: &str, error: E) -> ! {
panic!("{}: {:?}", msg, error)
}
}
impl<T: fmt::Debug, E> Result<T, E> {
@ -734,11 +745,17 @@ impl<T: fmt::Debug, E> Result<T, E> {
#[stable(feature = "rust1", since = "1.0.0")]
pub fn unwrap_err(self) -> E {
match self {
Ok(t) =>
panic!("called `Result::unwrap_err()` on an `Ok` value: {:?}", t),
Err(e) => e
Ok(t) => Self::unwrap_err_failed(t),
Err(e) => e,
}
}
#[inline(never)]
#[cold]
fn unwrap_err_failed(t: T) -> ! {
panic!("called `Result::unwrap_err()` on an `Ok` value: {:?}", t)
}
}
/////////////////////////////////////////////////////////////////////////////