From 6424d316b993ecceb6f583ae476096274e304788 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 30 Aug 2019 17:33:33 -0700 Subject: [PATCH] Remove a verbose warning that is no longer needed This warns about a case that we will continue to support. --- test/ruby/test_keyword.rb | 6 +++--- vm_args.c | 11 ----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 4361b14f91..ff95bc5354 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -596,10 +596,10 @@ class TestKeywordArguments < Test::Unit::TestCase assert_equal({}, m.f1(*a, o), '[ruby-core:91825] [Bug #10856]') o = {a: 42} - assert_warning(/splat keyword/, 'splat to mandatory') do + assert_warning('', 'splat to mandatory') do assert_equal({a: 42}, m.f1(**o)) end - assert_warning(/splat keyword/) do + assert_warning('') do assert_equal({a: 42}, m.f2(**o), '[ruby-core:82280] [Bug #13791]') end assert_warning('', 'splat to kwrest') do @@ -609,7 +609,7 @@ class TestKeywordArguments < Test::Unit::TestCase assert_equal([{a: 42}], m.f4(**o)) end - assert_warning(/splat keyword/) do + assert_warning('') do assert_equal({a: 42}, m.f2("a".to_sym => 42), '[ruby-core:82291] [Bug #13793]') end diff --git a/vm_args.c b/vm_args.c index 69be10a2b6..cd55f7d01d 100644 --- a/vm_args.c +++ b/vm_args.c @@ -854,17 +854,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 && arg_setup_type == arg_setup_method) { 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) {