https://git.ruby-lang.org/ruby.git/commit/?id=819b604037

From 819b604037c317d2b53a1aaca67aef25da2d5ec9 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lafortune <github@m...>
Date: Mon, 23 Dec 2019 02:34:16 -0500
Subject: Reword keyword arguments warning messages to convey these are
 deprecation warnings


diff --git a/class.c b/class.c
index cceba6a..c866d1d 100644
--- a/class.c
+++ b/class.c
@@ -2051,7 +2051,7 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st https://github.com/ruby/ruby/blob/trunk/class.c#L2051
                     if (!keyword_given && !last_hash_keyword) {
                         /* Warn if treating positional as keyword, as in Ruby 3,
                            this will be an error */
-                        rb_warn("The last argument is used as keyword parameters");
+                        rb_warn("Using the last argument as keyword parameters is deprecated");
                     }
                     argc--;
                 }
@@ -2066,7 +2066,7 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st https://github.com/ruby/ruby/blob/trunk/class.c#L2066
         }
         else if (arg->f_hash && keyword_given && arg->n_mand == argc) {
             /* Warn if treating keywords as positional, as in Ruby 3, this will be an error */
-            rb_warn("The keyword argument is passed as the last hash parameter");
+            rb_warn("Passing the keyword argument as the last hash parameter is deprecated");
         }
     }
     if (arg->f_hash && arg->n_mand == argc+1 && empty_keyword_given) {
@@ -2075,7 +2075,7 @@ rb_scan_args_parse(int kw_flag, int argc, const VALUE *argv, const char *fmt, st https://github.com/ruby/ruby/blob/trunk/class.c#L2075
         ptr[argc] = rb_hash_new();
         argc++;
         *(&argv) = ptr;
-        rb_warn("The keyword argument is passed as the last hash parameter");
+        rb_warn("Passing the keyword argument as the last hash parameter is deprecated");
     }
 
     arg->argc = argc;
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 57b5075..9b7c984 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -2569,7 +2569,7 @@ rb_scan_args_set(int argc, const VALUE *argv, https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L2569
                     if (!keyword_given) {
                         /* Warn if treating positional as keyword, as in Ruby 3,
                            this will be an error */
-                        rb_warn("The last argument is used as keyword parameters");
+                        rb_warn("Using the last argument as keyword parameters is deprecated");
                     }
                     argc--;
                 }
@@ -2584,7 +2584,7 @@ rb_scan_args_set(int argc, const VALUE *argv, https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L2584
         }
         else if (f_hash && keyword_given && n_mand == argc) {
             /* Warn if treating keywords as positional, as in Ruby 3, this will be an error */
-            rb_warn("The keyword argument is passed as the last hash parameter");
+            rb_warn("Passing the keyword argument as the last hash parameter is deprecated");
         }
     }
     if (f_hash && n_mand > 0 && n_mand == argc+1 && empty_keyword_given) {
@@ -2593,7 +2593,7 @@ rb_scan_args_set(int argc, const VALUE *argv, https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L2593
         ptr[argc] = rb_hash_new();
         argc++;
         *(&argv) = ptr;
-        rb_warn("The keyword argument is passed as the last hash parameter");
+        rb_warn("Passing the keyword argument as the last hash parameter is deprecated");
     }
 
 
diff --git a/test/-ext-/funcall/test_passing_block.rb b/test/-ext-/funcall/test_passing_block.rb
index dd67b7c..d116487 100644
--- a/test/-ext-/funcall/test_passing_block.rb
+++ b/test/-ext-/funcall/test_passing_block.rb
@@ -29,7 +29,7 @@ class TestFuncall < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/funcall/test_passing_block.rb#L29
     assert_equal([[{}], {}], Relay.with_funcall_passing_block_kw(2, {}, **{}, &block))
     assert_equal([[], {a: 1}], Relay.with_funcall_passing_block_kw(3, a: 1, &block))
     assert_equal([[{a: 1}], {}], Relay.with_funcall_passing_block_kw(3, {a: 1}, **{}, &block))
-    assert_warn(/warning: The keyword argument is passed as the last hash parameter.*The called method is defined here/m) do
+    assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated.*The called method is defined here/m) do
       assert_equal({}, Relay.with_funcall_passing_block_kw(3, **{}, &->(a){a}))
     end
   end
@@ -53,7 +53,7 @@ class TestFuncall < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/funcall/test_passing_block.rb#L53
     assert_equal([[], {a: 1}], Relay.with_funcallv_public_kw(o, :foo, 3, a: 1))
     assert_equal([[{a: 1}], {}], Relay.with_funcallv_public_kw(o, :foo, 3, {a: 1}, **{}))
     assert_raise(NoMethodError) { Relay.with_funcallv_public_kw(o, :bar, 3, {a: 1}, **{}) }
-    assert_warn(/warning: The keyword argument is passed as the last hash parameter.*The called method `baz'/m) do
+    assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated.*The called method `baz'/m) do
       assert_equal({}, Relay.with_funcallv_public_kw(o, :baz, 3, **{}))
     end
   end
@@ -64,11 +64,11 @@ class TestFuncall < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/funcall/test_passing_block.rb#L64
     assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(1, [{a: 1}], &block))
     assert_equal([[1], {a: 1}], Relay.with_yield_splat_kw(1, [1, {a: 1}], &block))
     assert_equal([[{}], {}], Relay.with_yield_splat_kw(2, [{}], **{}, &block))
-    assert_warn(/warning: The last argument is used as keyword parameters.*The called method is defined here/m) do
+    assert_warn(/warning: Using the last argument as keyword parameters is deprecated.*The called method is defined here/m) do
       assert_equal([[], {a: 1}], Relay.with_yield_splat_kw(3, [{a: 1}], &block))
     end
     assert_equal([[{a: 1}], {}], Relay.with_yield_splat_kw(3, [{a: 1}], **{}, &block))
-    assert_warn(/warning: The keyword argument is passed as the last hash parameter/) do
+    assert_warn(/warning: Passing the keyword argument as the last hash parameter is deprecated/) do
       assert_equal({}, Relay.with_yield_splat_kw(3, [], **{}, &->(a){a}))
     end
   end
diff --git a/test/-ext-/test_scan_args.rb b/test/-ext-/test_scan_args.rb
index 949495d..dda016d 100644
--- a/test/-ext-/test_scan_args.rb
+++ b/test/-ext-/test_scan_args.rb
@@ -93,12 +93,12 @@ class TestScanArgs < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/test_scan_args.rb#L93
     assert_equal([1, "a", nil], Bug::ScanArgs.lead_hash("a"))
     assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash("a", "b")}
     assert_equal([1, "a", {b: 1}], Bug::ScanArgs.lead_hash("a", b: 1))
-    assert_warn(/The keyword argument is passed as the last hash parameter/) do
+    assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do
       assert_equal([1, {b: 1}, nil], Bug::ScanArgs.lead_hash(b: 1))
     end
     assert_equal([1, {"a"=>0, b: 1}, nil], Bug::ScanArgs.lead_hash({"a"=>0, b: 1}, **{}))
     assert_raise(ArgumentError) {Bug::ScanArgs.lead_hash(1, {"a"=>0, b: 1}, **{})}
-    assert_warn(/The keyword argument is passed as the last hash parameter/) do
+    assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do
       assert_equal([1, {}, nil], Bug::ScanArgs.lead_hash(**{}))
     end
   end
@@ -120,7 +120,7 @@ class TestScanArgs < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/test_scan_args.rb#L120
     assert_equal([2, "a", "b", nil], Bug::ScanArgs.lead_opt_hash("a", "b"))
     assert_equal([1, "a", nil, {c: 1}], Bug::ScanArgs.lead_opt_hash("a", c: 1))
     assert_equal([2, "a", "b", {c: 1}], Bug::ScanArgs.lead_opt_hash("a", "b", c: 1))
-    assert_warn(/The keyword argument is passed as the last hash parameter/) do
+    assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do
       assert_equal([1, {c: 1}, nil, nil], Bug::ScanArgs.lead_opt_hash(c: 1))
     end
     assert_raise(ArgumentError) {Bug::ScanArgs.lead_opt_hash("a", "b", "c")}
@@ -145,7 +145,7 @@ class TestScanArgs < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/test_scan_args.rb#L145
     assert_equal([2, "a", ["b"], nil], Bug::ScanArgs.lead_var_hash("a", "b"))
     assert_equal([2, "a", ["b"], {c: 1}], Bug::ScanArgs.lead_var_hash("a", "b", c: 1))
     assert_equal([1, "a", [], {c: 1}], Bug::ScanArgs.lead_var_hash("a", c: 1))
-    assert_warn(/The keyword argument is passed as the last hash parameter/) do
+    assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do
       assert_equal([1, {c: 1}, [], nil], Bug::ScanArgs.lead_var_hash(c: 1))
     end
     assert_equal([3, "a", ["b", "c"], nil], Bug::ScanArgs.lead_var_hash("a", "b", "c"))
@@ -173,7 +173,7 @@ class TestScanArgs < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/test_scan_args.rb#L173
     assert_equal([2, "a", "b", [], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b"))
     assert_equal([2, "a", "b", [], {c: 1}], Bug::ScanArgs.lead_opt_var_hash("a", "b", c: 1))
     assert_equal([1, "a", nil, [], {c: 1}], Bug::ScanArgs.lead_opt_var_hash("a", c: 1))
-    assert_warn(/The keyword argument is passed as the last hash parameter/) do
+    assert_warn(/Passing the keyword argument as the last hash parameter is deprecated/) do
       assert_equal([1, {c: 1}, nil, [], nil], Bug::ScanArgs.lead_opt_var_hash(c: 1))
     end
     assert_equal([3, "a", "b", ["c"], nil], Bug::ScanArgs.lead_opt_var_hash("a", "b", "c"))
@@ -189,7 +189,7 @@ class TestScanArgs < Test::Unit::TestCase https://github.com/ruby/rub (... truncated)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/