From b309975a913d371ca0359214ea338919ed6ba48d Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 22 Nov 2018 09:18:40 +0000
Subject: [PATCH] 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
---
 array.c                 | 2 +-
 test/ruby/test_array.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/array.c b/array.c
index b0cb48dc89..fb95f8f8d6 100644
--- a/array.c
+++ b/array.c
@@ -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!