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

Commits on Mar 1, 2018

  1. Delete rogue Truffle tags.

    headius committed Mar 1, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    f33f72b View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    869c450 View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    8756e07 View commit details
Showing with 8 additions and 2 deletions.
  1. +7 −1 core/src/main/java/org/jruby/RubyRational.java
  2. +1 −0 spec/tags/ruby/core/string/freeze_tags.txt
  3. +0 −1 spec/truffle/tags/core/math/lgamma_tags.txt
8 changes: 7 additions & 1 deletion core/src/main/java/org/jruby/RubyRational.java
Original file line number Diff line number Diff line change
@@ -645,8 +645,9 @@ public final RubyNumeric op_div(ThreadContext context, RubyInteger other) {
/** nurat_fdiv
*
*/
@Override
@JRubyMethod(name = "fdiv")
public IRubyObject op_fdiv(ThreadContext context, IRubyObject other) {
public IRubyObject fdiv(ThreadContext context, IRubyObject other) {
return f_div(context, f_to_f(context, this), other);
}

@@ -1434,6 +1435,11 @@ public IRubyObject op_idiv(ThreadContext context, IRubyObject other) {
return idiv(context, other);
}

@Deprecated
public IRubyObject op_fdiv(ThreadContext context, IRubyObject other) {
return fdiv(context, other);
}

private static JavaSites.RationalSites sites(ThreadContext context) {
return context.sites.Rational;
}
1 change: 1 addition & 0 deletions spec/tags/ruby/core/string/freeze_tags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
critical(sporadic, see #5070):String#freeze produces the same object whenever called on an instance of a literal in the source
1 change: 0 additions & 1 deletion spec/truffle/tags/core/math/lgamma_tags.txt

This file was deleted.