summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@sequoia-pgp.org>2022-04-10 11:15:24 +0300
committerLars Wirzenius <liw@sequoia-pgp.org>2022-04-10 11:15:24 +0300
commitd8e2d9927d1e93efe737e2e3e0986bf8c49d953a (patch)
tree6de571dc064851a99ec8760921080c6ad8a12332
parentf633203f255f9fabc726ab4939984e083cb95c0f (diff)
downloadchecksums-d8e2d9927d1e93efe737e2e3e0986bf8c49d953a.tar.gz
refactor: simplify printing
Sponsored-by: author
-rw-r--r--src/main.rs16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/main.rs b/src/main.rs
index 408b697..2f3fbff 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,12 +15,13 @@ fn main() {
}
fn checksums_main(filenames: &[PathBuf]) -> anyhow::Result<()> {
- let x: Result<Vec<()>, std::io::Error> = filenames
+ let checksums: Result<Vec<FileChecksum>, std::io::Error> = filenames
.iter()
.map(|filename| checksum(filename))
- .map(|x| print_checksum_result(x))
.collect();
- let _ = x?;
+ for c in checksums? {
+ c.print();
+ }
Ok(())
}
@@ -61,13 +62,8 @@ impl FileChecksum {
checksum,
}
}
-}
-fn print_checksum_result(x: Result<FileChecksum, std::io::Error>) -> Result<(), std::io::Error> {
- if let Ok(x) = x {
- println!("{} {}", x.checksum, x.filename.display());
- Ok(())
- } else {
- Err(x.unwrap_err())
+ fn print(&self) {
+ println!("{} {}", self.checksum, self.filename.display());
}
}