diff options
| author | bors <bors@rust-lang.org> | 2013-06-28 22:25:48 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-28 22:25:48 -0700 |
| commit | 4e78c1e2a89f65a1827e1f65afc741cee05cee0a (patch) | |
| tree | d56131a1a347b4cc8c3e79dfda3b9a47221bcaa4 /src/test/compile-fail | |
| parent | d681bccb6a2141012a747cc272991a7440cb2408 (diff) | |
| parent | 21cc0ccea10bb9d1b83612d26c8e62d06fe365a1 (diff) | |
| download | rust-4e78c1e2a89f65a1827e1f65afc741cee05cee0a.tar.gz rust-4e78c1e2a89f65a1827e1f65afc741cee05cee0a.zip | |
auto merge of #7479 : mozilla/rust/rollup, r=thestinger
22b7eb3 r=thestinger 28a3613 r=cmr a0c31ec r=bstrie ee7307e r=thestinger b9cf6a3 r=thestinger
Diffstat (limited to 'src/test/compile-fail')
| -rw-r--r-- | src/test/compile-fail/mutable-enum.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/mutable-struct.rs | 2 | ||||
| -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, 4 insertions, 4 deletions
diff --git a/src/test/compile-fail/mutable-enum.rs b/src/test/compile-fail/mutable-enum.rs index db2172b2e57..35842a53a31 100644 --- a/src/test/compile-fail/mutable-enum.rs +++ b/src/test/compile-fail/mutable-enum.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[mutable] +#[no_freeze] enum Foo { A } fn bar<T: Freeze>(_: T) {} diff --git a/src/test/compile-fail/mutable-struct.rs b/src/test/compile-fail/mutable-struct.rs index 8511bcdcd35..6f29fcfd96d 100644 --- a/src/test/compile-fail/mutable-struct.rs +++ b/src/test/compile-fail/mutable-struct.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[mutable] +#[no_freeze] struct Foo { a: int } fn bar<T: Freeze>(_: T) {} 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) {} |