Use derive rather than deriving in tests

Author: nrc

src/test/auxiliary/trait_inheritance_overloading_xc.rs

@@ -13,7 +13,7 @@ use std::cmp::PartialEq;
 pub trait MyNum : Add<Self,Self> + Sub<Self,Self> + Mul<Self,Self> + PartialEq + Clone {
 }
 
-#[deriving(Clone, Show)]
+#[derive(Clone, Show)]
 pub struct MyInt {
     pub val: int
 }

src/test/bench/shootout-k-nucleotide.rs

@@ -60,7 +60,7 @@ static OCCURRENCES: [&'static str;5] = [
 
 // Code implementation
 
-#[deriving(PartialEq, PartialOrd, Ord, Eq)]
+#[derive(PartialEq, PartialOrd, Ord, Eq)]
 struct Code(u64);
 
 impl Copy for Code {}

src/test/bench/task-perf-alloc-unwind.rs

@@ -14,7 +14,7 @@ use std::os;
 use std::task;
 use std::time::Duration;
 
-#[deriving(Clone)]
+#[derive(Clone)]
 enum List<T> {
     Nil, Cons(T, Box<List<T>>)
 }

src/test/compile-fail/attr-before-eof.rs

@@ -8,4 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving(Show)] //~ERROR expected item after attributes
+#[derive(Show)] //~ERROR expected item after attributes

src/test/compile-fail/borrowck-init-in-fru.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct point {
     x: int,
     y: int,

src/test/compile-fail/borrowck-loan-in-overloaded-op.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct foo(Box<uint>);
 
 impl Add<foo, foo> for foo {

src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving(Copy)]
+#[derive(Copy)]
 struct Point {
     x: int,
     y: int,

src/test/compile-fail/borrowck-move-out-of-vec-tail.rs

@@ -10,7 +10,7 @@
 
 // Test that we do not permit moves from &[] matched by a vec pattern.
 
-#[deriving(Clone, Show)]
+#[derive(Clone, Show)]
 struct Foo {
     string: String
 }

src/test/compile-fail/coherence-blanket-conflicts-with-specific-multidispatch.rs

@@ -24,7 +24,7 @@ impl<T> MyTrait<T> for T { //~ ERROR E0119
     }
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct MyType {
     dummy: uint
 }

src/test/compile-fail/copy-a-resource.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving(Show)]
+#[derive(Show)]
 struct foo {
   i: int,
 }

src/test/compile-fail/deriving-bounds.rs

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving(Copy(Bad))]
+#[derive(Copy(Bad))]
 //~^ ERROR unexpected value in deriving, expected a trait
 struct Test;
 
-#[deriving(Sync)]
+#[derive(Sync)]
 //~^ ERROR Sync is an unsafe trait and it should be implemented explicitly
 struct Test1;
 

src/test/compile-fail/deriving-meta-unknown-trait.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[deriving(Eqr)] //~ ERROR unknown `deriving` trait: `Eqr`
+#[derive(Eqr)] //~ ERROR unknown `derive` trait: `Eqr`
 struct Foo;
 
 pub fn main() {}

src/test/compile-fail/deriving-no-inner-impl-error-message.rs

@@ -10,12 +10,12 @@
 
 struct NoCloneOrEq;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 struct E {
     x: NoCloneOrEq //~ ERROR binary operation `==` cannot be applied to type `NoCloneOrEq`
          //~^ ERROR binary operation `!=` cannot be applied to type `NoCloneOrEq`
 }
-#[deriving(Clone)]
+#[derive(Clone)]
 struct C {
     x: NoCloneOrEq
     //~^ ERROR the trait `core::clone::Clone` is not implemented for the type `NoCloneOrEq`

src/test/compile-fail/deriving-non-type.rs

@@ -12,29 +12,29 @@
 
 struct S;
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 trait T { }
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 impl S { }
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 impl T for S { }
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 static s: uint = 0u;
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 const c: uint = 0u;
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 mod m { }
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 extern "C" { }
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 type A = uint;
 
-#[deriving(PartialEq)] //~ ERROR: `deriving` may only be applied to structs and enums
+#[derive(PartialEq)] //~ ERROR: `derive` may only be applied to structs and enums
 fn main() { }

src/test/compile-fail/deriving-primitive.rs

@@ -11,22 +11,22 @@
 use std::num::FromPrimitive;
 use std::int;
 
-#[deriving(FromPrimitive)]
+#[derive(FromPrimitive)]
 struct A { x: int }
 //~^^ ERROR `FromPrimitive` cannot be derived for structs
 //~^^^ ERROR `FromPrimitive` cannot be derived for structs
 
-#[deriving(FromPrimitive)]
+#[derive(FromPrimitive)]
 struct B(int);
 //~^^ ERROR `FromPrimitive` cannot be derived for structs
 //~^^^ ERROR `FromPrimitive` cannot be derived for structs
 
-#[deriving(FromPrimitive)]
+#[derive(FromPrimitive)]
 enum C { Foo(int), Bar(uint) }
 //~^^ ERROR `FromPrimitive` cannot be derived for enum variants with arguments
 //~^^^ ERROR `FromPrimitive` cannot be derived for enum variants with arguments
 
-#[deriving(FromPrimitive)]
+#[derive(FromPrimitive)]
 enum D { Baz { x: int } }
 //~^^ ERROR `FromPrimitive` cannot be derived for enums with struct variants
 //~^^^ ERROR `FromPrimitive` cannot be derived for enums with struct variants

src/test/compile-fail/deriving-span-Clone-enum-struct-variant.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Clone)]
+#[derive(Clone)]
 enum Enum {
    A {
      x: Error //~ ERROR

src/test/compile-fail/deriving-span-Clone-enum.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Clone)]
+#[derive(Clone)]
 enum Enum {
    A(
      Error //~ ERROR

src/test/compile-fail/deriving-span-Clone-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct Struct {
     x: Error //~ ERROR
 }

src/test/compile-fail/deriving-span-Clone-tuple-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct Struct(
     Error //~ ERROR
 );

src/test/compile-fail/deriving-span-Default-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Default)]
+#[derive(Default)]
 struct Struct {
     x: Error //~ ERROR `core::default::Default` is not implemented
 }

src/test/compile-fail/deriving-span-Default-tuple-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Default)]
+#[derive(Default)]
 struct Struct(
     Error //~ ERROR
 );

src/test/compile-fail/deriving-span-Hash-enum-struct-variant.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Hash)]
+#[derive(Hash)]
 enum Enum {
    A {
      x: Error //~ ERROR

src/test/compile-fail/deriving-span-Hash-enum.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Hash)]
+#[derive(Hash)]
 enum Enum {
    A(
      Error //~ ERROR

src/test/compile-fail/deriving-span-Hash-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Hash)]
+#[derive(Hash)]
 struct Struct {
     x: Error //~ ERROR
 }

src/test/compile-fail/deriving-span-Hash-tuple-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Hash)]
+#[derive(Hash)]
 struct Struct(
     Error //~ ERROR
 );

src/test/compile-fail/deriving-span-PartialEq-enum-struct-variant.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 enum Enum {
    A {
      x: Error //~ ERROR

src/test/compile-fail/deriving-span-PartialEq-enum.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 enum Enum {
    A(
      Error //~ ERROR

src/test/compile-fail/deriving-span-PartialEq-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 struct Struct {
     x: Error //~ ERROR
 //~^ ERROR

src/test/compile-fail/deriving-span-PartialEq-tuple-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 struct Struct(
     Error //~ ERROR
 //~^ ERROR

src/test/compile-fail/deriving-span-PartialOrd-enum-struct-variant.rs

@@ -12,10 +12,10 @@
 
 extern crate rand;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 struct Error;
 
-#[deriving(PartialOrd,PartialEq)]
+#[derive(PartialOrd,PartialEq)]
 enum Enum {
    A {
      x: Error //~ ERROR

src/test/compile-fail/deriving-span-PartialOrd-enum.rs

@@ -12,10 +12,10 @@
 
 extern crate rand;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 struct Error;
 
-#[deriving(PartialOrd,PartialEq)]
+#[derive(PartialOrd,PartialEq)]
 enum Enum {
    A(
      Error //~ ERROR

src/test/compile-fail/deriving-span-PartialOrd-struct.rs

@@ -12,10 +12,10 @@
 
 extern crate rand;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 struct Error;
 
-#[deriving(PartialOrd,PartialEq)]
+#[derive(PartialOrd,PartialEq)]
 struct Struct {
     x: Error //~ ERROR
 //~^ ERROR

src/test/compile-fail/deriving-span-PartialOrd-tuple-struct.rs

@@ -12,10 +12,10 @@
 
 extern crate rand;
 
-#[deriving(PartialEq)]
+#[derive(PartialEq)]
 struct Error;
 
-#[deriving(PartialOrd,PartialEq)]
+#[derive(PartialOrd,PartialEq)]
 struct Struct(
     Error //~ ERROR
 //~^ ERROR

src/test/compile-fail/deriving-span-Rand-enum-struct-variant.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Rand)]
+#[derive(Rand)]
 enum Enum {
    A {
      x: Error //~ ERROR

src/test/compile-fail/deriving-span-Rand-enum.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Rand)]
+#[derive(Rand)]
 enum Enum {
    A(
      Error //~ ERROR

src/test/compile-fail/deriving-span-Rand-struct.rs

@@ -15,7 +15,7 @@ extern crate rand;
 
 struct Error;
 
-#[deriving(Rand)]
+#[derive(Rand)]
 struct Struct {
     x: Error //~ ERROR
 }