From 8f67c8fef27e1b79408d7f048de941dc3da4a3eb Mon Sep 17 00:00:00 2001 From: bootandy Date: Thu, 15 Mar 2018 14:56:21 -0400 Subject: [PATCH] du: refactor to use ? shortcut --- src/du/du.rs | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/du/du.rs b/src/du/du.rs index 67d3cb3db..e87308952 100644 --- a/src/du/du.rs +++ b/src/du/du.rs @@ -55,21 +55,17 @@ struct Stat { impl Stat { fn new(path: PathBuf) -> Result { - match fs::symlink_metadata(&path) { - Ok(metadata) => { - return Ok(Stat { - path: path, - is_dir: metadata.is_dir(), - size: metadata.len(), - blocks: metadata.blocks() as u64, - nlink: metadata.nlink() as u64, - created: metadata.mtime() as u64, - accessed: metadata.atime() as u64, - modified: metadata.mtime() as u64, - }) - } - Err(e) => Err(e), - } + let metadata = fs::symlink_metadata(&path)?; + Ok(Stat { + path: path, + is_dir: metadata.is_dir(), + size: metadata.len(), + blocks: metadata.blocks() as u64, + nlink: metadata.nlink() as u64, + created: metadata.mtime() as u64, + accessed: metadata.atime() as u64, + modified: metadata.mtime() as u64, + }) } }