summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2021-11-23 14:20:49 +0900
committernagachika <nagachika@ruby-lang.org>2021-11-23 14:52:30 +0900
commitaadb8cad563ca23e54a775d4fee936a07466112f (patch)
treeda2498a64706614b9608a99e78e2ee0f1fa591f0
parentb6f87d527f59257f07ba6774addaefdedee4fcde (diff)
merge revision(s) e83c02a768af61cd0890a75e90bcae1119d8bd93: [Backport #18289]
Delegate keywords from Enumerable#to_a to #each Fixes [Bug #18289] --- enum.c | 2 +- test/ruby/test_enum.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
-rw-r--r--enum.c2
-rw-r--r--test/ruby/test_enum.rb5
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/enum.c b/enum.c
index 9c2242c75a..b1a617d585 100644
--- a/enum.c
+++ b/enum.c
@@ -682,7 +682,7 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
{
VALUE ary = rb_ary_new();
- rb_block_call(obj, id_each, argc, argv, collect_all, ary);
+ rb_block_call_kw(obj, id_each, argc, argv, collect_all, ary, RB_PASS_CALLED_KEYWORDS);
return ary;
}
diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb
index 3d85118882..f246828e61 100644
--- a/test/ruby/test_enum.rb
+++ b/test/ruby/test_enum.rb
@@ -134,6 +134,11 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal([1, 2, 3, 1, 2], @obj.to_a)
end
+ def test_to_a_keywords
+ def @obj.each(foo:) yield foo end
+ assert_equal([1], @obj.to_a(foo: 1))
+ end
+
def test_to_a_size_symbol
sym = Object.new
class << sym
diff --git a/version.h b/version.h
index 5f7bdee1ca..8a0f53d9b9 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 151
+#define RUBY_PATCHLEVEL 152
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 11