summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--array.c2
-rw-r--r--test/ruby/test_array.rb2
-rw-r--r--version.h6
3 files changed, 6 insertions, 4 deletions
diff --git a/array.c b/array.c
index b40f05e76d..9f9968163d 100644
--- a/array.c
+++ b/array.c
@@ -2754,7 +2754,7 @@ rb_ary_collect(VALUE ary)
RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
collect = rb_ary_new2(RARRAY_LEN(ary));
for (i = 0; i < RARRAY_LEN(ary); i++) {
- rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i)));
+ rb_ary_push(collect, rb_yield_force_blockarg(RARRAY_AREF(ary, i)));
}
return collect;
}
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index f12c8bb302..73a0bf24d0 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -534,6 +534,8 @@ class TestArray < Test::Unit::TestCase
# Enumerable#collect without block returns an Enumerator.
#assert_equal([1, 2, 3], @cls[1, 2, 3].collect)
assert_kind_of Enumerator, @cls[1, 2, 3].collect
+
+ assert_equal([[1, 2, 3]], [[1, 2, 3]].collect(&->(a, b, c) {[a, b, c]}))
end
# also update map!
diff --git a/version.h b/version.h
index b01479fe1f..6d9108645f 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.5.2"
-#define RUBY_RELEASE_DATE "2018-10-09"
-#define RUBY_PATCHLEVEL 96
+#define RUBY_RELEASE_DATE "2018-10-11"
+#define RUBY_PATCHLEVEL 97
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 11
#include "ruby/version.h"