test: replace uses of old deriving attribute with new one

diff --git a/src/test/run-fail/assert-eq-macro-fail.rs b/src/test/run-fail/assert-eq-macro-fail.rs
index a5f438903ce9b75540147e76d9f8ce3316429fb8..d3177e7c0a8a8512f7504b655e1ddac2d63e1c23 100644 (file)
--- a/src/test/run-fail/assert-eq-macro-fail.rs
+++ b/src/test/run-fail/assert-eq-macro-fail.rs
@@ -1,6 +1,6 @@
 // error-pattern:expected: 15, given: 14
 
-#[deriving_eq]
+#[deriving(Eq)]
 struct Point { x : int }
 
 fn main() {

diff --git a/src/test/run-pass/assert-eq-macro-success.rs b/src/test/run-pass/assert-eq-macro-success.rs
index c929b5c6246e9c75ed166de6146f5eafc703b7d8..b204e1aba3a71dbdd566607061a1aa65c5f62dbe 100644 (file)
--- a/src/test/run-pass/assert-eq-macro-success.rs
+++ b/src/test/run-pass/assert-eq-macro-success.rs
@@ -1,4 +1,4 @@
-#[deriving_eq]
+#[deriving(Eq)]
 struct Point { x : int }
 
 fn main() {

diff --git a/src/test/run-pass/auto-encode.rs b/src/test/run-pass/auto-encode.rs
index b6fdb07789c8da639519aac88e985092f4ccc3ea..7538892f038920e678f568470c02f0cde1f1fd8f 100644 (file)
--- a/src/test/run-pass/auto-encode.rs
+++ b/src/test/run-pass/auto-encode.rs
@@ -121,7 +121,7 @@ impl cmp::Eq for CLike {
 
 #[auto_encode]
 #[auto_decode]
-#[deriving_eq]
+#[deriving(Eq)]
 struct Spanned<T> {
     lo: uint,
     hi: uint,

diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs
index bcc76cc35858f36f5f466c75de29cf2860845035..3f5547df17d8f802d091b690abf5cc26c188dace 100644 (file)
--- a/src/test/run-pass/binops.rs
+++ b/src/test/run-pass/binops.rs
@@ -88,7 +88,7 @@ mod test {
     }
 }
 
-#[deriving_eq]
+#[deriving(Eq)]
 struct p {
   x: int,
   y: int,

diff --git a/src/test/run-pass/deriving-clone-enum.rs b/src/test/run-pass/deriving-clone-enum.rs
index bad83f41bac654ac21033612410cbf5fe56fd043..ee294cb594230abfcf5457777138a707f89f46cc 100644 (file)
--- a/src/test/run-pass/deriving-clone-enum.rs
+++ b/src/test/run-pass/deriving-clone-enum.rs
@@ -1,4 +1,4 @@
-#[deriving_clone]
+#[deriving(Clone)]
 enum E {
     A,
     B(()),

diff --git a/src/test/run-pass/deriving-clone-generic-enum.rs b/src/test/run-pass/deriving-clone-generic-enum.rs
index c70e644e2a860b877b8a45af8285a582d2dc8c8d..a868db2425cc27b26e417ddcc8e494cad696647b 100644 (file)
--- a/src/test/run-pass/deriving-clone-generic-enum.rs
+++ b/src/test/run-pass/deriving-clone-generic-enum.rs
@@ -1,4 +1,4 @@
-#[deriving_clone]
+#[deriving(Clone)]
 enum E<T,U> {
     A(T),
     B(T,U),

diff --git a/src/test/run-pass/deriving-clone-generic-struct.rs b/src/test/run-pass/deriving-clone-generic-struct.rs
index 73fb3ad8d64776e60dc3f240b9f5ed32b2f0aa6b..92721c53435731535084473a6d28d79f8c5720df 100644 (file)
--- a/src/test/run-pass/deriving-clone-generic-struct.rs
+++ b/src/test/run-pass/deriving-clone-generic-struct.rs
@@ -1,4 +1,4 @@
-#[deriving_clone]
+#[deriving(Clone)]
 struct S<T> {
     foo: (),
     bar: (),

diff --git a/src/test/run-pass/deriving-clone-generic-tuple-struct.rs b/src/test/run-pass/deriving-clone-generic-tuple-struct.rs
index d7b15d63280d0f542e694d7c769069a3f4d7cb5e..aeaa9ed726d2bb009de2e91499316aa916fd1527 100644 (file)
--- a/src/test/run-pass/deriving-clone-generic-tuple-struct.rs
+++ b/src/test/run-pass/deriving-clone-generic-tuple-struct.rs
@@ -1,4 +1,4 @@
-#[deriving_clone]
+#[deriving(Clone)]
 struct S<T>(T, ());
 
 fn main() {}

diff --git a/src/test/run-pass/deriving-clone-struct.rs b/src/test/run-pass/deriving-clone-struct.rs
index 07830e7ee096b386b7032908ae3540e11f1aba81..4dcbadbb3ef9282b3c1e07838183c6ee2fb2b426 100644 (file)
--- a/src/test/run-pass/deriving-clone-struct.rs
+++ b/src/test/run-pass/deriving-clone-struct.rs
@@ -1,4 +1,4 @@
-#[deriving_clone]
+#[deriving(Clone)]
 struct S {
     _int: int,
     _i8: i8,

diff --git a/src/test/run-pass/deriving-clone-tuple-struct.rs b/src/test/run-pass/deriving-clone-tuple-struct.rs
index a1a79613d401f436e3afb80f45f3483d9698e126..04ddb439485fd0ac3cf7c4cd6dc79e2ed1429072 100644 (file)
--- a/src/test/run-pass/deriving-clone-tuple-struct.rs
+++ b/src/test/run-pass/deriving-clone-tuple-struct.rs
@@ -1,4 +1,4 @@
-#[deriving_clone]
+#[deriving(Clone)]
 struct S((), ());
 
 fn main() {}

diff --git a/src/test/run-pass/deriving-enum-single-variant.rs b/src/test/run-pass/deriving-enum-single-variant.rs
index 7b86a6299f6f7788783a4f7f238f563268d55933..ebbdc157c7d13343ed796276add303041b3372b8 100644 (file)
--- a/src/test/run-pass/deriving-enum-single-variant.rs
+++ b/src/test/run-pass/deriving-enum-single-variant.rs
@@ -1,6 +1,6 @@
 type task_id = int;
 
-#[deriving_eq]
+#[deriving(Eq)]
 pub enum Task {
     TaskHandle(task_id)
 }

diff --git a/src/test/run-pass/deriving-via-extension-c-enum.rs b/src/test/run-pass/deriving-via-extension-c-enum.rs
index 9431e6b8343cae5d393935dbca810fc3069a2f4f..47d088cfc6f266cfa5806bc681b9c8a0b4138f9c 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-c-enum.rs
+++ b/src/test/run-pass/deriving-via-extension-c-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_eq]
+#[deriving(Eq)]
 enum Foo {
     Bar,
     Baz,

diff --git a/src/test/run-pass/deriving-via-extension-enum.rs b/src/test/run-pass/deriving-via-extension-enum.rs
index 35575285e7a7dd54082fd10e69b4b24df89aff64..32f693abf25558673b664c006cd67cea05a7e5e6 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-enum.rs
+++ b/src/test/run-pass/deriving-via-extension-enum.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_eq]
+#[deriving(Eq)]
 enum Foo {
     Bar(int, int),
     Baz(float, float)

diff --git a/src/test/run-pass/deriving-via-extension-iter-bytes-enum.rs b/src/test/run-pass/deriving-via-extension-iter-bytes-enum.rs
index b41d41192fedb8819d9d9858b12f04738e9872fc..5ceb8c48750d986e49f5c027072c23a4ca6eb135 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-iter-bytes-enum.rs
+++ b/src/test/run-pass/deriving-via-extension-iter-bytes-enum.rs
@@ -10,13 +10,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_iter_bytes]
+#[deriving(IterBytes)]
 enum Foo {
     Bar(int, char),
     Baz(char, int)
 }
 
-#[deriving_iter_bytes]
+#[deriving(IterBytes)]
 enum A {
     B,
     C,

diff --git a/src/test/run-pass/deriving-via-extension-iter-bytes-struct.rs b/src/test/run-pass/deriving-via-extension-iter-bytes-struct.rs
index 18336d74c7e1992f6680bfa2a49455299b055cf7..9f18cb6ac58a7b979cb37e8413a710f9b88a8335 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-iter-bytes-struct.rs
+++ b/src/test/run-pass/deriving-via-extension-iter-bytes-struct.rs
@@ -10,7 +10,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_iter_bytes]
+#[deriving(IterBytes)]
 struct Foo {
     x: int,
     y: int,

diff --git a/src/test/run-pass/deriving-via-extension-struct-empty.rs b/src/test/run-pass/deriving-via-extension-struct-empty.rs
index 4c8c81d5312f9d4f7231bee9d150fad1a03cf298..09ee83870a0e2ca1e67bebd8f2a150e897d50f9d 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-struct-empty.rs
+++ b/src/test/run-pass/deriving-via-extension-struct-empty.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_eq]
+#[deriving(Eq)]
 struct Foo;
 
 pub fn main() {

diff --git a/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs b/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs
index 0f44f7b7cf980389900e18fbe69552af90934b4a..c349600eb9998a01dd7bac29c12d619ea3b1900b 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs
+++ b/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs
@@ -1,4 +1,4 @@
-#[deriving_eq]
+#[deriving(Eq)]
 enum S {
     X { x: int, y: int },
     Y

diff --git a/src/test/run-pass/deriving-via-extension-struct-tuple.rs b/src/test/run-pass/deriving-via-extension-struct-tuple.rs
index ab68d5024910073f3f95252b3afe27f39595af23..35c20c13e93715ae612c160e38ac68bd56026b66 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-struct-tuple.rs
+++ b/src/test/run-pass/deriving-via-extension-struct-tuple.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_eq]
+#[deriving(Eq)]
 struct Foo(int, int, ~str);
 
 pub fn main() {

diff --git a/src/test/run-pass/deriving-via-extension-struct.rs b/src/test/run-pass/deriving-via-extension-struct.rs
index f1d50e4e824eadd538ef1072f2a3480dfa90e73f..f5cc85c63825067025e100dd4d1b30d52b5e5c13 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-struct.rs
+++ b/src/test/run-pass/deriving-via-extension-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_eq]
+#[deriving(Eq)]
 struct Foo {
     x: int,
     y: int,

diff --git a/src/test/run-pass/deriving-via-extension-type-params.rs b/src/test/run-pass/deriving-via-extension-type-params.rs
index 07c09dc7fd4f6f61a9866bd2bf48faa78c6b6293..298e30f7ec1e7779f2c736c6ab40f5ba0716dce5 100644 (file)
--- a/src/test/run-pass/deriving-via-extension-type-params.rs
+++ b/src/test/run-pass/deriving-via-extension-type-params.rs
@@ -10,8 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_eq]
-#[deriving_iter_bytes]
+#[deriving(Eq)]
+#[deriving(IterBytes)]
 struct Foo<T> {
     x: int,
     y: T,

diff --git a/src/test/run-pass/extern-pass-TwoU64s-ref.rs b/src/test/run-pass/extern-pass-TwoU64s-ref.rs
index 00754afa703b258df701bcb6a5d67b8f7404dcd2..f04e9d086e94f156d0d6dccb0694ae314680c8ca 100644 (file)
--- a/src/test/run-pass/extern-pass-TwoU64s-ref.rs
+++ b/src/test/run-pass/extern-pass-TwoU64s-ref.rs
@@ -12,7 +12,7 @@
 
 // xfail-test --- broken on 32-bit ABIs! (#5347)
 
-#[deriving_eq]
+#[deriving(Eq)]
 struct TwoU64s {
     one: u64, two: u64
 }

diff --git a/src/test/run-pass/extern-pass-TwoU64s.rs b/src/test/run-pass/extern-pass-TwoU64s.rs
index 2baf383ce545f0efaacaff63ce5e2ef6d28f8157..1937ddaa9f42a446510d06295ca04256ffc2de77 100644 (file)
--- a/src/test/run-pass/extern-pass-TwoU64s.rs
+++ b/src/test/run-pass/extern-pass-TwoU64s.rs
@@ -13,7 +13,7 @@
 
 // xfail-test --- broken on 32-bit ABIs! (#5347)
 
-#[deriving_eq]
+#[deriving(Eq)]
 struct TwoU64s {
     one: u64, two: u64
 }

diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs
index c8c2d381a7e9932d827045397e3de7d3ba4f7814..cc4f10ca347b48ceff253292e19355127049afe2 100644 (file)
--- a/src/test/run-pass/issue-2718.rs
+++ b/src/test/run-pass/issue-2718.rs
@@ -20,7 +20,7 @@ pub struct Stuff<T> {
         payload: Option<T>
     }
 
-    #[deriving_eq]
+    #[deriving(Eq)]
     pub enum state {
         empty,
         full,

diff --git a/src/test/run-pass/issue-3935.rs b/src/test/run-pass/issue-3935.rs
index e0832bc74b2f3b6622e7ee760feacc25186b56da..626932850cf42ddf717a9eee2a6d83676a1dd140 100644 (file)
--- a/src/test/run-pass/issue-3935.rs
+++ b/src/test/run-pass/issue-3935.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving_eq]
+#[deriving(Eq)]
 struct Bike {
     name: ~str,
 }

diff --git a/src/test/run-pass/while-prelude-drop.rs b/src/test/run-pass/while-prelude-drop.rs
index da3f28f5b7bcaf48707406c8b05386e830cde335..082f2db259a4aea2bbfb64fe1c85bf41f61ce972 100644 (file)
--- a/src/test/run-pass/while-prelude-drop.rs
+++ b/src/test/run-pass/while-prelude-drop.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 
-#[deriving_eq]
+#[deriving(Eq)]
 enum t { a, b(~str), }
 
 fn make(i: int) -> t {