Use a `fail!` macro, which is just `Err(FromError::from_error(...))`.

6 files changed, 13 insertions, 18 deletions

diff --git a/src/cmd/cat.rs b/src/cmd/cat.rs
index d61ffe3..027bae5 100644
--- a/src/cmd/cat.rs
+++ b/src/cmd/cat.rs
@@ -119,7 +119,7 @@ impl Args {
                             break 'OUTER;
                         }
                     }
-                    Some(Err(err)) => return Err(FromError::from_error(err)),
+                    Some(Err(err)) => return fail!(err),
                     Some(Ok(next)) => records.push(next),
                 }
             }
diff --git a/src/cmd/count.rs b/src/cmd/count.rs
index e9b840c..476bdfc 100644
--- a/src/cmd/count.rs
+++ b/src/cmd/count.rs
@@ -1,5 +1,3 @@
-use std::error::FromError;
-
 use csv::NextField;
 
 use CliResult;
@@ -47,8 +45,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
                         match rdr.next_field() {
                             NextField::EndOfCsv => break,
                             NextField::EndOfRecord => { count += 1; break; }
-                            NextField::Error(err) =>
-                                return Err(FromError::from_error(err)),
+                            NextField::Error(err) => return fail!(err),
                             NextField::Data(_) => {}
                         }
                     }
diff --git a/src/cmd/fixlengths.rs b/src/cmd/fixlengths.rs
index dd58272..b550b59 100644
--- a/src/cmd/fixlengths.rs
+++ b/src/cmd/fixlengths.rs
@@ -1,5 +1,4 @@
 use std::cmp;
-use std::error::FromError;
 
 use CliResult;
 use config::{Config, Delimiter};
@@ -49,16 +48,14 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
     let length = match args.flag_length {
         Some(length) => {
             if length == 0 {
-                return Err(FromError::from_error(
-                    "Length must be greater than 0."));
+                return fail!("Length must be greater than 0.");
             }
             length
         }
         None => {
             if config.is_std() {
-                return Err(FromError::from_error(
-                    "<stdin> cannot be used in this command. \
-                     Please specify a file path."));
+                return fail!("<stdin> cannot be used in this command. \
+                              Please specify a file path.");
             }
             let mut maxlen = 0u;
             let mut rdr = try!(config.reader());
diff --git a/src/cmd/join.rs b/src/cmd/join.rs
index 5c80772..a66f458 100644
--- a/src/cmd/join.rs
+++ b/src/cmd/join.rs
@@ -1,5 +1,4 @@
 use std::collections::hash_map::{HashMap, Vacant, Occupied};
-use std::error::FromError;
 use std::fmt;
 use std::io;
 use std::str;
@@ -110,8 +109,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
             try!(state.write_headers());
             state.inner_join()
         }
-        _ => Err(FromError::from_error(
-            "Please pick exactly one join operation."))
+        _ => fail!("Please pick exactly one join operation.")
     }
 }
 
@@ -314,10 +312,10 @@ impl Args {
         let select1 = try!(rconf1.selection(headers1[]));
         let select2 = try!(rconf2.selection(headers2[]));
         if select1.len() != select2.len() {
-            return Err(FromError::from_error(format!(
+            return fail!(format!(
                 "Column selections must have the same number of columns, \
                  but found column selections with {} and {} columns.",
-                select1.len(), select2.len())));
+                select1.len(), select2.len()));
         }
         Ok((select1, select2))
     }
diff --git a/src/cmd/split.rs b/src/cmd/split.rs
index 0b3581a..e3dd336 100644
--- a/src/cmd/split.rs
+++ b/src/cmd/split.rs
@@ -1,4 +1,3 @@
-use std::error::FromError;
 use std::io;
 use std::io::fs::mkdir_recursive;
 use std::os;
@@ -55,7 +54,7 @@ struct Args {
 pub fn run(argv: &[&str]) -> CliResult<()> {
     let args: Args = try!(util::get_args(USAGE, argv));
     if args.flag_size == 0 {
-        return Err(FromError::from_error("--size must be greater than 0."));
+        return fail!("--size must be greater than 0.");
     }
     try!(mkdir_recursive(&Path::new(args.arg_outdir[]), io::ALL_PERMISSIONS));
 
diff --git a/src/main.rs b/src/main.rs
index 11f34cc..e3c6bec 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -27,6 +27,10 @@ macro_rules! werr(
     )
 )
 
+macro_rules! fail(
+    ($e:expr) => (Err(::std::error::FromError::from_error($e)));
+)
+
 macro_rules! command_list(
     () => (
 "