use eprintln macro

getreu · getreu · commit a962804d7f41 · 2019-11-06T04:02:05.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -46,7 +46,7 @@ const AUTHOR: &str = "(c) Jens Getreu, 2016-2018";
 
 /// This function spawns and defines the behaviour of the _merger-thread_ who
 /// collects and prints the results produced by the worker threads.
-fn main2() -> Result<(), Box<std::io::Error>> {
+fn run() -> Result<(), Box<std::io::Error>> {
     if ARGS.flag_list_encodings {
         let list = all::encodings()
             .iter()
@@ -109,13 +109,7 @@ fn main2() -> Result<(), Box<std::io::Error>> {
         } else {
             for filename in ARGS.arg_FILE.iter() {
                 if let Err(e) = process_input(Some(&filename), &mut sc) {
-                    writeln!(
-                        &mut std::io::stderr(),
-                        "Warning: `{}` while scanning file `{}`.",
-                        e,
-                        filename
-                    )
-                    .unwrap();
+                    eprintln!("Warning: `{}` while scanning file `{}`.", e, filename);
                 };
             }
         };
@@ -126,8 +120,8 @@ fn main2() -> Result<(), Box<std::io::Error>> {
 }
 
 fn main() {
-    if let Err(e) = main2() {
-        writeln!(&mut std::io::stderr(), "Error: `{}`.", e).unwrap();
+    if let Err(e) = run() {
+        eprintln!("Error: `{}`.", e);
         process::exit(1);
     }
 }
diff --git a/src/mission.rs b/src/mission.rs
@@ -13,7 +13,6 @@ use std::cmp;
 use std::cmp::{Eq, Ord};
 use std::error;
 use std::fmt;
-use std::io::prelude::*;
 use std::num;
 use std::process;
 use std::str;
@@ -223,13 +222,7 @@ impl Missions {
                 match Self::parse_enc_opt(&enc_opt, flag_bytes.unwrap()) {
                     Ok(r) => r,
                     Err(e) => {
-                        writeln!(
-                            &mut std::io::stderr(),
-                            "Error: {} while parsing `{}`.",
-                            e,
-                            &enc_opt
-                        )
-                        .unwrap();
+                        eprintln!("Error: {} while parsing `{}`.", e, &enc_opt);
                         process::exit(1);
                     }
                 };
@@ -269,12 +262,10 @@ impl Missions {
                     enable_filter: control_char_filtering || unicode_filtering,
                 },
                 None => {
-                    writeln!(
-                        &mut std::io::stderr(),
+                    eprintln!(
                         "Error: Invalid input encoding name '{}', try option -l.",
                         enc_name
-                    )
-                    .unwrap();
+                    );
                     process::exit(1);
                 }
             });
@@ -309,14 +300,12 @@ impl Missions {
             if !((u_lower == 0) && (u_upper == std::char::MAX as u32))
                 && ((u_lower != u_lower_ext) || (u_upper != u_upper_ext))
             {
-                writeln!(
-                    &mut std::io::stderr(),
+                eprintln!(
                     "Warning: range in `{}` extended to range `U+{:x}..U+{:x}`.",
                     enc_opt,
                     u_lower_ext,
                     u_upper_ext
-                )
-                .unwrap();
+                );
             }
 
             let u_and_result = u_lower_ext;
