Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 67f546a1ca08
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad3e5c15b113
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 13, 2015

  1. Fix Array#collect! that returns a sized enumerator as Array#map!

    @kachick
    kachick committed Dec 13, 2015
    Copy the full SHA
    c46545a View commit details

  2. Merge pull request #3537 from kachick/array-collect_bang-size 

    Fix Array#collect! that returns a sized enumerator as Array#map!
    @kares
    kares committed Dec 13, 2015
    Copy the full SHA
    ad3e5c1 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −1 core/src/main/java/org/jruby/RubyArray.java
  2. +0 −1 spec/tags/ruby/core/array/collect_tags.txt
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyArray.java
View file
Original file line number Diff line number Diff line change
@@ -2321,7 +2321,7 @@ public RubyArray collectBang(ThreadContext context, Block block) {
*/
@JRubyMethod(name = "collect!")
public IRubyObject collect_bang(ThreadContext context, Block block) {
return block.isGiven() ? collectBang(context, block) : enumeratorize(context.runtime, this, "collect!");
return block.isGiven() ? collectBang(context, block) : enumeratorizeWithSize(context, this, "collect!", enumLengthFn());
}

/** rb_ary_collect_bang
1 change: 0 additions & 1 deletion spec/tags/ruby/core/array/collect_tags.txt
View file

This file was deleted.