about summary refs log tree commit diff
path: root/src/test/debuginfo
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2014-12-31 17:32:49 +1300
committerNick Cameron <ncameron@mozilla.com>2015-01-02 23:05:22 +1300
commit30e149231c627e61524d1b5bd6357886befae9e6 (patch)
tree8bfb22729d4d1c3784be33cf6eed65aae89fa1d9 /src/test/debuginfo
parent7506fe52696c5b3b628f173d74dc4a13b5ccc1f3 (diff)
downloadrust-30e149231c627e61524d1b5bd6357886befae9e6.tar.gz
rust-30e149231c627e61524d1b5bd6357886befae9e6.zip
Use `derive` rather than `deriving` in tests
Diffstat (limited to 'src/test/debuginfo')
-rw-r--r--src/test/debuginfo/by-value-non-immediate-argument.rs4
-rw-r--r--src/test/debuginfo/c-style-enum.rs6
-rw-r--r--src/test/debuginfo/generic-function.rs2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/test/debuginfo/by-value-non-immediate-argument.rs b/src/test/debuginfo/by-value-non-immediate-argument.rs
index b0c5b2f21b9..8ac8d5970f3 100644
--- a/src/test/debuginfo/by-value-non-immediate-argument.rs
+++ b/src/test/debuginfo/by-value-non-immediate-argument.rs
@@ -73,13 +73,13 @@
 
 #![omit_gdb_pretty_printer_section]
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct Struct {
     a: int,
     b: f64
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct StructStruct {
     a: Struct,
     b: Struct
diff --git a/src/test/debuginfo/c-style-enum.rs b/src/test/debuginfo/c-style-enum.rs
index b62a8167eaf..ad7c860c8b9 100644
--- a/src/test/debuginfo/c-style-enum.rs
+++ b/src/test/debuginfo/c-style-enum.rs
@@ -105,21 +105,21 @@ use self::AutoDiscriminant::{One, Two, Three};
 use self::ManualDiscriminant::{OneHundred, OneThousand, OneMillion};
 use self::SingleVariant::TheOnlyVariant;
 
-#[deriving(Copy)]
+#[derive(Copy)]
 enum AutoDiscriminant {
     One,
     Two,
     Three
 }
 
-#[deriving(Copy)]
+#[derive(Copy)]
 enum ManualDiscriminant {
     OneHundred = 100,
     OneThousand = 1000,
     OneMillion = 1000000
 }
 
-#[deriving(Copy)]
+#[derive(Copy)]
 enum SingleVariant {
     TheOnlyVariant
 }
diff --git a/src/test/debuginfo/generic-function.rs b/src/test/debuginfo/generic-function.rs
index cefe67970e9..b2fdb708db5 100644
--- a/src/test/debuginfo/generic-function.rs
+++ b/src/test/debuginfo/generic-function.rs
@@ -72,7 +72,7 @@
 
 #![omit_gdb_pretty_printer_section]
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct Struct {
     a: int,
     b: f64