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

Commits on Feb 6, 2015

  1. [Truffle] We can shim thread as not doing anything - we'll load it al… 

    …l by default.
    @chrisseaton
    chrisseaton committed Feb 6, 2015
    Copy the full SHA
    176e79e View commit details

  2. Merge branch 'master' of github.com:jruby/jruby

    @chrisseaton
    chrisseaton committed Feb 6, 2015
    Copy the full SHA
    195871e View commit details
Showing with 9 additions and 4 deletions.
  1. +9 −0 lib/ruby/truffle/shims/thread.rb
  2. +0 −4 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java
9 changes: 9 additions & 0 deletions lib/ruby/truffle/shims/thread.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
# Eclipse Public License version 1.0
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1

# Empty thread file - everything is loaded by default at the moment
4 changes: 0 additions & 4 deletions truffle/src/main/java/org/jruby/truffle/runtime/subsystems/FeatureManager.java
View file
Original file line number Diff line number Diff line change
@@ -57,10 +57,6 @@ public boolean require(String path, String feature, RubyNode currentNode) throws
return true;
}

if (feature.equals("thread")) {
return true;
}

if (feature.equals("time")) {
return true;
}