Update language item from 'share' to 'sync' #16988

diff --git a/src/doc/rust.md b/src/doc/rust.md
index 69bef817eedb187966110fad8e516ac1abdab7c7..3fd48d4532499a7fd647f282834a0c1bab1d29cf 100644 (file)
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -2221,8 +2221,8 @@ These types help drive the compiler's analysis
   : This type does not implement "copy", even if eligible
 * `no_send_bound`
   : This type does not implement "send", even if eligible
-* `no_share_bound`
-  : This type does not implement "share", even if eligible
+* `no_sync_bound`
+  : This type does not implement "sync", even if eligible
 * `eh_personality`
   : ___Needs filling in___
 * `exchange_free`

diff --git a/src/libcore/kinds.rs b/src/libcore/kinds.rs
index 9d64a25149fcfd7bbd5df898ea0f1191459fba4a..0a1334e5d1305003c2965e599a3c1604dcb59af9 100644 (file)
--- a/src/libcore/kinds.rs
+++ b/src/libcore/kinds.rs
@@ -271,7 +271,7 @@ pub mod marker {
     /// A type which is considered "not sync", meaning that
     /// its contents are not threadsafe, hence they cannot be
     /// shared between tasks.
-    #[lang="no_share_bound"]
+    #[lang="no_sync_bound"]
     #[deriving(PartialEq,Clone)]
     pub struct NoSync;
 

diff --git a/src/librustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs
index 223e518fecdf7882ac8b7cbacc72dc2e2af58c7d..2602ec4920e33714df2c6cdc329a132da24b33bb 100644 (file)
--- a/src/librustc/middle/lang_items.rs
+++ b/src/librustc/middle/lang_items.rs
@@ -296,7 +296,7 @@ pub fn collect_language_items(krate: &ast::Crate,
 
     NoSendItem,                      "no_send_bound",           no_send_bound;
     NoCopyItem,                      "no_copy_bound",           no_copy_bound;
-    NoSyncItem,                     "no_share_bound",          no_share_bound;
+    NoSyncItem,                      "no_sync_bound",           no_sync_bound;
     ManagedItem,                     "managed_bound",           managed_bound;
 
     IteratorItem,                    "iterator",                iterator;

diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index 72f6338f4c9c737e10b7fc12ae76d308f3fc8299..7f2f1151e30ca4e5dc6607ad65dfe2bf2ccea8a1 100644 (file)
--- a/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@ -2575,7 +2575,7 @@ fn apply_lang_items(cx: &ctxt,
             tc | TC::Managed
         } else if Some(did) == cx.lang_items.no_copy_bound() {
             tc | TC::OwnsAffine
-        } else if Some(did) == cx.lang_items.no_share_bound() {
+        } else if Some(did) == cx.lang_items.no_sync_bound() {
             tc | TC::ReachesNoSync
         } else if Some(did) == cx.lang_items.unsafe_type() {
             // FIXME(#13231): This shouldn't be needed after