diff --git a/src/doc/rust.md b/src/doc/rust.md index 69bef817eed..3fd48d45324 100644 --- 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 9d64a25149f..0a1334e5d13 100644 --- 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 223e518fecd..2602ec4920e 100644 --- a/src/librustc/middle/lang_items.rs +++ b/src/librustc/middle/lang_items.rs @@ -296,7 +296,7 @@ lets_do_this! { 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 72f6338f4c9..7f2f1151e30 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -2575,7 +2575,7 @@ pub fn type_contents(cx: &ctxt, ty: t) -> TypeContents { 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