about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-08-05 16:40:04 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-08-07 08:54:38 -0700
commit1f760d5d1a448c08ff4b66cfa8d35d39a5d667c0 (patch)
tree9befa0d5628cafad50e44dbc28e494dbf3b45487 /src/libsyntax/ext
parentb09a02b41588b2348fcce89c37c4a2cdc614d350 (diff)
downloadrust-1f760d5d1a448c08ff4b66cfa8d35d39a5d667c0.tar.gz
rust-1f760d5d1a448c08ff4b66cfa8d35d39a5d667c0.zip
Rename `Share` to `Sync`
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/ext')
-rw-r--r--src/libsyntax/ext/deriving/bounds.rs2
-rw-r--r--src/libsyntax/ext/deriving/mod.rs2
2 files changed, 2 insertions, 2 deletions
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 => {