bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

libstd => 2018

Browse source
This commit is contained in:
Taiki Endo 2019-02-11 04:23:21 +09:00
parent 7e001e5c6c
commit 93b6d9e086
284 changed files with 1989 additions and 2024 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libstd/panic.rs
View file

@ -2,21 +2,21 @@
#![stable(feature = "std_panic", since = "1.9.0")]
use any::Any;
use cell::UnsafeCell;
use fmt;
use future::Future;
use pin::Pin;
use ops::{Deref, DerefMut};
use panicking;
use ptr::{Unique, NonNull};
use rc::Rc;
use sync::{Arc, Mutex, RwLock, atomic};
use task::{Waker, Poll};
use thread::Result;
use crate::any::Any;
use crate::cell::UnsafeCell;
use crate::fmt;
use crate::future::Future;
use crate::pin::Pin;
use crate::ops::{Deref, DerefMut};
use crate::panicking;
use crate::ptr::{Unique, NonNull};
use crate::rc::Rc;
use crate::sync::{Arc, Mutex, RwLock, atomic};
use crate::task::{Waker, Poll};
use crate::thread::Result;
#[stable(feature = "panic_hooks", since = "1.10.0")]
pub use panicking::{take_hook, set_hook};
pub use crate::panicking::{take_hook, set_hook};
#[stable(feature = "panic_hooks", since = "1.10.0")]
pub use core::panic::{PanicInfo, Location};
@ -385,7 +385,7 @@ impl<F: Future> Future for AssertUnwindSafe<F> {
#[stable(feature = "catch_unwind", since = "1.9.0")]
pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
unsafe {
panicking::try(f)
panicking::r#try(f)
}
}