Fixes #33
Merged
Fixes #33
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
- iter unnecessary - the match is there to put value into v so make that clearer
comments include another alternative if based method.
progval
reviewed
Oct 12, 2023
generator/src/util.rs
Outdated
Comment on lines
33
to
57
| match (self.done, self.s.is_empty(), self.pending.is_empty()) { | ||
| (true, _, _) => None, | ||
| (_, true, _) => { | ||
| self.done = true; | ||
| Some("") | ||
| } | ||
| (_, _, false) => Some(std::mem::take(&mut self.pending)), | ||
| _ => { | ||
| for (i, b) in self.s.bytes().enumerate() { | ||
| if b == b' ' || self.splitters.contains(&b) { | ||
| let ret = &self.s[..i]; | ||
| // dont include the space, but include everything else on the next step | ||
| if b != b' ' { | ||
| self.pending = &self.s[i..i + 1] | ||
| } | ||
| self.s = &self.s[i + 1..]; | ||
| return Some(ret); | ||
| } | ||
| } | ||
| self.s = &self.s[i + 1..]; | ||
| return Some(ret); | ||
| // trailing data | ||
| self.done = true; | ||
| Some(self.s) | ||
| } | ||
| } | ||
| // trailing data | ||
| self.done = true; | ||
| Some(self.s) | ||
| } |
There was a problem hiding this comment.
I'm not convinced this is more readable than the existing code. Could you revert the change?
There was a problem hiding this comment.
Would you prefer to else as well?
If i take them out the first part would look like this
if self.done {
return None;
}
if self.s.is_empty() {
self.done = true;
return Some("");
}
...
The reason I ask is that if-else with returns in them triggers some lints.
Of course if you'd rather keep them in, regardless, I'll do that.
There was a problem hiding this comment.
Those sound like quite opinionated lints then. I'm usually fond of functional style, but this is a bit too much IMO.
This reverts commit 28974cb.
|
reverted and removed unnecessary if's |
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.
Some of these deserve explanations :
c7c8f22
2479d5f
expectrather than a nakedunwrap. As explained above, this part is just simple file handling of a file with a well known format so it seem like more complex error handling is unnecessary.28974cb
returnbreakcontinue,elsestatements can often safely be removed.