1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 54028: [Backport #12158]

* insns.def (opt_mod): show its method name on ZeroDivisionError.
	  [Bug #12158]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-03-28 16:19:35 +00:00
parent 5840a393fb
commit 3c989d3ca5
3 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Tue Mar 29 01:07:36 2016 NARUSE, Yui <naruse@ruby-lang.org>
* insns.def (opt_mod): show its method name on ZeroDivisionError.
[Bug #12158]
Tue Mar 29 01:05:28 2016 Anthony Dmitriyev <antstorm@gmail.com>
* net/ftp.rb: add NullSocket#closed? to fix closing not opened

View file

@ -1594,7 +1594,7 @@ opt_mod
long div, mod;
if (y == 0)
rb_num_zerodiv();
goto INSN_LABEL(normal_dispatch);
if (y < 0) {
if (x < 0)
div = -x / -y;

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.5"
#define RUBY_RELEASE_DATE "2016-03-29"
#define RUBY_PATCHLEVEL 273
#define RUBY_PATCHLEVEL 274
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3