Replace manual formatting by show_error!()/show_warning!()

src/uu/date/src/date.rs

@@ -18,6 +18,7 @@ use std::fs::File;
 use std::io::{BufRead, BufReader};
 use std::path::PathBuf;
 use uucore::display::Quotable;
+use uucore::show_error;
 #[cfg(windows)]
 use winapi::{
     shared::minwindef::WORD,
@@ -146,7 +147,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     let format = if let Some(form) = matches.value_of(OPT_FORMAT) {
         if !form.starts_with('+') {
-            eprintln!("date: invalid date {}", form.quote());
+            show_error!("invalid date {}", form.quote());
             return 1;
         }
         let form = form[1..].to_string();
@@ -175,7 +176,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let set_to = match matches.value_of(OPT_SET).map(parse_date) {
         None => None,
         Some(Err((input, _err))) => {
-            eprintln!("date: invalid date {}", input.quote());
+            show_error!("invalid date {}", input.quote());
             return 1;
         }
         Some(Ok(date)) => Some(date),
@@ -241,7 +242,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                     println!("{}", formatted);
                 }
                 Err((input, _err)) => {
-                    println!("date: invalid date {}", input.quote());
+                    show_error!("invalid date {}", input.quote());
                 }
             }
         }
@@ -353,13 +354,13 @@ fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
 
 #[cfg(target_os = "macos")]
 fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
-    eprintln!("date: setting the date is not supported by macOS");
+    show_error!("setting the date is not supported by macOS");
     1
 }
 
 #[cfg(target_os = "redox")]
 fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
-    eprintln!("date: setting the date is not supported by Redox");
+    show_error!("setting the date is not supported by Redox");
     1
 }
 
@@ -379,7 +380,7 @@ fn set_system_datetime(date: DateTime<Utc>) -> i32 {
 
     if result != 0 {
         let error = std::io::Error::last_os_error();
-        eprintln!("date: cannot set date: {}", error);
+        show_error!("cannot set date: {}", error);
         error.raw_os_error().unwrap()
     } else {
         0
@@ -409,7 +410,7 @@ fn set_system_datetime(date: DateTime<Utc>) -> i32 {
 
     if result == 0 {
         let error = std::io::Error::last_os_error();
-        eprintln!("date: cannot set date: {}", error);
+        show_error!("cannot set date: {}", error);
         error.raw_os_error().unwrap()
     } else {
         0

src/uu/env/src/env.rs

@@ -22,6 +22,7 @@ use std::env;
 use std::io::{self, Write};
 use std::iter::Iterator;
 use std::process::Command;
+use uucore::display::Quotable;
 use uucore::error::{UResult, USimpleError};
 
 const USAGE: &str = "env [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]";
@@ -93,7 +94,7 @@ fn load_config_file(opts: &mut Options) -> UResult<()> {
         };
 
         let conf = conf.map_err(|error| {
-            eprintln!("env: error: \"{}\": {}", file, error);
+            show_error!("{}: {}", file.maybe_quote(), error);
             1
         })?;
 

src/uu/od/src/multifilereader.rs

@@ -59,7 +59,7 @@ impl<'b> MultifileReader<'b> {
                             // print an error at the time that the file is needed,
                             // then move on the the next file.
                             // This matches the behavior of the original `od`
-                            eprintln!("{}: {}: {}", uucore::util_name(), fname.maybe_quote(), e);
+                            show_error!("{}: {}", fname.maybe_quote(), e);
                             self.any_err = true
                         }
                     }
@@ -92,7 +92,7 @@ impl<'b> io::Read for MultifileReader<'b> {
                             Ok(0) => break,
                             Ok(n) => n,
                             Err(e) => {
-                                eprintln!("{}: I/O: {}", uucore::util_name(), e);
+                                show_error!("I/O: {}", e);
                                 self.any_err = true;
                                 break;
                             }

src/uu/printf/src/memo.rs

@@ -9,7 +9,7 @@ use itertools::put_back_n;
 use std::iter::Peekable;
 use std::slice::Iter;
 use uucore::display::Quotable;
-use uucore::show_error;
+use uucore::show_warning;
 
 use crate::tokenize::sub::Sub;
 use crate::tokenize::token::{Token, Tokenizer};
@@ -20,8 +20,8 @@ pub struct Memo {
 }
 
 fn warn_excess_args(first_arg: &str) {
-    show_error!(
+    show_warning!(
-        "warning: ignoring excess arguments, starting with {}",
+        "ignoring excess arguments, starting with {}",
         first_arg.quote()
     );
 }

src/uu/printf/src/tokenize/num_format/num_format.rs

@@ -8,7 +8,7 @@ use std::env;
 use std::vec::Vec;
 
 use uucore::display::Quotable;
-use uucore::show_error;
+use uucore::{show_error, show_warning};
 
 use super::format_field::{FieldType, FormatField};
 use super::formatter::{Base, FormatPrimitive, Formatter, InitialPrefix};
@@ -30,8 +30,8 @@ fn warn_char_constant_ign(remaining_bytes: Vec<u8>) {
         Ok(_) => {}
         Err(e) => {
             if let env::VarError::NotPresent = e {
-                show_error!(
+                show_warning!(
-                    "warning: {:?}: character(s) following character \
+                    "{:?}: character(s) following character \
                      constant have been ignored",
                     &*remaining_bytes
                 );

src/uu/test/src/parser.rs

@@ -11,6 +11,7 @@ use std::ffi::OsString;
 use std::iter::Peekable;
 
 use uucore::display::Quotable;
+use uucore::show_error;
 
 /// Represents one of the binary comparison operators for strings, integers, or files
 #[derive(Debug, PartialEq)]
@@ -207,7 +208,7 @@ impl Parser {
 
             // case 2: error if end of stream is `( <any_token>`
             [symbol] => {
-                eprintln!("test: missing argument after ‘{:?}’", symbol);
+                show_error!("missing argument after ‘{:?}’", symbol);
                 std::process::exit(2);
             }