Prefer Clone to Copy. Fixes #74. #76
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
Clone is a super-type of Copy, so everything that implements Copy already implements Clone. Therefore, this is strictly more general. In addition, .clone() on things that implement Copy should be inlined (to `return *self`) and essentially zero cost. And per Marwes#74 (comment), .clone() already be fast in order for parsing to be fast, so the performance assumptions in the non-Copy case should be similar.
Marwes
reviewed
Jan 6, 2017
| @@ -189,7 +189,7 @@ pub fn satisfy_map<I, P, R>(predicate: P) -> SatisfyMap<I, P> | |||
| #[derive(Clone)] | |||
| pub struct Token<I> | |||
| where I: Stream, | |||
| I::Item: PartialEq | |||
| I::Item: PartialEq + Clone, | |||
There was a problem hiding this comment.
This bound and then one below it is not necessary.
Marwes
reviewed
Jan 6, 2017
| { | ||
| Token { | ||
| c: c, | ||
| c: c.clone(), |
Marwes
reviewed
Jan 6, 2017
| @@ -225,10 +225,10 @@ impl<I> Parser for Token<I> | |||
| #[inline(always)] | |||
| pub fn token<I>(c: I::Item) -> Token<I> | |||
| where I: Stream, | |||
| I::Item: PartialEq | |||
| I::Item: PartialEq + Clone, | |||
|
Nice! Thanks! I originally limited the |
ncalexan
force-pushed
the
clone-not-copy
branch
from
9a32f1a
to
c308819
Compare
…arwes#74. This test verifies we can use token() with a StreamSlice.
|
@Marwes thanks for the quick response. I turned the last commit into a test-only change. Is there anything else you want in order to merge? |
|
Nope, looks good now. Published to crates.io as 2.1.1. |
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.
Together, these commits address the cases I asked about in #74 and #75. With these,
SliceStreamconsumers can usetoken(); and consumers who want aTitem type can parse non-Copytokens.