From c7d115b1ad35edb466e60fa7482774edead7a31d Mon Sep 17 00:00:00 2001 From: Alex Lyon Date: Sun, 28 Apr 2019 02:00:19 -0700 Subject: [PATCH] Convert all try!() to ? --- src/chmod/chmod.rs | 4 ++-- src/cksum/cksum.rs | 2 +- src/comm/comm.rs | 2 +- src/cp/cp.rs | 4 ++-- src/ln/ln.rs | 10 +++++----- src/od/formatteriteminfo.rs | 6 +++--- src/shred/shred.rs | 12 ++++++------ src/stat/stat.rs | 2 +- src/stdbuf/stdbuf.rs | 6 +++--- src/sum/sum.rs | 2 +- src/tee/tee.rs | 4 ++-- src/wc/wc.rs | 2 +- tests/common/util.rs | 12 ++++++------ 13 files changed, 34 insertions(+), 34 deletions(-) mode change 100755 => 100644 src/tee/tee.rs mode change 100755 => 100644 tests/common/util.rs diff --git a/src/chmod/chmod.rs b/src/chmod/chmod.rs index 6cd1f6373..b428285bd 100644 --- a/src/chmod/chmod.rs +++ b/src/chmod/chmod.rs @@ -196,7 +196,7 @@ impl Chmoder { } }; match self.fmode { - Some(mode) => try!(self.change_file(fperm, mode, file, name)), + Some(mode) => self.change_file(fperm, mode, file, name)?, None => { let cmode_unwrapped = self.cmode.clone().unwrap(); for mode in cmode_unwrapped.split(',') { @@ -209,7 +209,7 @@ impl Chmoder { }; match result { Ok(mode) => { - try!(self.change_file(fperm, mode, file, name)); + self.change_file(fperm, mode, file, name)?; fperm = mode; } Err(f) => { diff --git a/src/cksum/cksum.rs b/src/cksum/cksum.rs index 44eb84af2..08b56b7d3 100644 --- a/src/cksum/cksum.rs +++ b/src/cksum/cksum.rs @@ -58,7 +58,7 @@ fn cksum(fname: &str) -> io::Result<(u32, usize)> { let mut rd: Box = match fname { "-" => Box::new(stdin()), _ => { - file = try!(File::open(&Path::new(fname))); + file = File::open(&Path::new(fname))?; Box::new(BufReader::new(file)) } }; diff --git a/src/comm/comm.rs b/src/comm/comm.rs index b614f898b..f9381826b 100644 --- a/src/comm/comm.rs +++ b/src/comm/comm.rs @@ -117,7 +117,7 @@ fn open_file(name: &str) -> io::Result { match name { "-" => Ok(LineReader::Stdin(stdin())), _ => { - let f = try!(File::open(&Path::new(name))); + let f = File::open(&Path::new(name))?; Ok(LineReader::FileIn(BufReader::new(f))) } } diff --git a/src/cp/cp.rs b/src/cp/cp.rs index c0c2babd2..eb2205113 100644 --- a/src/cp/cp.rs +++ b/src/cp/cp.rs @@ -1179,8 +1179,8 @@ pub fn localize_to_target(root: &Path, source: &Path, target: &Path) -> CopyResu pub fn paths_refer_to_same_file(p1: &Path, p2: &Path) -> io::Result { // We have to take symlinks and relative paths into account. - let pathbuf1 = try!(canonicalize(p1, CanonicalizeMode::Normal)); - let pathbuf2 = try!(canonicalize(p2, CanonicalizeMode::Normal)); + let pathbuf1 = canonicalize(p1, CanonicalizeMode::Normal)?; + let pathbuf2 = canonicalize(p2, CanonicalizeMode::Normal)?; Ok(pathbuf1 == pathbuf2) } diff --git a/src/ln/ln.rs b/src/ln/ln.rs index d6c89f50d..263c4de10 100644 --- a/src/ln/ln.rs +++ b/src/ln/ln.rs @@ -269,9 +269,9 @@ fn link(src: &PathBuf, dst: &PathBuf, settings: &Settings) -> Result<()> { if !read_yes() { return Ok(()); } - try!(fs::remove_file(dst)) + fs::remove_file(dst)? } - OverwriteMode::Force => try!(fs::remove_file(dst)), + OverwriteMode::Force => fs::remove_file(dst)?, }; backup_path = match settings.backup { @@ -281,14 +281,14 @@ fn link(src: &PathBuf, dst: &PathBuf, settings: &Settings) -> Result<()> { BackupMode::ExistingBackup => Some(existing_backup_path(dst, &settings.suffix)), }; if let Some(ref p) = backup_path { - try!(fs::rename(dst, p)); + fs::rename(dst, p)?; } } if settings.symbolic { - try!(symlink(src, dst)); + symlink(src, dst)?; } else { - try!(fs::hard_link(src, dst)); + fs::hard_link(src, dst)?; } if settings.verbose { diff --git a/src/od/formatteriteminfo.rs b/src/od/formatteriteminfo.rs index d43b1bade..29d5cb6d9 100644 --- a/src/od/formatteriteminfo.rs +++ b/src/od/formatteriteminfo.rs @@ -33,15 +33,15 @@ impl fmt::Debug for FormatWriter { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self { &FormatWriter::IntWriter(ref p) => { - try!(f.write_str("IntWriter:")); + f.write_str("IntWriter:")?; fmt::Pointer::fmt(p, f) } &FormatWriter::FloatWriter(ref p) => { - try!(f.write_str("FloatWriter:")); + f.write_str("FloatWriter:")?; fmt::Pointer::fmt(p, f) } &FormatWriter::MultibyteWriter(ref p) => { - try!(f.write_str("MultibyteWriter:")); + f.write_str("MultibyteWriter:")?; fmt::Pointer::fmt(&(*p as *const ()), f) } } diff --git a/src/shred/shred.rs b/src/shred/shred.rs index a2852bc86..65005b916 100644 --- a/src/shred/shred.rs +++ b/src/shred/shred.rs @@ -491,24 +491,24 @@ fn do_pass( given_file_size: Option, exact: bool, ) -> Result<(), io::Error> { - try!(file.seek(SeekFrom::Start(0))); + file.seek(SeekFrom::Start(0))?; // Use the given size or the whole file if not specified - let size: u64 = given_file_size.unwrap_or(try!(get_file_size(path))); + let size: u64 = given_file_size.unwrap_or(get_file_size(path)?); let generator = BytesGenerator::new(size, generator_type, exact); for block in generator { - try!(file.write_all(&*block)); + file.write_all(&*block)?; } - try!(file.sync_data()); + file.sync_data()?; Ok(()) } fn get_file_size(path: &Path) -> Result { - let size: u64 = try!(fs::metadata(path)).len(); + let size: u64 = fs::metadata(path)?.len(); Ok(size) } @@ -574,7 +574,7 @@ fn do_remove(path: &Path, orig_filename: &str, verbose: bool) -> Result<(), io:: let renamed_path: Option = wipe_name(&path, verbose); match renamed_path { Some(rp) => { - try!(fs::remove_file(rp)); + fs::remove_file(rp)?; } None => (), } diff --git a/src/stat/stat.rs b/src/stat/stat.rs index 482d0e21a..7b65c7a24 100644 --- a/src/stat/stat.rs +++ b/src/stat/stat.rs @@ -468,7 +468,7 @@ impl Stater { let default_tokens = if fmtstr.is_empty() { Stater::generate_tokens(&Stater::default_fmt(showfs, terse, false), use_printf).unwrap() } else { - try!(Stater::generate_tokens(&fmtstr, use_printf)) + Stater::generate_tokens(&fmtstr, use_printf)? }; let default_dev_tokens = Stater::generate_tokens(&Stater::default_fmt(showfs, terse, true), use_printf).unwrap(); diff --git a/src/stdbuf/stdbuf.rs b/src/stdbuf/stdbuf.rs index 256536f82..ab7258e9a 100644 --- a/src/stdbuf/stdbuf.rs +++ b/src/stdbuf/stdbuf.rs @@ -172,9 +172,9 @@ fn parse_options( return Ok(OkMsg::Version); } let mut modified = false; - options.stdin = try!(check_option(&matches, "input", &mut modified).ok_or(ErrMsg::Fatal)); - options.stdout = try!(check_option(&matches, "output", &mut modified).ok_or(ErrMsg::Fatal)); - options.stderr = try!(check_option(&matches, "error", &mut modified).ok_or(ErrMsg::Fatal)); + options.stdin = check_option(&matches, "input", &mut modified).ok_or(ErrMsg::Fatal)?; + options.stdout = check_option(&matches, "output", &mut modified).ok_or(ErrMsg::Fatal)?; + options.stderr = check_option(&matches, "error", &mut modified).ok_or(ErrMsg::Fatal)?; if matches.free.len() != 1 { return Err(ErrMsg::Retry); diff --git a/src/sum/sum.rs b/src/sum/sum.rs index 3e1fa5921..3f506ab40 100644 --- a/src/sum/sum.rs +++ b/src/sum/sum.rs @@ -68,7 +68,7 @@ fn open(name: &str) -> Result> { match name { "-" => Ok(Box::new(stdin()) as Box), _ => { - let f = try!(File::open(&Path::new(name))); + let f = File::open(&Path::new(name))?; Ok(Box::new(f) as Box) } } diff --git a/src/tee/tee.rs b/src/tee/tee.rs old mode 100755 new mode 100644 index eddd940f7..dfc72ef74 --- a/src/tee/tee.rs +++ b/src/tee/tee.rs @@ -131,14 +131,14 @@ struct MultiWriter { impl Write for MultiWriter { fn write(&mut self, buf: &[u8]) -> Result { for writer in &mut self.writers { - try!(writer.write_all(buf)); + writer.write_all(buf)?; } Ok(buf.len()) } fn flush(&mut self) -> Result<()> { for writer in &mut self.writers { - try!(writer.flush()); + writer.flush()?; } Ok(()) } diff --git a/src/wc/wc.rs b/src/wc/wc.rs index d96682c11..db1ee0ebd 100644 --- a/src/wc/wc.rs +++ b/src/wc/wc.rs @@ -144,7 +144,7 @@ fn wc(files: Vec, settings: &Settings) -> StdResult<(), i32> { let mut max_width: usize = 0; for path in &files { - let mut reader = try!(open(&path[..])); + let mut reader = open(&path[..])?; let mut line_count: usize = 0; let mut word_count: usize = 0; diff --git a/tests/common/util.rs b/tests/common/util.rs old mode 100755 new mode 100644 index 1467e5135..8c46e6288 --- a/tests/common/util.rs +++ b/tests/common/util.rs @@ -162,16 +162,16 @@ pub fn log_info, U: AsRef>(msg: T, par: U) { } pub fn recursive_copy(src: &Path, dest: &Path) -> Result<()> { - if try!(fs::metadata(src)).is_dir() { + if fs::metadata(src)?.is_dir() { for entry in try!(fs::read_dir(src)) { - let entry = try!(entry); + let entry = entry?; let mut new_dest = PathBuf::from(dest); new_dest.push(entry.file_name()); - if try!(fs::metadata(entry.path())).is_dir() { - try!(fs::create_dir(&new_dest)); - try!(recursive_copy(&entry.path(), &new_dest)); + if fs::metadata(entry.path())?.is_dir() { + fs::create_dir(&new_dest)?; + recursive_copy(&entry.path(), &new_dest)?; } else { - try!(fs::copy(&entry.path(), new_dest)); + fs::copy(&entry.path(), new_dest)?; } } }