Use let...else instead of match foo { ... _ => return }; and if let ... else return in std
#149795
+19
−38
Conversation
This file contains hidden or 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
…f let ... else return` in std
rustbot
added
O-windows
Collaborator
|
rustbot has assigned @Mark-Simulacrum. Use |
Comment on lines
-675
to
+676
| if let Some(new_secs) = secs.checked_add(1) { | ||
| secs = new_secs; | ||
| } else { | ||
| return None; | ||
| } | ||
| let Some(new_secs) = secs.checked_add(1) else { return None }; | ||
| secs = new_secs; |
Member
There was a problem hiding this comment.
I feel it is much harder to read the control flow in this case because we have hidden the return off to the right.
| } else { | ||
| return Err(FromUtf16Error(())); | ||
| } | ||
| let Ok(c) = c else { return Err(FromUtf16Error(())) }; |
Member
There was a problem hiding this comment.
This also loses clarity due to let-else, IMO.
| let (ptr, layout) = if let Some(mem) = unsafe { self.current_memory(elem_layout) } { | ||
| mem | ||
| } else { | ||
| let Some((ptr, layout)) = (unsafe { self.current_memory(elem_layout) }) else { |
Member
There was a problem hiding this comment.
this is obviously fine, to be clear.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Split off #148837.