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