diff options
author | Yusuke Endoh <mame@ruby-lang.org> | 2019-12-20 19:41:15 +0900 |
---|---|---|
committer | Yusuke Endoh <mame@ruby-lang.org> | 2019-12-20 19:41:15 +0900 |
commit | f7aee584987e24768670e96b1455ed1193f91ef2 (patch) | |
tree | 6f6465e61af7bc2581abdaad09ac8e5786975d6a /test/ruby/test_proc.rb | |
parent | 2b2030f265e4ec0782de9c8dd9f8828a1a0af1b5 (diff) |
vm_args.c: rephrase the warning message of keyword argument separation
(old)
test.rb:4: warning: The last argument is used as the keyword parameter
test.rb:1: warning: for `foo' defined here; maybe ** should be added to the call?
(new)
test.rb:4: warning: The last argument is used as keyword parameters; maybe ** should be added to the call
test.rb:1: warning: The called method `foo' is defined here
Diffstat (limited to 'test/ruby/test_proc.rb')
-rw-r--r-- | test/ruby/test_proc.rb | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index ea3fe823f0..cd5c4458b0 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1485,27 +1485,27 @@ class TestProcKeywords < Test::Unit::TestCase g = ->(kw) { kw.merge(:a=>2) } assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1515,27 +1515,27 @@ class TestProcKeywords < Test::Unit::TestCase f = ->(**kw) { kw.merge(:a=>1) }.method(:call) g = ->(kw) { kw.merge(:a=>2) }.method(:call) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1549,27 +1549,27 @@ class TestProcKeywords < Test::Unit::TestCase def g.<<(f) to_proc << f end def g.>>(f) to_proc >> f end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call(a: 3)[:a]) end assert_equal(2, (f >> g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end assert_equal(2, (g << f).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call(a: 3)[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for method/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method is defined here/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end - assert_warn(/The keyword argument is passed as the last hash parameter.*for `call'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The called method `call'/m) do assert_equal(1, (f << g).call(**{})[:a]) end assert_equal(2, (f >> g).call(**{})[:a]) @@ -1582,27 +1582,27 @@ class TestProcKeywords < Test::Unit::TestCase def g.>>(f) to_proc >> f end assert_equal(1, (f << g).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (f >> g).call(a: 3)[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(1, (f << g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (f >> g).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (g << f).call(a: 3)[:a]) end assert_equal(1, (g >> f).call(a: 3)[:a]) - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (g << f).call({a: 3})[:a]) end - assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(1, (g >> f).call({a: 3})[:a]) end assert_equal(1, (f << g).call(**{})[:a]) - assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as the keyword parameter.*for `call'/m) do + assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as keyword parameters.*The called method `call'/m) do assert_equal(2, (f >> g).call(**{})[:a]) end end |