Skip to content

Commit ed06fb6

Browse files
committed
Auto merge of rust-lang#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`
2 parents 29c0404 + 43637bb commit ed06fb6

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

core/src/marker.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ use crate::hash::Hasher;
3131
/// [ub]: ../../reference/behavior-considered-undefined.html
3232
#[stable(feature = "rust1", since = "1.0.0")]
3333
#[cfg_attr(not(test), rustc_diagnostic_item = "send_trait")]
34+
#[cfg_attr(not(bootstrap), lang = "send")]
3435
#[rustc_on_unimplemented(
3536
message = "`{Self}` cannot be sent between threads safely",
3637
label = "`{Self}` cannot be sent between threads safely"

std/src/panic.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ pub fn panic_any<M: 'static + Any + Send>(msg: M) -> ! {
132132
/// [`AssertUnwindSafe`] wrapper struct can be used to force this trait to be
133133
/// implemented for any closed over variables passed to `catch_unwind`.
134134
#[stable(feature = "catch_unwind", since = "1.9.0")]
135+
#[cfg_attr(all(not(bootstrap), not(test)), lang = "unwind_safe")]
135136
#[rustc_on_unimplemented(
136137
message = "the type `{Self}` may not be safely transferred across an unwind boundary",
137138
label = "`{Self}` may not be safely transferred across an unwind boundary"
@@ -147,6 +148,7 @@ pub auto trait UnwindSafe {}
147148
/// This is a "helper marker trait" used to provide impl blocks for the
148149
/// [`UnwindSafe`] trait, for more information see that documentation.
149150
#[stable(feature = "catch_unwind", since = "1.9.0")]
151+
#[cfg_attr(all(not(bootstrap), not(test)), lang = "ref_unwind_safe")]
150152
#[rustc_on_unimplemented(
151153
message = "the type `{Self}` may contain interior mutability and a reference may not be safely \
152154
transferrable across a catch_unwind boundary",

0 commit comments

Comments
 (0)