diff --git a/2018-edition/tools/src/bin/lfp.rs b/2018-edition/tools/src/bin/lfp.rs index f475df088..32b2ab297 100644 --- a/2018-edition/tools/src/bin/lfp.rs +++ b/2018-edition/tools/src/bin/lfp.rs @@ -7,16 +7,7 @@ extern crate walkdir; use docopt::Docopt; use std::{path, fs, io}; -use std::io::{BufRead, Write}; - -macro_rules! println_stderr( - ($($arg:tt)*) => ( - match writeln!(&mut ::std::io::stderr(), $($arg)* ) { - Ok(_) => {}, - Err(x) => panic!("Unable to write to stderr: {}", x), - } - ) -); +use std::io::BufRead; fn main () { let args: Args = Docopt::new(USAGE) @@ -31,7 +22,7 @@ fn main () { match entry { Ok(entry) => entry, Err(err) => { - println_stderr!("{:?}", err); + eprintln!("{:?}", err); std::process::exit(911) }, } @@ -43,9 +34,9 @@ fn main () { for err in &err_vec { match *err { LintingError::LineOfInterest(line_num, ref line) => - println_stderr!("{}:{}\t{}", path.display(), line_num, line), + eprintln!("{}:{}\t{}", path.display(), line_num, line), LintingError::UnableToOpenFile => - println_stderr!("Unable to open {}.", path.display()), + eprintln!("Unable to open {}.", path.display()), } } !err_vec.is_empty() diff --git a/second-edition/tools/src/bin/lfp.rs b/second-edition/tools/src/bin/lfp.rs index 06fa6e420..e5ee35694 100644 --- a/second-edition/tools/src/bin/lfp.rs +++ b/second-edition/tools/src/bin/lfp.rs @@ -8,15 +8,6 @@ extern crate walkdir; use std::{path, fs, io}; use std::io::{BufRead, Write}; -macro_rules! println_stderr( - ($($arg:tt)*) => ( - match writeln!(&mut ::std::io::stderr(), $($arg)* ) { - Ok(_) => {}, - Err(x) => panic!("Unable to write to stderr: {}", x), - } - ) -); - fn main () { let args: Args = Docopt::new(USAGE) .and_then(|d| d.decode()) @@ -30,7 +21,7 @@ fn main () { match entry { Ok(entry) => entry, Err(err) => { - println_stderr!("{:?}", err); + eprintln!("{:?}", err); std::process::exit(911) }, } @@ -42,9 +33,9 @@ fn main () { for err in &err_vec { match *err { LintingError::LineOfInterest(line_num, ref line) => - println_stderr!("{}:{}\t{}", path.display(), line_num, line), + eprintln!("{}:{}\t{}", path.display(), line_num, line), LintingError::UnableToOpenFile => - println_stderr!("Unable to open {}.", path.display()), + eprintln!("Unable to open {}.", path.display()), } } !err_vec.is_empty() diff --git a/tools/src/bin/lfp.rs b/tools/src/bin/lfp.rs index f475df088..e597d4515 100644 --- a/tools/src/bin/lfp.rs +++ b/tools/src/bin/lfp.rs @@ -9,15 +9,6 @@ use docopt::Docopt; use std::{path, fs, io}; use std::io::{BufRead, Write}; -macro_rules! println_stderr( - ($($arg:tt)*) => ( - match writeln!(&mut ::std::io::stderr(), $($arg)* ) { - Ok(_) => {}, - Err(x) => panic!("Unable to write to stderr: {}", x), - } - ) -); - fn main () { let args: Args = Docopt::new(USAGE) .and_then(|d| d.decode()) @@ -31,7 +22,7 @@ fn main () { match entry { Ok(entry) => entry, Err(err) => { - println_stderr!("{:?}", err); + eprintln!("{:?}", err); std::process::exit(911) }, } @@ -43,9 +34,9 @@ fn main () { for err in &err_vec { match *err { LintingError::LineOfInterest(line_num, ref line) => - println_stderr!("{}:{}\t{}", path.display(), line_num, line), + eprintln!("{}:{}\t{}", path.display(), line_num, line), LintingError::UnableToOpenFile => - println_stderr!("Unable to open {}.", path.display()), + eprintln!("Unable to open {}.", path.display()), } } !err_vec.is_empty()