From e18b817b1f0a4c318f1f0fe54fceaa5cbc85e8ab Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Wed, 22 Jan 2020 09:18:08 -0800
Subject: [PATCH] Make taint warnings non-verbose instead of verbose

---
 error.c                 |  4 ++--
 ext/pathname/pathname.c |  4 ++--
 hash.c                  |  2 +-
 object.c                | 14 +++++++-------
 string.c                |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/error.c b/error.c
index 1690658b8c..1702a709b4 100644
--- a/error.c
+++ b/error.c
@@ -3035,14 +3035,14 @@ rb_check_frozen(VALUE obj)
 void
 rb_error_untrusted(VALUE obj)
 {
-    rb_warning("rb_error_untrusted is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("rb_error_untrusted is deprecated and will be removed in Ruby 3.2.");
 }
 
 #undef rb_check_trusted
 void
 rb_check_trusted(VALUE obj)
 {
-    rb_warning("rb_check_trusted is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("rb_check_trusted is deprecated and will be removed in Ruby 3.2.");
 }
 
 void
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index 15f80d487e..e511560500 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -138,7 +138,7 @@ path_freeze(VALUE self)
 static VALUE
 path_taint(VALUE self)
 {
-    rb_warning("Pathname#taint is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("Pathname#taint is deprecated and will be removed in Ruby 3.2.");
     return self;
 }
 
@@ -151,7 +151,7 @@ path_taint(VALUE self)
 static VALUE
 path_untaint(VALUE self)
 {
-    rb_warning("Pathname#untaint is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("Pathname#untaint is deprecated and will be removed in Ruby 3.2.");
     return self;
 }
 
diff --git a/hash.c b/hash.c
index a1b57cee24..6823bae828 100644
--- a/hash.c
+++ b/hash.c
@@ -4968,7 +4968,7 @@ env_fetch(int argc, VALUE *argv, VALUE _)
 int
 rb_env_path_tainted(void)
 {
-    rb_warning("rb_env_path_tainted is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("rb_env_path_tainted is deprecated and will be removed in Ruby 3.2.");
     return 0;
 }
 
diff --git a/object.c b/object.c
index 0080c351a6..bfce958a72 100644
--- a/object.c
+++ b/object.c
@@ -1216,7 +1216,7 @@ rb_obj_dummy1(VALUE _x, VALUE _y)
 VALUE
 rb_obj_tainted(VALUE obj)
 {
-    rb_warning("Object#tainted? is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("Object#tainted? is deprecated and will be removed in Ruby 3.2.");
     return Qfalse;
 }
 
@@ -1230,7 +1230,7 @@ rb_obj_tainted(VALUE obj)
 VALUE
 rb_obj_taint(VALUE obj)
 {
-    rb_warning("Object#taint is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("Object#taint is deprecated and will be removed in Ruby 3.2.");
     return obj;
 }
 
@@ -1245,7 +1245,7 @@ rb_obj_taint(VALUE obj)
 VALUE
 rb_obj_untaint(VALUE obj)
 {
-    rb_warning("Object#untaint is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("Object#untaint is deprecated and will be removed in Ruby 3.2.");
     return obj;
 }
 
@@ -1259,7 +1259,7 @@ rb_obj_untaint(VALUE obj)
 VALUE
 rb_obj_untrusted(VALUE obj)
 {
-    rb_warning("Object#untrusted? is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("Object#untrusted? is deprecated and will be removed in Ruby 3.2.");
     return Qfalse;
 }
 
@@ -1273,7 +1273,7 @@ rb_obj_untrusted(VALUE obj)
 VALUE
 rb_obj_untrust(VALUE obj)
 {
-    rb_warning("Object#untrust is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("Object#untrust is deprecated and will be removed in Ruby 3.2.");
     return obj;
 }
 
@@ -1288,7 +1288,7 @@ rb_obj_untrust(VALUE obj)
 VALUE
 rb_obj_trust(VALUE obj)
 {
-    rb_warning("Object#trust is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("Object#trust is deprecated and will be removed in Ruby 3.2.");
     return obj;
 }
 
@@ -1299,7 +1299,7 @@ rb_obj_trust(VALUE obj)
 void
 rb_obj_infect(VALUE victim, VALUE carrier)
 {
-    rb_warning("rb_obj_infect is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("rb_obj_infect is deprecated and will be removed in Ruby 3.2.");
 }
 
 /**
diff --git a/string.c b/string.c
index ca425e9780..b4b365ad4b 100644
--- a/string.c
+++ b/string.c
@@ -910,14 +910,14 @@ rb_enc_str_new_static(const char *ptr, long len, rb_encoding *enc)
 VALUE
 rb_tainted_str_new(const char *ptr, long len)
 {
-    rb_warning("rb_tainted_str_new is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("rb_tainted_str_new is deprecated and will be removed in Ruby 3.2.");
     return rb_str_new(ptr, len);
 }
 
 VALUE
 rb_tainted_str_new_cstr(const char *ptr)
 {
-    rb_warning("rb_tainted_str_new_cstr is deprecated and will be removed in Ruby 3.2.");
+    rb_warn("rb_tainted_str_new_cstr is deprecated and will be removed in Ruby 3.2.");
     return rb_str_new_cstr(ptr);
 }