diff options
| author | bors <bors@rust-lang.org> | 2021-05-12 13:33:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-12 13:33:32 +0000 |
| commit | 28e2b29b8952485679367cc05699fb5154f4e5c3 (patch) | |
| tree | 54280248509a198ecaa895cea214166b7a5cb6eb /library/std/src | |
| parent | e1ff91f439bc09f566da211c6449821b4e949279 (diff) | |
| parent | 564b4de626d9fa68ce10a0e792c1d329d3225d08 (diff) | |
| download | rust-28e2b29b8952485679367cc05699fb5154f4e5c3.tar.gz rust-28e2b29b8952485679367cc05699fb5154f4e5c3.zip | |
Auto merge of #84730 - sexxi-goose:rox-auto-trait, r=nikomatsakis
Add auto traits and clone trait migrations for RFC2229 This PR - renames the existent RFC2229 migration `disjoint_capture_drop_reorder` to `disjoint_capture_migration` - add additional migrations for auto traits and clone trait Closes rust-lang/project-rfc-2229#29 Closes rust-lang/project-rfc-2229#28 r? `@nikomatsakis`
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/panic.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs index 3e634239ad3..7114552745a 100644 --- a/library/std/src/panic.rs +++ b/library/std/src/panic.rs @@ -132,6 +132,7 @@ pub fn panic_any<M: 'static + Any + Send>(msg: M) -> ! { /// [`AssertUnwindSafe`] wrapper struct can be used to force this trait to be /// implemented for any closed over variables passed to `catch_unwind`. #[stable(feature = "catch_unwind", since = "1.9.0")] +#[cfg_attr(all(not(bootstrap), not(test)), lang = "unwind_safe")] #[rustc_on_unimplemented( message = "the type `{Self}` may not be safely transferred across an unwind boundary", label = "`{Self}` may not be safely transferred across an unwind boundary" @@ -147,6 +148,7 @@ pub auto trait UnwindSafe {} /// This is a "helper marker trait" used to provide impl blocks for the /// [`UnwindSafe`] trait, for more information see that documentation. #[stable(feature = "catch_unwind", since = "1.9.0")] +#[cfg_attr(all(not(bootstrap), not(test)), lang = "ref_unwind_safe")] #[rustc_on_unimplemented( message = "the type `{Self}` may contain interior mutability and a reference may not be safely \ transferrable across a catch_unwind boundary", |