summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@sequoia-pgp.org>2022-05-18 19:07:27 +0300
committerLars Wirzenius <liw@sequoia-pgp.org>2022-05-18 19:07:27 +0300
commit21978c9fb6440714e6b80d18a38c894d88e37dff (patch)
treef06f157f542b798d59bffb253c66bb678a979191
parent09a4a7985bfac281ce41cc6bd19dc790af8bd979 (diff)
downloadchecksums-21978c9fb6440714e6b80d18a38c894d88e37dff.tar.gz
results, error handling
Sponsored-by: author Sponsored-by: NLnet Foundation; NGI Assure Sponsored-by: pep.foundation
-rw-r--r--src/main.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main.rs b/src/main.rs
index 8c9feec..d21e67a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -45,7 +45,7 @@ mod linear {
use checksums::*;
use std::path::PathBuf;
- pub fn checksums(filenames: &[PathBuf]) -> anyhow::Result<()> {
+ pub fn checksums(filenames: &[PathBuf]) -> Result<(), std::io::Error> {
let mut sums = vec![];
for filename in filenames {
let sum = checksum(filename)?;
@@ -60,7 +60,7 @@ mod lineariter {
use checksums::*;
use std::path::PathBuf;
- pub fn checksums(filenames: &[PathBuf]) -> anyhow::Result<()> {
+ pub fn checksums(filenames: &[PathBuf]) -> Result<(), std::io::Error> {
let checksums: Result<Vec<FileChecksum>, std::io::Error> = filenames
.iter()
.map(|filename| checksum(filename))
@@ -75,7 +75,7 @@ mod rayon {
use rayon::prelude::*;
use std::path::PathBuf;
- pub fn checksums(filenames: &[PathBuf]) -> anyhow::Result<()> {
+ pub fn checksums(filenames: &[PathBuf]) -> Result<(), std::io::Error> {
let checksums: Result<Vec<FileChecksum>, std::io::Error> = filenames
.par_iter()
.map(|filename| checksum(filename))
@@ -90,7 +90,7 @@ mod threads {
use std::path::PathBuf;
use std::thread::{spawn, JoinHandle};
- pub fn checksums(filenames: &[PathBuf]) -> anyhow::Result<()> {
+ pub fn checksums(filenames: &[PathBuf]) -> Result<(), std::io::Error> {
let handles: Vec<JoinHandle<Result<FileChecksum, std::io::Error>>> = filenames
.iter()
.cloned()
@@ -98,8 +98,8 @@ mod threads {
.collect();
let mut checksums = vec![];
for handle in handles {
- let result = handle.join().expect("thread join");
- checksums.push(result?);
+ let sum = handle.join().expect("thread join")?;
+ checksums.push(sum);
}
print_checksums(&checksums);
Ok(())