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: 633f333f3e0a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a87aff668c3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 13, 2015

  1. [Truffle] Update shim to return empty instance of Array subclass so A… 

    …rray#flatten spec passes.
    @bjfish
    bjfish committed Mar 13, 2015
    Copy the full SHA
    fdb28c2 View commit details

  2. Merge pull request #2695 from bjfish/truffle_flatten_subclass 

    [Truffle] Update shim to return empty instance of Array subclass so Array#flatten spec passes.
    @chrisseaton
    chrisseaton committed Mar 13, 2015
    Copy the full SHA
    9a87aff View commit details
Showing with 1 addition and 2 deletions.
  1. +0 −1 spec/truffle/tags/core/array/flatten_tags.txt
  2. +1 −1 truffle/src/main/ruby/core/rubinius/api/shims/array.rb
1 change: 0 additions & 1 deletion spec/truffle/tags/core/array/flatten_tags.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion truffle/src/main/ruby/core/rubinius/api/shims/array.rb
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ class Array

def new_reserved(count)
# TODO CS 6-Feb-15 do we want to reserve space or allow the runtime to optimise for us?
[]
self.class.new(0 , nil)
end

end