about summary refs log tree commit diff
path: root/library/std/src/panic.rs
diff options
context:
space:
mode:
authorRoxane <roxane.fruytier@hotmail.com>2021-04-08 19:09:08 -0400
committerRoxane <roxane.fruytier@hotmail.com>2021-05-06 14:17:59 -0400
commit9afea614bfbbc3dfb0b87861bdbf1e69a78db897 (patch)
tree12da27dba5739a0185c2b642bf17a6d6a1223956 /library/std/src/panic.rs
parent109248a4eb99bc83684c94ca4ef36f2fadc17e2a (diff)
downloadrust-9afea614bfbbc3dfb0b87861bdbf1e69a78db897.tar.gz
rust-9afea614bfbbc3dfb0b87861bdbf1e69a78db897.zip
Add additional migrations to handle auto-traits and clone traits
Combine all 2229 migrations under one flag name
Diffstat (limited to 'library/std/src/panic.rs')
-rw-r--r--library/std/src/panic.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs
index 3e634239ad3..0442f70aa65 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(not(bootstrap), 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(not(bootstrap), 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",