chore: Remove some unwraps and replace others by expect
#2294
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
In functions that return `Result`.
larseggert
requested review from
KershawChang,
martinthomson and
mxinden
as code owners
Failed Interop TestsQUIC Interop Runner, client vs. server, differences relative to 4028ca4. neqo-latest as client
neqo-latest as server
All resultsSucceeded Interop TestsQUIC Interop Runner, client vs. server neqo-latest as client
neqo-latest as server
Unsupported Interop TestsQUIC Interop Runner, client vs. server neqo-latest as client
neqo-latest as server
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2294 +/- ##
==========================================
- Coverage 93.33% 93.13% -0.20%
==========================================
Files 114 114
Lines 36896 36931 +35
Branches 36896 36931 +35
==========================================
- Hits 34438 34397 -41
- Misses 1675 1693 +18
- Partials 783 841 +58 ☔ View full report in Codecov by Sentry. |
larseggert
force-pushed
the
chore-unwrap-less
branch
from
cf9783c to
c9f1896
Compare
larseggert
changed the title
unwrapsunwraps and replace others by expect
Comment on lines
585
to
589
| self.secrets.register(self.fd)?; | ||
| self.raw = Some(r); | ||
| Ok(()) | ||
| } else if self.raw.unwrap() == r { | ||
| } else if self.raw.ok_or(Error::InternalError)? == r { | ||
| Ok(()) |
There was a problem hiding this comment.
This probably needs to be restructured:
if let Some(raw) = self.raw {
if raw == r {
Ok(())
} else {
Err(Error::MixedHandshakeMethod)
}
} else {
self.secrets.register(self.fd)?;
self.raw = Some(r);
Ok(())
}}
| @@ -22,6 +22,7 @@ fn se_create() { | |||
| const PLAINTEXT: &[u8] = b"PLAINTEXT"; | |||
| const AAD: &[u8] = b"AAD"; | |||
|
|
|||
| #[cfg(test)] | |||
There was a problem hiding this comment.
?? This is in tests/. Why would it need this?
There was a problem hiding this comment.
I don't know, but it does. Otherwise clippy complains.
| session_id: stream_info.session_id().unwrap(), | ||
| }, | ||
| )); | ||
| if let Some(session_id) = stream_info.session_id() { |
There was a problem hiding this comment.
Is this truly safe? It seems like this should always be called with stream info that has a session ID, but what do we do if it doesn't?
| .unwrap() | ||
| .maybe_update_priority(priority) | ||
| let Some(stream) = self.control_stream_recv.http_stream() else { | ||
| return false; |
| .unwrap() | ||
| .priority_update_sent(); | ||
| let Some(stream) = self.control_stream_recv.http_stream() else { | ||
| return; |
| write_chunk(offset + mid as u64, right, builder), | ||
| write_chunk(offset, left, builder), | ||
| ] | ||
| if let Some(cs) = self.get_mut(space) { |
There was a problem hiding this comment.
I think that this would be better with:
let Some(cs) = self.get_mut(space) else { return; }
Comment on lines
+333
to
+334
| let Some(primary) = self.migration_target.take() else { | ||
| break; |
There was a problem hiding this comment.
I think that you can restructure this little piece of code to avoid the extra break.
let Some(primary) = self.migration_target.as_mut() else { break; }
if Rc::ptr_eq(target, primary) {
let p = primary.take();
mem::drop(self.select_primary(&p, now));
return true;
}
break;Once we're on 1.80 MSRV, we can use Option::take_if and simplify further.
if let Some(primary) = self.migration_target.take_if(|p| Rc::ptr_eq(target, p))
mem::drop(self.select_primary(&primary, now));
return true;
}
break;| &mut lost, | ||
| ); | ||
| self.stats.borrow_mut().lost += lost.len(); | ||
| if let Some(sp) = self.spaces.get_mut(pn_space) { |
There was a problem hiding this comment.
This is another great candidate for let Some(foo) = expr else { return ...; };
| @@ -457,7 +457,8 @@ impl TransportParameters { | |||
| let rbuf = random::<4>(); | |||
| let mut other = Vec::with_capacity(versions.all().len() + 1); | |||
| let mut dec = Decoder::new(&rbuf); | |||
| let grease = dec.decode_uint::<u32>().unwrap() & 0xf0f0_f0f0 | 0x0a0a_0a0a; | |||
| let grease = | |||
| dec.decode_uint::<u32>().expect("dec has u32 left") & 0xf0f0_f0f0 | 0x0a0a_0a0a; | |||
There was a problem hiding this comment.
This is a good place to go with u32::from_ne_bytes(random::<4>), like above.
Co-authored-by: Martin Thomson <[email protected]> Signed-off-by: Lars Eggert <[email protected]>
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.
In functions that return
ResultorOptionor where it is easy to make them do so w/o too many other code changes.This lets us enable the clippy
unwrap_usedcheck, which is a nice reminder not to be casual withunwrap.