Don't dup every element in Enumerator#drop (1.7) #4226
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
In 06f0441 (JRUBY-6892) Enumerable#drop was changed to call #dup on every element that ended up in the result, but that might not work. Not all objects correctly implement #dup, or are even allocatable. #take was not changed, and looking at the differences between #take and #drop the only thing that stood out was that the signature of the #each call was different. Changing from Arity.NO_ARGUMENTS to Arity.ONE_REQUIRED make the issue that 06f0441 tried to fix go away.
iconara
changed the title
|
I'm unsure which branch that this PR should target, please help me out. The fix should go into the next 1.7.x release. I'm also unable to run the tests in |
|
you got the right branch (jruby-1_7) ... somehow we do not have a travis-ci run for this PR not sure why. |
|
I'll verify locally. |
|
Seems fine locally. I'll merge. |
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.
This fixes #4218 in JRuby 1.7.
In 06f0441 (JRUBY-6892)
Enumerable#dropwas changed to call#dupon every element that ended up in the result, but that might not work. Not all objects correctly implement#dup, or are even allocatable.#takewas not changed, and looking at the differences between#takeand#dropthe only thing that stood out was that the signature of the #each call was different. Changing fromArity.NO_ARGUMENTStoArity.ONE_REQUIREDmake the issue that 06f0441 tried to fix go away.