rust/book
1
0
Fork 0
mirror of https://github.com/rust-lang/book.git synced 2026-05-26 01:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove println_stderr

Browse Source
This commit is contained in:
lcnr/Bastian Kauschke
2019-01-25 11:51:38 +01:00
parent 0e9061cbaf
commit 72ad67dee6
3 changed files with 10 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
2018-edition/tools/src/bin/lfp.rs
View File

@@ -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()

15
second-edition/tools/src/bin/lfp.rs
View File

@@ -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()

15
tools/src/bin/lfp.rs
View File

@@ -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()