mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-17 05:25:37 +03:00
Result's panics have #[track_caller].
This commit is contained in:
@@ -957,6 +957,7 @@ impl<T, E: fmt::Debug> Result<T, E> {
|
||||
/// x.unwrap(); // panics with `emergency failure`
|
||||
/// ```
|
||||
#[inline]
|
||||
#[track_caller]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
pub fn unwrap(self) -> T {
|
||||
match self {
|
||||
@@ -984,6 +985,7 @@ pub fn unwrap(self) -> T {
|
||||
/// x.expect("Testing expect"); // panics with `Testing expect: emergency failure`
|
||||
/// ```
|
||||
#[inline]
|
||||
#[track_caller]
|
||||
#[stable(feature = "result_expect", since = "1.4.0")]
|
||||
pub fn expect(self, msg: &str) -> T {
|
||||
match self {
|
||||
@@ -1017,6 +1019,7 @@ impl<T: fmt::Debug, E> Result<T, E> {
|
||||
/// assert_eq!(x.unwrap_err(), "emergency failure");
|
||||
/// ```
|
||||
#[inline]
|
||||
#[track_caller]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
pub fn unwrap_err(self) -> E {
|
||||
match self {
|
||||
@@ -1044,6 +1047,7 @@ pub fn unwrap_err(self) -> E {
|
||||
/// x.expect_err("Testing expect_err"); // panics with `Testing expect_err: 10`
|
||||
/// ```
|
||||
#[inline]
|
||||
#[track_caller]
|
||||
#[stable(feature = "result_expect_err", since = "1.17.0")]
|
||||
pub fn expect_err(self, msg: &str) -> E {
|
||||
match self {
|
||||
@@ -1188,6 +1192,7 @@ pub fn transpose(self) -> Option<Result<T, E>> {
|
||||
// This is a separate function to reduce the code size of the methods
|
||||
#[inline(never)]
|
||||
#[cold]
|
||||
#[track_caller]
|
||||
fn unwrap_failed(msg: &str, error: &dyn fmt::Debug) -> ! {
|
||||
panic!("{}: {:?}", msg, error)
|
||||
}
|
||||
|
||||
@@ -26,4 +26,12 @@ fn assert_panicked(f: impl FnOnce() + std::panic::UnwindSafe) {
|
||||
let yep: Option<()> = Some(());
|
||||
assert_panicked(|| yep.unwrap_none());
|
||||
assert_panicked(|| yep.expect_none(""));
|
||||
|
||||
let oops: Result<(), ()> = Err(());
|
||||
assert_panicked(|| oops.unwrap());
|
||||
assert_panicked(|| oops.expect(""));
|
||||
|
||||
let fine: Result<(), ()> = Ok(());
|
||||
assert_panicked(|| fine.unwrap_err());
|
||||
assert_panicked(|| fine.expect_err(""));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user