Merge pull request #246 from ebfe/remove-to-err-msg

remove use of deprecated to_err_msg

base64/base64.rs

@@ -48,7 +48,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(e) => {
-            error!("error: {:s}", e.to_err_msg());
+            error!("error: {}", e);
             fail!()
         }
     };

basename/basename.rs

@@ -39,7 +39,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m)  => m,
-        Err(f) => crash!(1, "Invalid options\n{}", f.to_err_msg())
+        Err(f) => crash!(1, "Invalid options\n{}", f)
     };
 
     if matches.opt_present("help") {

cat/cat.rs

@@ -41,7 +41,7 @@ pub fn uumain(args: Vec<String>) -> int {
     ];
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => fail!("Invalid options\n{}", f.to_err_msg())
+        Err(f) => fail!("Invalid options\n{}", f)
     };
     if matches.opt_present("help") {
         println!("cat 1.0.0");

cksum/cksum.rs

@@ -88,7 +88,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(err) => fail!("{}", err.to_err_msg()),
+        Err(err) => fail!("{}", err),
     };
 
     if matches.opt_present("help") {

comm/comm.rs

@@ -109,7 +109,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(err) => fail!("{}", err.to_err_msg()),
+        Err(err) => fail!("{}", err),
     };
 
     if matches.opt_present("version") {

cp/cp.rs

@@ -42,7 +42,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(e) => {
-            error!("error: {:s}", e.to_err_msg());
+            error!("error: {}", e);
             fail!()
         },
     };

dirname/dirname.rs

@@ -29,7 +29,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => fail!("Invalid options\n{}", f.to_err_msg())
+        Err(f) => fail!("Invalid options\n{}", f)
     };
 
     if matches.opt_present("help") {

du/du.rs

@@ -162,7 +162,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            show_error!("Invalid options\n{}", f.to_err_msg());
+            show_error!("Invalid options\n{}", f);
             return 1;
         }
     };

echo/echo.rs

@@ -85,7 +85,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "Invalid options\n{}", f.to_err_msg())
+        Err(f) => crash!(1, "Invalid options\n{}", f)
     };
 
     if matches.opt_present("help") {

factor/factor.rs

@@ -77,7 +77,7 @@ pub fn uumain(args: Vec<String>) {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "Invalid options\n{}", f.to_err_msg())
+        Err(f) => crash!(1, "Invalid options\n{}", f)
     };
 
     if matches.opt_present("help") {

fold/fold.rs

@@ -44,7 +44,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "{}", f.to_err_msg())
+        Err(f) => crash!(1, "{}", f)
     };
 
     if matches.opt_present("h") {

groups/groups.rs

@@ -40,7 +40,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts(args.tail(), options) {
         Ok(m) => { m },
         Err(f) => {
-            show_error!("{}", f.to_err_msg());
+            show_error!("{}", f);
             return 1;
         }
     };

hostid/hostid.rs

@@ -65,7 +65,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(e) => {
-            show_error!("{}\n{}", e.to_err_msg(),  get_help_text(NAME, usage.as_slice()));
+            show_error!("{}\n{}", e,  get_help_text(NAME, usage.as_slice()));
             return EXIT_ERR;
         },
     };

kill/kill.rs

@@ -71,7 +71,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(e) => {
-            show_error!("{}\n{}", e.to_err_msg(),  get_help_text(NAME, usage.as_slice()));
+            show_error!("{}\n{}", e,  get_help_text(NAME, usage.as_slice()));
             return EXIT_ERR;
         },
     };

logname/logname.rs

@@ -59,7 +59,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "Invalid options\n{}", f.to_err_msg())
+        Err(f) => crash!(1, "Invalid options\n{}", f)
     };
 
     if matches.opt_present("help") {

md5sum/md5sum.rs

@@ -49,7 +49,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "{}", f.to_err_msg())
+        Err(f) => crash!(1, "{}", f)
     };
 
     if matches.opt_present("help") {

mkdir/mkdir.rs

@@ -48,7 +48,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            crash!(1, "Invalid options\n{}", f.to_err_msg());
+            crash!(1, "Invalid options\n{}", f);
         }
     };
 

paste/paste.rs

@@ -37,7 +37,7 @@ pub fn uumain(args: Vec<String>) -> int {
     ];
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "{}", f.to_err_msg())
+        Err(f) => crash!(1, "{}", f)
     };
     if matches.opt_present("help") {
         println!("{} {}", NAME, VERSION);

printenv/printenv.rs

@@ -37,7 +37,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            crash!(1, "Invalid options\n{}", f.to_err_msg())
+            crash!(1, "Invalid options\n{}", f)
         }
     };
     if matches.opt_present("help") {

pwd/pwd.rs

@@ -36,7 +36,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            crash!(1, "Invalid options\n{}", f.to_err_msg())
+            crash!(1, "Invalid options\n{}", f)
         }
     };
 

rm/rm.rs

@@ -53,7 +53,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            crash!(1, "{}", f.to_err_msg())
+            crash!(1, "{}", f)
         }
     };
     if matches.opt_present("help") {

rmdir/rmdir.rs

@@ -38,7 +38,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            show_error!("{}", f.to_err_msg());
+            show_error!("{}", f);
             return 1;
         }
     };

seq/seq.rs

@@ -47,7 +47,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => { m }
         Err(f) => {
-            show_error!("{:s}", f.to_err_msg());
+            show_error!("{}", f);
             print_usage(opts);
             return 1;
         }

sleep/sleep.rs

@@ -37,7 +37,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            show_error!("{}", f.to_err_msg());
+            show_error!("{}", f);
             return 1;
         }
     };

sum/sum.rs

@@ -90,7 +90,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "Invalid options\n{}", f.to_err_msg())
+        Err(f) => crash!(1, "Invalid options\n{}", f)
     };
 
     if matches.opt_present("help") {

tac/tac.rs

@@ -38,7 +38,7 @@ pub fn uumain(args: Vec<String>) -> int {
     ];
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "{}", f.to_err_msg())
+        Err(f) => crash!(1, "{}", f)
     };
     if matches.opt_present("help") {
         println!("tac {}", VERSION);

tee/tee.rs

@@ -52,7 +52,7 @@ fn options(args: &[String]) -> Result<Options, ()> {
 
     let args: Vec<String> = args.iter().map(|x| x.to_string()).collect();
 
-    getopts(args.tail(), opts).map_err(|e| e.to_err_msg()).and_then(|m| {
+    getopts(args.tail(), opts).map_err(|e| format!("{}", e)).and_then(|m| {
         let version = format!("{} {}", NAME, VERSION);
         let program = args.get(0).as_slice();
         let arguments = "[OPTION]... [FILE]...";

touch/touch.rs

@@ -44,7 +44,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m)  => m,
-        Err(e) => fail!("Invalid options\n{}", e.to_err_msg())
+        Err(e) => fail!("Invalid options\n{}", e)
     };
 
     if matches.opt_present("version") {

tr/tr.rs

@@ -161,7 +161,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(err) => {
-            show_error!("{}", err.to_err_msg());
+            show_error!("{}", err);
             return 1;
         }
     };

truncate/truncate.rs

@@ -51,7 +51,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            crash!(1, "{}", f.to_err_msg())
+            crash!(1, "{}", f)
         }
     };
 

tty/tty.rs

@@ -47,7 +47,7 @@ pub fn uumain(args: Vec<String>) -> int {
             m.opt_present("s")
         },
         Err(f) => {
-            println(f.to_err_msg().as_slice());
+            println!("{}", f);
             usage();
             return 2;
         }

uname/uname.rs

@@ -68,7 +68,7 @@ pub fn uumain(args: Vec<String>) -> int {
     ];
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "{}", f.to_err_msg()),
+        Err(f) => crash!(1, "{}", f),
     };
     if matches.opt_present("help") {
         println!("uname 1.0.0");

unlink/unlink.rs

@@ -39,7 +39,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            crash!(1, "invalid options\n{}", f.to_err_msg())
+            crash!(1, "invalid options\n{}", f)
         }
     };
 

uptime/uptime.rs

@@ -58,7 +58,7 @@ pub fn uumain(args: Vec<String>) -> int {
     ];
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "Invalid options\n{}", f.to_err_msg())
+        Err(f) => crash!(1, "Invalid options\n{}", f)
     };
     if matches.opt_present("version") {
         println!("uptime 1.0.0");

users/users.rs

@@ -59,7 +59,7 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => fail!(f.to_err_msg()),
+        Err(f) => fail!("{}", f),
     };
 
     if matches.opt_present("help") {

wc/wc.rs

@@ -52,7 +52,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            crash!(1, "Invalid options\n{}", f.to_err_msg())
+            crash!(1, "Invalid options\n{}", f)
         }
     };
 

whoami/whoami.rs

@@ -52,7 +52,7 @@ pub fn uumain(args: Vec<String>) -> int {
     ];
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
-        Err(f) => crash!(1, "{}", f.to_err_msg()),
+        Err(f) => crash!(1, "{}", f),
     };
     if matches.opt_present("help") {
         println!("whoami 1.0.0");

yes/yes.rs

@@ -36,7 +36,7 @@ pub fn uumain(args: Vec<String>) -> int {
     let matches = match getopts::getopts(args.tail(), opts) {
         Ok(m) => m,
         Err(f) => {
-            crash!(1, "invalid options\n{}", f.to_err_msg())
+            crash!(1, "invalid options\n{}", f)
         }
     };
     if matches.opt_present("help") {