OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #16997 : gamazeps/rust/master, r=huonw

Browse Source 
Changed the names according to the issue #16988
This commit is contained in:
bors 2014-09-06 10:31:29 +00:00
commit a356e98803
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/doc/rust.md
View File

@ -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`

2
src/libcore/kinds.rs
View File

@ -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;

2
src/librustc/middle/lang_items.rs
View File

@ -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;

2
src/librustc/middle/ty.rs
View File

@ -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