MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-01-19 12:24:17 +00:00
Code Issues Releases Wiki Activity

Report filename if File::open return Err

Browse Source 
From issue #441
This commit is contained in:
ufuji1984 2018-12-10 19:05:57 +09:00 committed by David Peter
parent dd48d29c28
commit 549e5d7355
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/inputfile.rs
View File

@ -59,7 +59,10 @@ impl<'a> InputFile<'a> {
match self { match self {
InputFile::StdIn => Ok(InputFileReader::new(stdin.lock())), InputFile::StdIn => Ok(InputFileReader::new(stdin.lock())),
InputFile::Ordinary(filename) => { InputFile::Ordinary(filename) => {
let file = File::open(filename)?; let file = match File::open(filename) {
Ok(f) => f,
Err(e) => return Err(format!("{}: {}", filename, e).into()),
};
if file.metadata()?.is_dir() { if file.metadata()?.is_dir() {
return Err(format!("'{}' is a directory.", filename).into()); return Err(format!("'{}' is a directory.", filename).into());