aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNAKAMURA Usaku <usa@ruby-lang.org>2021-11-24 19:38:18 +0900
committerNAKAMURA Usaku <usa@ruby-lang.org>2021-11-24 19:38:18 +0900
commitb1985629565c3c54b1a64d6faf213e8144857515 (patch)
tree1ee86b30895b440285bcd1a4a536552d2773d13c
parent1d4e037a8011ac05b4ede8cdf8263515ba0e095e (diff)
downloadruby-b1985629565c3c54b1a64d6faf213e8144857515.tar.gz
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 fb0ced57a1..de4d22d92e 100644
--- a/enum.c
+++ b/enum.c
@@ -648,7 +648,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 ebb7e78381..9f6f19b669 100644
--- a/test/ruby/test_enum.rb
+++ b/test/ruby/test_enum.rb
@@ -114,6 +114,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 315eda1376..99b7846042 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 201
+#define RUBY_PATCHLEVEL 202
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 11