diff options
| author | Ralf Jung <post@ralfj.de> | 2020-09-28 18:39:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-28 18:39:39 +0200 |
| commit | 734c57d45c3b3d6ff19bc7d04ce00f7c9441c368 (patch) | |
| tree | c0ea98d03164b650b078e8f50653e99fbbc2ad12 /library/std/src | |
| parent | 535d27ac9a3d45dd92769f4d4c7b9f454d1077ea (diff) | |
| parent | a61b9638bbbb48f9c2fde0ccbbcf03e64494ea0f (diff) | |
| download | rust-734c57d45c3b3d6ff19bc7d04ce00f7c9441c368.tar.gz rust-734c57d45c3b3d6ff19bc7d04ce00f7c9441c368.zip | |
Rollup merge of #76454 - poliorcetics:ui-to-unit-test-1, r=matklad
UI to unit test for those using Cell/RefCell/UnsafeCell Helps with #76268. I'm working on all files using `Cell` and moving them to unit tests when possible. r? @matklad
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/panic.rs | 3 | ||||
| -rw-r--r-- | library/std/src/panic/tests.rs | 56 |
2 files changed, 59 insertions, 0 deletions
diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs index 18d9c2f11b5..4281867314c 100644 --- a/library/std/src/panic.rs +++ b/library/std/src/panic.rs @@ -411,3 +411,6 @@ pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> { pub fn resume_unwind(payload: Box<dyn Any + Send>) -> ! { panicking::rust_panic_without_hook(payload) } + +#[cfg(test)] +mod tests; diff --git a/library/std/src/panic/tests.rs b/library/std/src/panic/tests.rs new file mode 100644 index 00000000000..b37d74011cc --- /dev/null +++ b/library/std/src/panic/tests.rs @@ -0,0 +1,56 @@ +#![allow(dead_code)] + +use crate::cell::RefCell; +use crate::panic::{AssertUnwindSafe, UnwindSafe}; +use crate::rc::Rc; +use crate::sync::{Arc, Mutex, RwLock}; + +struct Foo { + a: i32, +} + +fn assert<T: UnwindSafe + ?Sized>() {} + +#[test] +fn panic_safety_traits() { + assert::<i32>(); + assert::<&i32>(); + assert::<*mut i32>(); + assert::<*const i32>(); + assert::<usize>(); + assert::<str>(); + assert::<&str>(); + assert::<Foo>(); + assert::<&Foo>(); + assert::<Vec<i32>>(); + assert::<String>(); + assert::<RefCell<i32>>(); + assert::<Box<i32>>(); + assert::<Mutex<i32>>(); + assert::<RwLock<i32>>(); + assert::<&Mutex<i32>>(); + assert::<&RwLock<i32>>(); + assert::<Rc<i32>>(); + assert::<Arc<i32>>(); + assert::<Box<[u8]>>(); + + { + trait Trait: UnwindSafe {} + assert::<Box<dyn Trait>>(); + } + + fn bar<T>() { + assert::<Mutex<T>>(); + assert::<RwLock<T>>(); + } + + fn baz<T: UnwindSafe>() { + assert::<Box<T>>(); + assert::<Vec<T>>(); + assert::<RefCell<T>>(); + assert::<AssertUnwindSafe<T>>(); + assert::<&AssertUnwindSafe<T>>(); + assert::<Rc<AssertUnwindSafe<T>>>(); + assert::<Arc<AssertUnwindSafe<T>>>(); + } +} |
