Skip to content

Fix test coerce2 for master branch#5022

Merged
kares merged 3 commits intojruby:masterfrom
yui-knk:fix_test_coerce2_master
Jan 31, 2018
Merged

Fix test coerce2 for master branch#5022
kares merged 3 commits intojruby:masterfrom
yui-knk:fix_test_coerce2_master

Conversation

@yui-knk
Copy link
Contributor

@yui-knk yui-knk commented Jan 31, 2018

This PR is porting of #5006.
Method names modulo19, op_idiv19 and op_mod19 have been changed on master branch.
So we should porting the commit manually.
I hope this PR fix "test:mri*".

Currently `Numeric#%` is defined in the same way
as `Numeric#modulo`.

Ref: https://github.com/ruby/ruby/blob/v2_4_0/numeric.c#L5240-L5241
Currently these methods are not defined on `Rational`.
Currently this method is not defined on `Rational`.
@yui-knk yui-knk mentioned this pull request Jan 31, 2018
@kares
Copy link
Member

kares commented Jan 31, 2018

Thanks Yui, indeed resolves the issue. #5006 was merged over from 9.1 so I wonder what happened.
... guess this is why the whole thing was confusing and seemed like smt must have regressed

@kares
Copy link
Member

kares commented Jan 31, 2018

think the jruby-9.1 merge must have had conflicts at RubyRational.java and wasn't resolved properly

@kares kares merged commit 0c00708 into jruby:master Jan 31, 2018
@kares kares added this to the JRuby 9.2.0.0 milestone Jan 31, 2018
@yui-knk yui-knk deleted the fix_test_coerce2_master branch January 31, 2018 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants