Skip to content

Commit 903d8a1

Browse files
committed
Remove usage of unwrap
1 parent 9dfb398 commit 903d8a1

File tree

1 file changed

+24
-14
lines changed

1 file changed

+24
-14
lines changed

src/main.rs

+24-14
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,37 @@ fn main() {
4949
walker.run(|| {
5050
let tx = tx.clone();
5151
Box::new(move |result| {
52-
if let Ok(entry) = result {
53-
let metadata = entry.metadata().unwrap();
52+
match result {
53+
Ok(entry) => {
54+
if let Ok(metadata) = entry.metadata() {
55+
// If the entry has more than one hard link, generate
56+
// a unique ID consisting of device and inode in order
57+
// not to count this entry twice.
58+
let unique_id = if metadata.is_file() && metadata.nlink() > 1 {
59+
Some((metadata.dev(), metadata.ino()))
60+
} else {
61+
None
62+
};
5463

55-
// If the entry has more than one hard link, generate
56-
// a unique ID consisting of device and inode in order
57-
// not to count this entry twice.
58-
let unique_id = if metadata.is_file() && metadata.nlink() > 1 {
59-
Some((metadata.dev(), metadata.ino()))
60-
} else {
61-
None
62-
};
64+
let size = metadata.len();
6365

64-
let size = metadata.len();
65-
66-
tx.send((unique_id, size)).unwrap();
66+
tx.send((unique_id, size)).ok();
67+
} else {
68+
eprintln!(
69+
"Could not get metadata: '{}'",
70+
entry.path().to_string_lossy()
71+
);
72+
}
73+
}
74+
Err(err) => {
75+
eprintln!("I/O error: {}", err);
76+
}
6777
}
6878

6979
return ignore::WalkState::Continue;
7080
})
7181
});
7282

7383
drop(tx);
74-
receiver_thread.join().unwrap();
84+
receiver_thread.join().ok();
7585
}

0 commit comments

Comments
 (0)