kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Improve warning message

Browse source 
https://github.com/ruby/ruby/pull/2637#discussion_r341812475
This commit is contained in:
Kenichi Kamiya 2019-11-03 09:24:55 +09:00 committed by Benoit Daloze
parent 452bee3ee8
commit 31110d820c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
re.c
View file

@ -3324,7 +3324,7 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re)
}
if (NIL_P(str)) {
rb_warn("given argument is nil");
rb_warn("given argument is nil; this will raise a TypeError in the next release");
}
pos = reg_match_pos(re, &str, pos);
if (pos < 0) {
@ -3372,7 +3372,7 @@ rb_reg_match_p(VALUE re, VALUE str, long pos)
int tmpreg;
if (NIL_P(str)) {
rb_warn("given argument is nil");
rb_warn("given argument is nil; this will raise a TypeError in the next release");
return Qfalse;
}
str = SYMBOL_P(str) ? rb_sym2str(str) : StringValue(str);

4
spec/ruby/core/regexp/match_spec.rb
View file

@ -100,7 +100,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/)
-> { /foo/.match(nil) }.should complain(/given argument is nil; this will raise a TypeError in the next release/)
end
end
@ -151,7 +151,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/)
-> { /./.match?(nil) }.should complain(/given argument is nil; this will raise a TypeError in the next release/)
end
end