Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-12-28 02:35:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119 from gemmarx/use_stderr

Browse Source 
Change to put error messages into stderr
This commit is contained in:
Benjamin Sago 2016-10-05 16:47:51 +01:00 committed by GitHub
commit a8b05fce83
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/exa.rs
View File

@ -20,7 +20,7 @@ extern crate zoneinfo_compiled;
#[macro_use] extern crate lazy_static; #[macro_use] extern crate lazy_static;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::io::{Write, Result as IOResult}; use std::io::{stderr, Write, Result as IOResult};
use std::path::{Component, Path}; use std::path::{Component, Path};
use fs::{Dir, File}; use fs::{Dir, File};
@ -72,13 +72,13 @@ impl<'w, W: Write + 'w> Exa<'w, W> {
for file_name in self.args.iter() { for file_name in self.args.iter() {
match File::from_path(Path::new(&file_name), None) { match File::from_path(Path::new(&file_name), None) {
Err(e) => { Err(e) => {
try!(writeln!(self.writer, "{}: {}", file_name, e)); try!(writeln!(stderr(), "{}: {}", file_name, e));
}, },
Ok(f) => { Ok(f) => {
if f.is_directory() && !self.options.dir_action.treat_dirs_as_files() { if f.is_directory() && !self.options.dir_action.treat_dirs_as_files() {
match f.to_dir(self.options.should_scan_for_git()) { match f.to_dir(self.options.should_scan_for_git()) {
Ok(d) => dirs.push(d), Ok(d) => dirs.push(d),
Err(e) => try!(writeln!(self.writer, "{}: {}", file_name, e)), Err(e) => try!(writeln!(stderr(), "{}: {}", file_name, e)),
} }
} }
else { else {
@ -122,7 +122,7 @@ impl<'w, W: Write + 'w> Exa<'w, W> {
for file in dir.files() { for file in dir.files() {
match file { match file {
Ok(file) => children.push(file), Ok(file) => children.push(file),
Err((path, e)) => try!(writeln!(self.writer, "[{}: {}]", path.display(), e)), Err((path, e)) => try!(writeln!(stderr(), "[{}: {}]", path.display(), e)),
} }
}; };
@ -137,7 +137,7 @@ impl<'w, W: Write + 'w> Exa<'w, W> {
for child_dir in children.iter().filter(|f| f.is_directory()) { for child_dir in children.iter().filter(|f| f.is_directory()) {
match child_dir.to_dir(false) { match child_dir.to_dir(false) {
Ok(d) => child_dirs.push(d), Ok(d) => child_dirs.push(d),
Err(e) => try!(writeln!(self.writer, "{}: {}", child_dir.path.display(), e)), Err(e) => try!(writeln!(stderr(), "{}: {}", child_dir.path.display(), e)),
} }
} }