Simplify Skip::nth and Skip::last implementations
#68597
Merged
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
The main improvement is to make `last` no longer recursive.
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
cuviper
reviewed
Jan 28, 2020
| if self.n > 0 { | ||
| // nth(n) skips n+1 | ||
| if self.iter.nth(self.n - 1).is_none() { | ||
| return None; |
There was a problem hiding this comment.
I like using Try in cases like this, self.iter.nth(self.n - 1)?;
There was a problem hiding this comment.
That would work in this case but would make the code less symmetric with the other methods of Skip which is why I didn't use ? here.
JohnCSimon
added
S-waiting-on-author
|
r? @KodrAus |
|
@bors r+ rollup |
|
📌 Commit 84f3356 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Feb 17, 2020
Simplify `Skip::nth` and `Skip::last` implementations The main improvement is to make `last` no longer recursive.
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 18, 2020
Simplify `Skip::nth` and `Skip::last` implementations The main improvement is to make `last` no longer recursive.
bors
added a commit
that referenced
this pull request
Feb 18, 2020
Rollup of 8 pull requests Successful merges: - #67272 (recursion_limit parsing handles overflows) - #68597 (Simplify `Skip::nth` and `Skip::last` implementations) - #68767 (macOS: avoid calling pthread_self() twice) - #69175 (Do not ICE when encountering `yield` inside `async` block) - #69223 (Ignore GDB versions with broken str printing.) - #69244 (configure: set LLVM flags with a value) - #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2}) - #69252 (Clean out unused directories for extra disk space) Failed merges: r? @ghost
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Feb 18, 2020
Simplify `Skip::nth` and `Skip::last` implementations The main improvement is to make `last` no longer recursive.
bors
added a commit
that referenced
this pull request
Feb 18, 2020
Rollup of 8 pull requests Successful merges: - #67272 (recursion_limit parsing handles overflows) - #68597 (Simplify `Skip::nth` and `Skip::last` implementations) - #68767 (macOS: avoid calling pthread_self() twice) - #69175 (Do not ICE when encountering `yield` inside `async` block) - #69223 (Ignore GDB versions with broken str printing.) - #69244 (configure: set LLVM flags with a value) - #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2}) - #69252 (Clean out unused directories for extra disk space) Failed merges: r? @ghost
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.
The main improvement is to make
lastno longer recursive.