diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-06-28 14:33:58 -0700 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-06-29 00:56:36 -0400 |
| commit | 4af7ebcd8f72356880abccc411a1632e8f07e1c1 (patch) | |
| tree | a8a49246a15a9f04249dc0bb0c551f9c37015368 | |
| parent | e23934645aa7eb526e9f55da6b3d7c262dc1670f (diff) | |
| download | rust-4af7ebcd8f72356880abccc411a1632e8f07e1c1.tar.gz rust-4af7ebcd8f72356880abccc411a1632e8f07e1c1.zip | |
Rename #[non_sendable] to #[no_send]
| -rw-r--r-- | src/libextra/rc.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/non_owned-enum.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/non_owned-struct.rs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/libextra/rc.rs b/src/libextra/rc.rs index 009d68ac026..31fed541bb1 100644 --- a/src/libextra/rc.rs +++ b/src/libextra/rc.rs @@ -36,7 +36,7 @@ struct RcBox<T> { /// Immutable reference counted pointer type #[unsafe_no_drop_flag] -#[non_sendable] +#[no_send] pub struct Rc<T> { priv ptr: *mut RcBox<T>, } @@ -168,7 +168,7 @@ struct RcMutBox<T> { /// Mutable reference counted pointer type #[non_owned] -#[non_sendable] +#[no_send] #[mutable] #[unsafe_no_drop_flag] pub struct RcMut<T> { diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 175529be206..03a73c847ee 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -1969,7 +1969,7 @@ static TC_ONCE_CLOSURE: TypeContents = TypeContents{bits: 0b0001_0000_0000}; /// An enum with no variants. static TC_EMPTY_ENUM: TypeContents = TypeContents{bits: 0b0010_0000_0000}; -/// Contains a type marked with `#[non_sendable]` +/// Contains a type marked with `#[no_send]` static TC_NON_SENDABLE: TypeContents = TypeContents{bits: 0b0100_0000_0000}; /// Is a bare vector, str, function, trait, etc (only relevant at top level). @@ -2207,7 +2207,7 @@ pub fn type_contents(cx: ctxt, ty: t) -> TypeContents { if has_attr(cx, did, "mutable") { tc = tc + TC_MUTABLE; } - if has_attr(cx, did, "non_sendable") { + if has_attr(cx, did, "no_send") { tc = tc + TC_NON_SENDABLE; } tc diff --git a/src/test/compile-fail/non_owned-enum.rs b/src/test/compile-fail/non_owned-enum.rs index 20b571ad614..b436bfb8b0f 100644 --- a/src/test/compile-fail/non_owned-enum.rs +++ b/src/test/compile-fail/non_owned-enum.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[non_sendable] +#[no_send] enum Foo { A } fn bar<T: Send>(_: T) {} diff --git a/src/test/compile-fail/non_owned-struct.rs b/src/test/compile-fail/non_owned-struct.rs index d4b8e6755a1..542c3aa212b 100644 --- a/src/test/compile-fail/non_owned-struct.rs +++ b/src/test/compile-fail/non_owned-struct.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[non_sendable] +#[no_send] struct Foo { a: int } fn bar<T: Send>(_: T) {} |