deriving is now called derive

src/cat/cat.rs

@@ -81,7 +81,7 @@ pub fn uumain(args: Vec<String>) -> int {
     0
 }
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 enum NumberingMode {
     NumberNone,
     NumberNonEmpty,

src/cp/cp.rs

@@ -22,7 +22,7 @@ use getopts::{
     usage,
 };
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 pub enum Mode {
     Copy,
     Help,

src/cut/cut.rs

@@ -191,7 +191,7 @@ fn cut_characters<R: Reader>(reader: R,
     0
 }
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct Searcher<'a> {
     haystack: &'a [u8],
     needle: &'a [u8],

src/cut/ranges.rs

@@ -9,7 +9,7 @@
 
 use std;
 
-#[deriving(PartialEq,Eq,PartialOrd,Ord,Show)]
+#[derive(PartialEq,Eq,PartialOrd,Ord,Show)]
 pub struct Range {
     pub low: uint,
     pub high: uint,

src/echo/echo.rs

@@ -23,7 +23,7 @@ mod util;
 static NAME: &'static str = "echo";
 static VERSION: &'static str = "1.0.0";
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct EchoOptions {
     newline: bool,
     escape: bool

src/fmt/parasplit.rs

@@ -30,7 +30,7 @@ fn char_width(c: char) -> uint {
 
 // lines with PSKIP, lacking PREFIX, or which are entirely blank are
 // NoFormatLines; otherwise, they are FormatLines
-#[deriving(Show)]
+#[derive(Show)]
 pub enum Line {
     FormatLine(FileLine),
     NoFormatLine(String, bool)
@@ -56,7 +56,7 @@ impl Line {
 
 // each line's prefix has to be considered to know whether to merge it with
 // the next line or not
-#[deriving(Show)]
+#[derive(Show)]
 struct FileLine {
     line       : String,
     indent_end : uint,     // the end of the indent, always the start of the text
@@ -195,7 +195,7 @@ impl<'a> Iterator<Line> for FileLines<'a> {
 // plus info about the paragraph's indentation
 // (but we only retain the String from the FileLine; the other info
 // is only there to help us in deciding how to merge lines into Paragraphs
-#[deriving(Show)]
+#[derive(Show)]
 pub struct Paragraph {
         lines       : Vec<String>,  // the lines of the file
     pub init_str    : String,       // string representing the init, that is, the first line's indent

src/mv/mv.rs

@@ -42,7 +42,7 @@ pub struct Behaviour {
     verbose: bool,
 }
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 pub enum OverwriteMode {
     NoClobber,
     Interactive,
@@ -51,7 +51,7 @@ pub enum OverwriteMode {
 
 impl Copy for OverwriteMode {}
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 pub enum BackupMode {
     NoBackup,
     SimpleBackup,

src/rm/rm.rs

@@ -19,7 +19,7 @@ use std::io::fs::PathExtensions;
 #[macro_use]
 mod util;
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 enum InteractiveMode {
     InteractiveNone,
     InteractiveOnce,

src/seq/seq.rs

@@ -14,7 +14,7 @@ mod util;
 
 static NAME: &'static str = "seq";
 
-#[deriving(Clone)]
+#[derive(Clone)]
 struct SeqOptions {
     separator: String,
     terminator: Option<String>,

src/test/test.rs

@@ -303,7 +303,7 @@ fn setup_hashmap<'a>() -> HashMap<&'a [u8], Precedence> {
     hashmap
 }
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 enum PathCondition {
     BlockSpecial,
     CharacterSpecial,

src/truncate/truncate.rs

@@ -20,7 +20,7 @@ use std::io::fs::PathExtensions;
 #[macro_use]
 mod util;
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 enum TruncateMode {
     Reference,
     Extend,