Skip to content

Commit f2421fa

Browse files
committed
auto merge of #16997 : gamazeps/rust/master, r=huonw
Changed the names according to the issue #16988
2 parents 82c0527 + d0f1c7d commit f2421fa

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/doc/rust.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2221,8 +2221,8 @@ These types help drive the compiler's analysis
22212221
: This type does not implement "copy", even if eligible
22222222
* `no_send_bound`
22232223
: This type does not implement "send", even if eligible
2224-
* `no_share_bound`
2225-
: This type does not implement "share", even if eligible
2224+
* `no_sync_bound`
2225+
: This type does not implement "sync", even if eligible
22262226
* `eh_personality`
22272227
: ___Needs filling in___
22282228
* `exchange_free`

src/libcore/kinds.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ pub mod marker {
271271
/// A type which is considered "not sync", meaning that
272272
/// its contents are not threadsafe, hence they cannot be
273273
/// shared between tasks.
274-
#[lang="no_share_bound"]
274+
#[lang="no_sync_bound"]
275275
#[deriving(PartialEq,Clone)]
276276
pub struct NoSync;
277277

src/librustc/middle/lang_items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ lets_do_this! {
296296

297297
NoSendItem, "no_send_bound", no_send_bound;
298298
NoCopyItem, "no_copy_bound", no_copy_bound;
299-
NoSyncItem, "no_share_bound", no_share_bound;
299+
NoSyncItem, "no_sync_bound", no_sync_bound;
300300
ManagedItem, "managed_bound", managed_bound;
301301

302302
IteratorItem, "iterator", iterator;

src/librustc/middle/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2575,7 +2575,7 @@ pub fn type_contents(cx: &ctxt, ty: t) -> TypeContents {
25752575
tc | TC::Managed
25762576
} else if Some(did) == cx.lang_items.no_copy_bound() {
25772577
tc | TC::OwnsAffine
2578-
} else if Some(did) == cx.lang_items.no_share_bound() {
2578+
} else if Some(did) == cx.lang_items.no_sync_bound() {
25792579
tc | TC::ReachesNoSync
25802580
} else if Some(did) == cx.lang_items.unsafe_type() {
25812581
// FIXME(#13231): This shouldn't be needed after

0 commit comments

Comments
 (0)