diff options
| author | bors <bors@rust-lang.org> | 2014-08-08 03:51:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-08 03:51:15 +0000 |
| commit | aae7901a78d5804306f7b20b01622d2a423db37c (patch) | |
| tree | 5441f8447f858c9cb63ae8d65b33c5c7be8e07a7 /src/libstd | |
| parent | 87d2bf400ce1bc2cec832f9d5b8e763f06bb7f43 (diff) | |
| parent | 1f760d5d1a448c08ff4b66cfa8d35d39a5d667c0 (diff) | |
| download | rust-aae7901a78d5804306f7b20b01622d2a423db37c.tar.gz rust-aae7901a78d5804306f7b20b01622d2a423db37c.zip | |
auto merge of #16285 : alexcrichton/rust/rename-share, r=huonw
This leaves the `Share` trait at `std::kinds` via a `#[deprecated]` `pub use` statement, but the `NoShare` struct is no longer part of `std::kinds::marker` due to #12660 (the build cannot bootstrap otherwise). All code referencing the `Share` trait should now reference the `Sync` trait, and all code referencing the `NoShare` type should now reference the `NoSync` type. The functionality and meaning of this trait have not changed, only the naming. Closes #16281 [breaking-change]
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/prelude.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 96d5c0785f4..aa407ce8e0c 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -40,7 +40,7 @@ #![experimental] // Reexported core operators -#[doc(no_inline)] pub use kinds::{Copy, Send, Sized, Share}; +#[doc(no_inline)] pub use kinds::{Copy, Send, Sized, Sync}; #[doc(no_inline)] pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not}; #[doc(no_inline)] pub use ops::{BitAnd, BitOr, BitXor}; #[doc(no_inline)] pub use ops::{Drop, Deref, DerefMut}; |