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

Commits on Dec 3, 2016

  1. Copy the full SHA
    0d17ca2 View commit details
  2. Merge pull request #4356 from olleolleolle/patch-2

    trivial: restkwargs => kwargs in FIXME comment
    enebo authored Dec 3, 2016
    Copy the full SHA
    ffed1b8 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/src/main/java/org/jruby/RubyProc.java
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyProc.java
Original file line number Diff line number Diff line change
@@ -270,7 +270,7 @@ public static IRubyObject[] prepareArgs(ThreadContext context, Block.Type type,
int actual = args.length;
boolean kwargs = blockBody instanceof IRBlockBody && signature.hasKwargs();

// FIXME: This is a hot mess. restkwargs factors into destructing a single element array as well. I just weaved it into this logic.
// FIXME: This is a hot mess. kwargs factors into destructing a single element array as well. I just weaved it into this logic.
// for procs and blocks, single array passed to multi-arg must be spread
if ((signature != Signature.ONE_ARGUMENT && required != 0 && (isFixed || signature != Signature.OPTIONAL) || kwargs) &&
actual == 1 && args[0].respondsTo("to_ary")) {