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/libsyntax | |
| 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/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/bounds.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index fc000d2357e..629b21875c9 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -214,7 +214,7 @@ pub static DUMMY_NODE_ID: NodeId = -1; /// The AST represents all type param bounds as types. /// typeck::collect::compute_bounds matches these against /// the "special" built-in traits (see middle::lang_items) and -/// detects Copy, Send and Share. +/// detects Copy, Send and Sync. #[deriving(Clone, PartialEq, Eq, Encodable, Decodable, Hash, Show)] pub enum TyParamBound { TraitTyParamBound(TraitRef), diff --git a/src/libsyntax/ext/deriving/bounds.rs b/src/libsyntax/ext/deriving/bounds.rs index fac9f37c462..7cff6e8ff3c 100644 --- a/src/libsyntax/ext/deriving/bounds.rs +++ b/src/libsyntax/ext/deriving/bounds.rs @@ -27,7 +27,7 @@ pub fn expand_deriving_bound(cx: &mut ExtCtxt, match tname.get() { "Copy" => "Copy", "Send" => "Send", - "Share" => "Share", + "Sync" => "Sync", ref tname => { cx.span_bug(span, format!("expected built-in trait name but \ diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs index edfe54db0c7..a9b5c8a4134 100644 --- a/src/libsyntax/ext/deriving/mod.rs +++ b/src/libsyntax/ext/deriving/mod.rs @@ -94,7 +94,7 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt, "FromPrimitive" => expand!(primitive::expand_deriving_from_primitive), "Send" => expand!(bounds::expand_deriving_bound), - "Share" => expand!(bounds::expand_deriving_bound), + "Sync" => expand!(bounds::expand_deriving_bound), "Copy" => expand!(bounds::expand_deriving_bound), ref tname => { |