summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/ruby/test_keyword.rb6
-rw-r--r--version.h2
-rw-r--r--vm_args.c11
3 files changed, 1 insertions, 18 deletions
diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb
index 84a5cfec66..8e2da53bdf 100644
--- a/test/ruby/test_keyword.rb
+++ b/test/ruby/test_keyword.rb
@@ -520,12 +520,6 @@ class TestKeywordArguments < Test::Unit::TestCase
assert_equal(:ok, m.f(*a, **o), '[ruby-core:83638] [Bug #10856]')
o = {a: 42}
- assert_warning(/splat keyword/, 'splat to mandatory') do
- assert_equal({a: 42}, m.f1(**o))
- end
- assert_warning(/splat keyword/) do
- assert_equal({a: 42}, m.f2(**o), '[ruby-core:82280] [Bug #13791]')
- end
assert_warning('', 'splat to kwrest') do
assert_equal({a: 42}, m.f3(**o))
end
diff --git a/version.h b/version.h
index bcfe99aff6..a4964a74cb 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.7"
#define RUBY_RELEASE_DATE "2021-02-28"
-#define RUBY_PATCHLEVEL 158
+#define RUBY_PATCHLEVEL 159
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 2
diff --git a/vm_args.c b/vm_args.c
index 299ed16aa8..2e70ed3fcf 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -685,17 +685,6 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co
else if (!NIL_P(keyword_hash) && RHASH_SIZE(keyword_hash) > 0) {
argument_kw_error(ec, iseq, "unknown", rb_hash_keys(keyword_hash));
}
- else if (kw_splat && NIL_P(keyword_hash)) {
- if (RTEST(ruby_verbose)) {
- VALUE path = rb_iseq_path(iseq);
- VALUE line = rb_iseq_first_lineno(iseq);
- VALUE label = rb_iseq_label(iseq);
- rb_compile_warning(NIL_P(path) ? NULL : RSTRING_PTR(path), FIX2INT(line),
- "in `%s': the last argument was passed as a single Hash",
- NIL_P(label) ? NULL : RSTRING_PTR(label));
- rb_warning("although a splat keyword arguments here");
- }
- }
if (iseq->body->param.flags.has_block) {
if (iseq->body->local_iseq == iseq) {