aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--re.c4
-rw-r--r--spec/ruby/core/regexp/match_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/re.c b/re.c
index 11f4679721..e10901b83d 100644
--- a/re.c
+++ b/re.c
@@ -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