diff options
author | Jeremy Evans <[email protected]> | 2020-01-22 09:18:08 -0800 |
---|---|---|
committer | Jeremy Evans <[email protected]> | 2020-01-22 11:19:13 -0800 |
commit | e18b817b1f0a4c318f1f0fe54fceaa5cbc85e8ab (patch) | |
tree | f9f07e27da476af8794414176f4bf084c17e233a | |
parent | 28d31ead34baff1c4abc0d7d902ef4bc1d576fb2 (diff) |
Make taint warnings non-verbose instead of verbose
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2856
-rw-r--r-- | error.c | 4 | ||||
-rw-r--r-- | ext/pathname/pathname.c | 4 | ||||
-rw-r--r-- | hash.c | 2 | ||||
-rw-r--r-- | object.c | 14 | ||||
-rw-r--r-- | string.c | 4 |
5 files changed, 14 insertions, 14 deletions
@@ -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; } @@ -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; } @@ -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."); } /** @@ -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); } |