Replace most panicking behaviours with Result #92
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ionut-arm
reviewed
Jan 28, 2020
| pub fn new(timeout: Duration) -> Self { | ||
| // If this PARSEC instance was socket activated (see the `parsec.socket` | ||
| pub fn new(timeout: Duration) -> Result<Self> { | ||
| // If this Parsec instance was socket activated (see the `parsec.socket` |
src/front/domain_socket.rs
Outdated
| pub fn build(self) -> DomainSocketListener { | ||
| let timeout = self.timeout.expect("The listener timeout was not set"); | ||
| pub fn build(self) -> Result<DomainSocketListener> { | ||
| let timeout = match self.timeout { |
There was a problem hiding this comment.
Yes good point, will change.
| Ok(BackEndHandler { | ||
| provider: self | ||
| .provider | ||
| .ok_or_else(|| Error::new(ErrorKind::InvalidData, "provider is missing"))?, |
There was a problem hiding this comment.
If you don't also log something in the lambda, ok_or(Error::new(ErrorKind::InvalidData, "provider is missing"))? is simpler
There was a problem hiding this comment.
I tried that but clippy complains:
error: use of `ok_or` followed by a function call
--> src/front/domain_socket.rs:148:48
|
148 | DomainSocketListener::new(self.timeout.ok_or(
| ________________________________________________^
149 | | Error::new(
150 | | ErrorKind::InvalidInput,
151 | | "listener timeout missing",
152 | | )
153 | | )?)
| |_________^
|
= note: `-D clippy::or-fun-call` implied by `-D clippy::all`
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#or_fun_call
help: try this
|
148 | DomainSocketListener::new(self.timeout.ok_or_else(|| Error::new(
149 | ErrorKind::InvalidInput,
150 | "listener timeout missing",
151 | ))?)
|It also makes it easier to maintain and add a log in teh future :)
There was a problem hiding this comment.
Fair enough, this makes sense! Thanks for the explanation!
src/providers/mbed_provider/utils.rs
Outdated
| } | ||
| KeyType::RsaKeypair => Ok(PSA_KEY_TYPE_RSA_KEYPAIR), | ||
| KeyType::RsaPublicKey => Ok(PSA_KEY_TYPE_RSA_PUBLIC_KEY), | ||
| _ => Err(ResponseStatus::PsaErrorInvalidArgument), |
There was a problem hiding this comment.
Wouldn't this be UnsupportedParameters as well?
This commit looks at: * unwrap * expect * panic * unreachable * unimplemented functions/macros and tries to replace most of them with returning errors instead. Exceptions are: * inside tests * when using with read/write locks or mutexes * env::var method * converting from u32 to usize * parsing Uuid Signed-off-by: Hugues de Valon <[email protected]>
hug-dev
force-pushed
the
unsafe-unwrap
branch
from
58c8e26
to
1309a17
Compare
ionut-arm
approved these changes
Jan 28, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit looks at:
functions/macros and tries to replace most of them with returning errors
instead.
Exceptions are:
I took the liberty to align all the non-
ResponseStatuserrors tostd::io::Resulterrors. I had to choose one of theErrorKindvariant and in some cases this choice is maybe bad. Feel free to propose changes. Usingstd::io::Resultmakes it easy to integrate with other libraries that we use that also returnstd::io::Resultbut we could also define our own.