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

Commits on Jan 26, 2018

  1. Remove TestArray#test_uniq_bang_with_freeze exclusion test case

    @nomadium
    nomadium committed Jan 26, 2018
    Copy the full SHA
    825a4ad View commit details

Commits on Jan 29, 2018

  1. Merge pull request #5014 from nomadium/fix-array-test-uniq-bang-with-… 

    …freeze

Remove TestArray#test_uniq_bang_with_freeze exclusion test case
    @enebo
    enebo authored Jan 29, 2018
    Copy the full SHA
    c7f5058 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −0 core/src/main/java/org/jruby/RubyArray.java
  2. +0 −1 test/mri/excludes/TestArray.rb
3 changes: 3 additions & 0 deletions core/src/main/java/org/jruby/RubyArray.java
View file
Original file line number Diff line number Diff line change
@@ -3330,6 +3330,9 @@ public IRubyObject uniq_bang19(ThreadContext context, Block block) {
RubyHash hash = makeHash(context, block);
if (realLength == hash.size()) return context.runtime.getNil();

// after evaluating the block, a new modify check is needed
modifyCheck();

// TODO: (CON) This could be a no-op for packed arrays if size does not change
unpack();

1 change: 0 additions & 1 deletion test/mri/excludes/TestArray.rb
View file
Original file line number Diff line number Diff line change
@@ -15,5 +15,4 @@
exclude :test_sort_bang_with_freeze, ""
exclude :test_sort_with_callcc, "no callcc"
exclude :test_to_h, ""
exclude :test_uniq_bang_with_freeze, ""
exclude :test_values_at2, ""