diff options
author | NARUSE, Yui <naruse@airemix.jp> | 2019-12-04 01:26:27 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2019-12-04 06:40:54 +0900 |
commit | a705f6472c3e34422776d886bbc9f98676d8c0eb (patch) | |
tree | dac18a8e5a29648e65b6e1c948a9a2248bc92ace | |
parent | 34a66b1f36e9a065cf8433598b3fce03ce2c711e (diff) | |
download | ruby-a705f6472c3e34422776d886bbc9f98676d8c0eb.tar.gz |
Revert "Improve warning message"
This reverts commit 31110d820cc1258cbc84b46ecc65b254c7d5529a.
-rw-r--r-- | re.c | 4 | ||||
-rw-r--r-- | spec/ruby/core/regexp/match_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -3300,7 +3300,7 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re) } if (NIL_P(str)) { - rb_warn("given argument is nil; this will raise a TypeError in the next release"); + rb_warn("given argument is nil"); } pos = reg_match_pos(re, &str, pos); if (pos < 0) { @@ -3348,7 +3348,7 @@ rb_reg_match_p(VALUE re, VALUE str, long pos) int tmpreg; if (NIL_P(str)) { - rb_warn("given argument is nil; this will raise a TypeError in the next release"); + rb_warn("given argument is nil"); return Qfalse; } str = SYMBOL_P(str) ? rb_sym2str(str) : StringValue(str); diff --git a/spec/ruby/core/regexp/match_spec.rb b/spec/ruby/core/regexp/match_spec.rb index 81d7c32898..f796febc86 100644 --- a/spec/ruby/core/regexp/match_spec.rb +++ b/spec/ruby/core/regexp/match_spec.rb @@ -104,7 +104,7 @@ describe "Regexp#match" do ruby_version_is "2.7"..."3.0" do it "warns the deprecation when the given argument is nil" do - -> { /foo/.match(nil) }.should complain(/given argument is nil; this will raise a TypeError in the next release/) + -> { /foo/.match(nil) }.should complain(/given argument is nil/) end end @@ -155,7 +155,7 @@ describe "Regexp#match?" do ruby_version_is "2.7"..."3.0" do it "warns the deprecation" do - -> { /./.match?(nil) }.should complain(/given argument is nil; this will raise a TypeError in the next release/) + -> { /./.match?(nil) }.should complain(/given argument is nil/) end end |