about summary refs log tree commit diff
path: root/src/compiletest
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2015-01-03 22:54:18 -0500
committerJorge Aparicio <japaricious@gmail.com>2015-01-03 22:54:18 -0500
commit351409a62287c7993bc680d9dfcfa13cba9c9c0c (patch)
tree47f99908d999aa612a4cd44932dcdc3b3a1a966a /src/compiletest
parent8c5bb80d9b8373dd3c14cde0ba79f7d507839782 (diff)
downloadrust-351409a62287c7993bc680d9dfcfa13cba9c9c0c.tar.gz
rust-351409a62287c7993bc680d9dfcfa13cba9c9c0c.zip
sed -i -s 's/#\[deriving(/#\[derive(/g' **/*.rs
Diffstat (limited to 'src/compiletest')
-rw-r--r--src/compiletest/common.rs4
-rw-r--r--src/compiletest/errors.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs
index 62b757529dc..202a87fcdc9 100644
--- a/src/compiletest/common.rs
+++ b/src/compiletest/common.rs
@@ -13,7 +13,7 @@ use std::fmt;
 use std::str::FromStr;
 use regex::Regex;
 
-#[deriving(Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub enum Mode {
     CompileFail,
     RunFail,
@@ -59,7 +59,7 @@ impl fmt::Show for Mode {
     }
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub struct Config {
     // The library paths required for running the compiler
     pub compile_lib_path: String,
diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs
index 16c6f725030..f330bb3143e 100644
--- a/src/compiletest/errors.rs
+++ b/src/compiletest/errors.rs
@@ -30,7 +30,7 @@ pub struct ExpectedError {
 pub static EXPECTED_PATTERN : &'static str =
     r"//~(?P<follow>\|)?(?P<adjusts>\^*)\s*(?P<kind>\S*)\s*(?P<msg>.*)";
 
-#[deriving(PartialEq, Show)]
+#[derive(PartialEq, Show)]
 enum WhichLine { ThisLine, FollowPrevious(uint), AdjustBackward(uint) }
 
 // Load any test directives embedded in the file