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

Commits on Dec 28, 2015

  1. Name peek_result properly for binding.

    @headius
    headius committed Dec 28, 2015
    Copy the full SHA
    0a1f7c4 View commit details

  2. Clean up unused imports.

    @headius
    headius committed Dec 28, 2015
    Copy the full SHA
    eef3c40 View commit details
Showing with 1 addition and 5 deletions.
  1. +0 −4 core/src/main/java/org/jruby/RubyArray.java
  2. +1 −1 core/src/main/java/org/jruby/ext/coverage/CoverageModule.java
4 changes: 0 additions & 4 deletions core/src/main/java/org/jruby/RubyArray.java
View file
Original file line number Diff line number Diff line change
@@ -39,15 +39,13 @@

import org.jcodings.Encoding;
import org.jcodings.specific.USASCIIEncoding;
import org.jcodings.specific.UTF16BEEncoding;
import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;
import org.jruby.common.IRubyWarnings.ID;
import org.jruby.java.util.ArrayUtils;
import org.jruby.javasupport.JavaUtil;
import org.jruby.runtime.Arity;
import org.jruby.runtime.Block;
import org.jruby.runtime.BlockBody;
import org.jruby.runtime.ClassIndex;
import org.jruby.runtime.Helpers;
import org.jruby.runtime.ObjectAllocator;
@@ -60,10 +58,8 @@
import org.jruby.runtime.marshal.UnmarshalStream;
import org.jruby.util.ByteList;
import org.jruby.util.Pack;
import org.jruby.util.PerlHash;
import org.jruby.util.Qsort;
import org.jruby.util.RecursiveComparator;
import org.jruby.util.SipHashInline;
import org.jruby.util.TypeConverter;

import java.io.IOException;
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/coverage/CoverageModule.java
View file
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ public static IRubyObject result(ThreadContext context, IRubyObject self) {
}

@JRubyMethod(module = true)
public static IRubyObject peekResult(ThreadContext context, IRubyObject self) {
public static IRubyObject peek_result(ThreadContext context, IRubyObject self) {
Ruby runtime = context.runtime;

if (!runtime.getCoverageData().isCoverageEnabled()) {