diff options
author | Daniel <kingdread@gmx.de> | 2021-11-12 16:02:32 +0100 |
---|---|---|
committer | Daniel <kingdread@gmx.de> | 2021-11-12 16:02:32 +0100 |
commit | 57240aa00d7a8f7cd611654c44bd04cec9192133 (patch) | |
tree | 0e748f1f6b64f3787047dffc69c0f4d6a7d83aff /src/filters | |
parent | 2e2bdac00092f8fcb96283da697a7a820a8c8978 (diff) | |
download | raidgrep-57240aa00d7a8f7cd611654c44bd04cec9192133.tar.gz raidgrep-57240aa00d7a8f7cd611654c44bd04cec9192133.tar.bz2 raidgrep-57240aa00d7a8f7cd611654c44bd04cec9192133.zip |
Better error handling, less .unwraps()
Some of these unwraps are fine to stay, mostly those that deal with
locks - in this case, crashing the program if something goes wrong is
probably fine.
However, we also had a lot of other places where we panic'd on errors,
even though we really shouldn't have. For example, an invalid zip file
would bring down the whole scanner. In this case, we now use proper
Result<>s and we log the error.
Some places stay with unwrap() for now, mainly the code that is rare and
obvious when it goes wrong - such as an overflow in input values. It
could be made nicer, but it is not a priority for now.
Some unwraps() have been changed to expect() to signal why they
shouldn't fail.
Diffstat (limited to 'src/filters')
-rw-r--r-- | src/filters/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/filters/mod.rs b/src/filters/mod.rs index 7ab0d42..668c5e1 100644 --- a/src/filters/mod.rs +++ b/src/filters/mod.rs @@ -26,7 +26,7 @@ impl ops::Not for Inclusion { type Output = Self; fn not(self) -> Self::Output { - Inclusion::from_i8(-(self as i8)).unwrap() + Inclusion::from_i8(-(self as i8)).expect("i8 is from pre-existing Inclusion") } } @@ -34,7 +34,7 @@ impl ops::BitAnd<Inclusion> for Inclusion { type Output = Self; fn bitand(self, rhs: Inclusion) -> Self::Output { - Inclusion::from_i8((self as i8).min(rhs as i8)).unwrap() + Inclusion::from_i8((self as i8).min(rhs as i8)).expect("i8 is from pre-existing Inclusion") } } @@ -42,7 +42,7 @@ impl ops::BitOr<Inclusion> for Inclusion { type Output = Self; fn bitor(self, rhs: Inclusion) -> Self::Output { - Inclusion::from_i8((self as i8).max(rhs as i8)).unwrap() + Inclusion::from_i8((self as i8).max(rhs as i8)).expect("i8 is from pre-existing Inclusion") } } |