diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-22 09:18:40 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-22 09:18:40 +0000 |
commit | b309975a913d371ca0359214ea338919ed6ba48d (patch) | |
tree | 95c6a78c510bd0362f4acf3188746512825b314c | |
parent | 6a65f2b1e479f268489b51a004b6c153c634c68a (diff) | |
download | ruby-b309975a913d371ca0359214ea338919ed6ba48d.tar.gz |
Revert r63030
* array.c (rb_ary_collect): no longer splat sole array for lambda.
[ruby-core:89734] [Bug #15285]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | array.c | 2 | ||||
-rw-r--r-- | test/ruby/test_array.rb | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -3010,7 +3010,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_force_blockarg(RARRAY_AREF(ary, i))); + rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i))); } return collect; } diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 1b102c4658..aaf3eca58c 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -549,7 +549,9 @@ class TestArray < Test::Unit::TestCase assert_kind_of Enumerator, @cls[1, 2, 3].collect - assert_equal([[1, 2, 3]], [[1, 2, 3]].collect(&->(a, b, c) {[a, b, c]})) + assert_raise(ArgumentError) { + assert_equal([[1, 2, 3]], [[1, 2, 3]].collect(&->(a, b, c) {[a, b, c]})) + } end # also update map! |