user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove lang items Send, UnwindSafe and RefUnwindSafe

Browse source
This commit is contained in:
Roxane Fruytier 2021-06-29 14:15:58 -04:00 • committed by Roxane
parent 6e0b554619
commit 3e569dd2df
5 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
library/core/src/marker.rs
View file

@ -31,7 +31,10 @@ use crate::hash::Hasher;
/// [ub]: ../../reference/behavior-considered-undefined.html
#[stable(feature = "rust1", since = "1.0.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "send_trait")]
<<<<<<< HEAD
#[lang = "send"]
=======
>>>>>>> Remove lang items Send, UnwindSafe and RefUnwindSafe
#[rustc_on_unimplemented(
message = "`{Self}` cannot be sent between threads safely",
label = "`{Self}` cannot be sent between threads safely"