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: 538c7dacde5c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 09f9256366da
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Oct 20, 2016

  1. Copy the full SHA
    3c6b306 View commit details
  2. Copy the full SHA
    961249b View commit details
  3. Copy the full SHA
    09f9256 View commit details
2 changes: 1 addition & 1 deletion mx.jruby/suite.py
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ def mavenLib(mavenDep, sha1, sourceSha1, license):
{
"name": "truffle",
# Must be the same as in truffle/pom.rb (except for the -SNAPSHOT part only in pom.rb, and there we can use a release name)
"version": "af21c6632dbc4e8c48cd25d0b7d623d379c888e6",
"version": "3c34543a8b7ff5edd74b76aafbeb3af52bd4afe7",
"urls": [
{"url": "https://github.com/graalvm/truffle.git", "kind": "git"},
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
4 changes: 2 additions & 2 deletions spec/truffle/specs/truffle/interop/execute_spec.rb
Original file line number Diff line number Diff line change
@@ -27,11 +27,11 @@ def add(a, b)
end

it "doesn't call nil" do
lambda { Truffle::Interop.execute(nil) }.should raise_error(RubyTruffleError)
lambda { Truffle::Interop.execute(nil) }.should raise_error(TypeError)
end

it "doesn't call strings" do
lambda { Truffle::Interop.execute('hello') }.should raise_error(RubyTruffleError)
lambda { Truffle::Interop.execute('hello') }.should raise_error(TypeError)
end

end
2 changes: 1 addition & 1 deletion truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
# Must be the same as in mx.jruby/suite.py (except for the -SNAPSHOT part only in this file, and here we can use a release name)
'truffle.version' => 'af21c6632dbc4e8c48cd25d0b7d623d379c888e6-SNAPSHOT',
'truffle.version' => '3c34543a8b7ff5edd74b76aafbeb3af52bd4afe7-SNAPSHOT',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

2 changes: 1 addition & 1 deletion truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>af21c6632dbc4e8c48cd25d0b7d623d379c888e6-SNAPSHOT</truffle.version>
<truffle.version>3c34543a8b7ff5edd74b76aafbeb3af52bd4afe7-SNAPSHOT</truffle.version>
</properties>
<dependencies>
<dependency>
Original file line number Diff line number Diff line change
@@ -81,6 +81,7 @@ public List<DynamicObject> getHandlers() {
return handlers;
}

@SuppressWarnings("deprecation")
public static DynamicObject handleAtExitException(RubyContext context, RaiseException raiseException) {
final DynamicObject rubyException = raiseException.getException();
if (Layouts.BASIC_OBJECT.getLogicalClass(rubyException) == context.getCoreLibrary().getSystemExitClass()) {
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@
import org.jruby.truffle.language.methods.DeclarationContext;
import org.jruby.truffle.parser.ParserContext;

@Deprecated
public abstract class DebugHelpers {

@Deprecated