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: ba4a334cd4f7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0dd04575d205
Choose a head ref
1 contributor

Commits on Jun 15, 2015

  1. [Truffle] Updated Rubinius bootstrap files from 2.4.1 to 2.5.6.

    @nirvdrum
    nirvdrum committed Jun 15, 2015
    Copy the full SHA
    1359514 View commit details

  2. [Truffle] FiberError should descend from StandardError.

    @nirvdrum
    nirvdrum committed Jun 15, 2015
    Copy the full SHA
    29e6820 View commit details

  3. [Truffle] Fixed PrimitiveFailure's class hierarchy.

    @nirvdrum
    nirvdrum committed Jun 15, 2015
    Copy the full SHA
    3a37022 View commit details

Commits on Jun 16, 2015

  1. [Truffle] Use PIC for mirror lookups.

    @nirvdrum
    nirvdrum committed Jun 16, 2015
    Copy the full SHA
    c6b5cac View commit details

  2. [Truffle] Implemented Float#eql?.

    @nirvdrum
    nirvdrum committed Jun 16, 2015
    Copy the full SHA
    888080e View commit details

  3. [Truffle] Added missing mirrors.

    @nirvdrum
    nirvdrum committed Jun 16, 2015
    Copy the full SHA
    5c29146 View commit details

  4. [Truffle] Override a Range mirror method to be compatible with our Ra… 

    …nge implementation.
    @nirvdrum
    nirvdrum committed Jun 16, 2015
    Copy the full SHA
    b0a6135 View commit details

  5. [Truffle] Reimplemented the :module_mirror primitive in Ruby to simpl… 

    …ify corner cases.
    @nirvdrum
    nirvdrum committed Jun 16, 2015
    Copy the full SHA
    b9442b1 View commit details

  6. [Truffle] Added a NULL pointer specialization for Rubinius::FFI::Plat… 

    …form::POSIX.getgroups.
    @nirvdrum
    nirvdrum committed Jun 16, 2015
    Copy the full SHA
    01e92f5 View commit details

  7. [Truffle] Handle setting of Range ivars in Rubinius code.

    @nirvdrum
    nirvdrum committed Jun 16, 2015
    Copy the full SHA
    295ee75 View commit details

Commits on Jun 18, 2015

  1. [Truffle] Suppress warnings parsing Rubinius core files.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    2294de2 View commit details

  2. [Truffle] Renamed a variable to match existing conventions.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    d4089a6 View commit details

  3. [Truffle] Removed unused import.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    fc1dd07 View commit details

  4. [Truffle] Properly set the logical class of Rubinius::Channel objects.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    f29304b View commit details

  5. [Truffle] Renamed a method to match existing conventions.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    2acef62 View commit details

  6. [Truffle] Removed an unused field.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    b3f3803 View commit details

  7. [Truffle] Use a BooleanCastNode to cut down on specializations.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    fdec80e View commit details

  8. [Truffle] Upgraded Rubinius core files from 2.4.1 to 2.5.6. 

    Part of this upgrade was to limit the number of modifications made directly to Rubinius files.  Method overrides are now done in the api/shims files where possible.  Where code cannot be overridden or must otherwise be removed, the Truffle.omit utility was introduce to clearly denote these sections.  The intent is to make it clearer where we can't use Rubinius directly and to make future upgrades go easier.
    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    acec36b View commit details

  9. Merge branch 'master' into rbx-2.5.6-upgrade 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
	truffle/src/main/java/org/jruby/truffle/nodes/rubinius/PosixNodes.java
	truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    1da2096 View commit details

  10. [Truffle] Removed a debug statement.

    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    3783a33 View commit details

  11. [Truffle] There's no need to comment these out, since they're overrid… 

    …den in Java.
    @nirvdrum
    nirvdrum committed Jun 18, 2015
    Copy the full SHA
    cf88778 View commit details

Commits on Jun 19, 2015

  1. [Truffle] Use standard Rubinius ARGF and provide overrides in api/shi… 

    …ms like we do for others.
    @nirvdrum
    nirvdrum committed Jun 19, 2015
    Copy the full SHA
    9a7c788 View commit details

  2. Merge pull request #3064 from jruby/rbx-2.5.6-upgrade 

    [Truffle] Rbx 2.5.6 upgrade
    @nirvdrum
    nirvdrum committed Jun 19, 2015
    Copy the full SHA
    0dd0457 View commit details
Loading