Skip to content

Commit 3083df4

Browse files
bookericherman
authored andcommitted
update fatal deprecation messages with the new version scheme
1 parent 6464c04 commit 3083df4

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

op.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8440,7 +8440,7 @@ Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *idop, OP *arg)
84408440
}
84418441
else {
84428442
/* OK let's at least warn */
8443-
deprecate_fatal_in(WARN_DEPRECATED__SUBSEQUENT_USE_VERSION, "5.44",
8443+
deprecate_fatal_in(WARN_DEPRECATED__SUBSEQUENT_USE_VERSION, "44",
84448444
"Changing use VERSION while another use VERSION is in scope");
84458445
}
84468446
}

pp_ctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3653,7 +3653,7 @@ PP(pp_goto)
36533653
: 1;
36543654
if (enterops[i])
36553655
deprecate_fatal_in(WARN_DEPRECATED__GOTO_CONSTRUCT,
3656-
"5.42",
3656+
"42",
36573657
"Use of \"goto\" to jump into a construct");
36583658
}
36593659

t/lib/feature/implicit

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ evalbytes "say 'yes'";
6969
use 5.014;
7070
evalbytes;
7171
EXPECT
72-
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 8.
72+
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 8.
7373
say sub
7474
yes
7575
evalbytes sub
@@ -81,7 +81,7 @@ print 'ss' =~ /$sharp_s/i ? "ok\n" : "nok\n";
8181
use v5.14;
8282
print 'ss' =~ /$sharp_s/i ? "ok\n" : "nok\n";
8383
EXPECT
84-
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 5.
84+
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 5.
8585
nok
8686
ok
8787
########
@@ -93,6 +93,6 @@ print eval "use utf8; q|$long_s|" eq "\x{17f}" ? "ok\n" : "nok\n";
9393
use v5.15;
9494
print eval "use utf8; q|$long_s|" eq $long_s ? "ok\n" : "nok\n";
9595
EXPECT
96-
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 6.
96+
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 6.
9797
ok
9898
ok

t/lib/warnings/op

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,7 @@ use warnings;
22612261
use v5.12;
22622262
use v5.20;
22632263
EXPECT
2264-
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 3.
2264+
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 3.
22652265
########
22662266
use warnings;
22672267
use v5.8;
@@ -2272,7 +2272,7 @@ use warnings;
22722272
use v5.10;
22732273
use v5.8;
22742274
EXPECT
2275-
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 3.
2275+
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 3.
22762276
########
22772277
use warnings;
22782278
use v5.12;

t/lib/warnings/pp_ctl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ EXPECT
251251
use warnings;
252252
eval 'use 5.012; use 5.14.0';
253253
EXPECT
254-
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at (eval 1) line 1.
254+
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at (eval 1) line 1.
255255
########
256256
# SKIP ? !$Config{default_inc_includes_dot}
257257
# NAME check warning for do with no . in @INC

t/op/goto.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ our $TODO;
1919
my $deprecated = 0;
2020

2121
local $SIG{__WARN__} = sub {
22-
if ($_[0] =~ m/jump into a construct.*?, and will become fatal in Perl 5\.42/) {
22+
if ($_[0] =~ m/jump into a construct.*?, and will become fatal in Perl 42/) {
2323
$deprecated++;
2424
}
2525
else { warn $_[0] }

t/porting/deprecation.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ if (-e ".git") {
103103
goto LABEL;
104104
DONE:
105105
like($warning,
106-
qr/Use of "goto" to jump into a construct is deprecated, and will become fatal in Perl 5\.42/,
106+
qr/Use of "goto" to jump into a construct is deprecated, and will become fatal in Perl 42/,
107107
"Got expected deprecation warning");
108108
}
109109
# Test that we can silence deprecation warnings with "no warnings 'deprecated'"

0 commit comments

Comments
 (0)