From 074a58eafd76edec2c4a0753d96749dc7a50f463 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Thu, 8 Jan 2015 13:56:41 +0100
Subject: [PATCH] deriving is now called derive

---
 src/cat/cat.rs           | 2 +-
 src/cp/cp.rs             | 2 +-
 src/cut/cut.rs           | 2 +-
 src/cut/ranges.rs        | 2 +-
 src/echo/echo.rs         | 2 +-
 src/fmt/parasplit.rs     | 6 +++---
 src/mv/mv.rs             | 4 ++--
 src/rm/rm.rs             | 2 +-
 src/seq/seq.rs           | 2 +-
 src/test/test.rs         | 2 +-
 src/truncate/truncate.rs | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/cat/cat.rs b/src/cat/cat.rs
index a6b19faf6..f60a7ba31 100644
--- a/src/cat/cat.rs
+++ b/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,
diff --git a/src/cp/cp.rs b/src/cp/cp.rs
index 86d41686b..765063d17 100644
--- a/src/cp/cp.rs
+++ b/src/cp/cp.rs
@@ -22,7 +22,7 @@ use getopts::{
     usage,
 };
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 pub enum Mode {
     Copy,
     Help,
diff --git a/src/cut/cut.rs b/src/cut/cut.rs
index d91a04072..5ef2871bb 100644
--- a/src/cut/cut.rs
+++ b/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],
diff --git a/src/cut/ranges.rs b/src/cut/ranges.rs
index 8a3ef2b2c..982cb272b 100644
--- a/src/cut/ranges.rs
+++ b/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,
diff --git a/src/echo/echo.rs b/src/echo/echo.rs
index dd20766ac..176fbd5e3 100644
--- a/src/echo/echo.rs
+++ b/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
diff --git a/src/fmt/parasplit.rs b/src/fmt/parasplit.rs
index 583262f90..776ae9198 100644
--- a/src/fmt/parasplit.rs
+++ b/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
diff --git a/src/mv/mv.rs b/src/mv/mv.rs
index 183fb95e5..396d15f8a 100644
--- a/src/mv/mv.rs
+++ b/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,
diff --git a/src/rm/rm.rs b/src/rm/rm.rs
index dc876701f..1e22b4a91 100644
--- a/src/rm/rm.rs
+++ b/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,
diff --git a/src/seq/seq.rs b/src/seq/seq.rs
index ccd1a4eae..1b72f0123 100644
--- a/src/seq/seq.rs
+++ b/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>,
diff --git a/src/test/test.rs b/src/test/test.rs
index 0b0c2ad8a..7f09ba490 100644
--- a/src/test/test.rs
+++ b/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,
diff --git a/src/truncate/truncate.rs b/src/truncate/truncate.rs
index f2a680012..7b76fe4fb 100644
--- a/src/truncate/truncate.rs
+++ b/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,