Skip to content

Commit 4849b36

Browse files
committed
update fatal deprecation messages with the new version scheme
1 parent d8fa2dd commit 4849b36

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
@@ -8287,7 +8287,7 @@ Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *idop, OP *arg)
82878287
}
82888288
else {
82898289
/* OK let's at least warn */
8290-
deprecate_fatal_in(WARN_DEPRECATED__SUBSEQUENT_USE_VERSION, "5.44",
8290+
deprecate_fatal_in(WARN_DEPRECATED__SUBSEQUENT_USE_VERSION, "44",
82918291
"Changing use VERSION while another use VERSION is in scope");
82928292
}
82938293
}

pp_ctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3585,7 +3585,7 @@ PP(pp_goto)
35853585
: 1;
35863586
if (enterops[i])
35873587
deprecate_fatal_in(WARN_DEPRECATED__GOTO_CONSTRUCT,
3588-
"5.42",
3588+
"42",
35893589
"Use of \"goto\" to jump into a construct");
35903590
}
35913591

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
@@ -2249,7 +2249,7 @@ use warnings;
22492249
use v5.12;
22502250
use v5.20;
22512251
EXPECT
2252-
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 3.
2252+
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 3.
22532253
########
22542254
use warnings;
22552255
use v5.8;
@@ -2260,7 +2260,7 @@ use warnings;
22602260
use v5.10;
22612261
use v5.8;
22622262
EXPECT
2263-
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 3.
2263+
Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 3.
22642264
########
22652265
use warnings;
22662266
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
@@ -18,7 +18,7 @@ our $TODO;
1818
my $deprecated = 0;
1919

2020
local $SIG{__WARN__} = sub {
21-
if ($_[0] =~ m/jump into a construct.*?, and will become fatal in Perl 5\.42/) {
21+
if ($_[0] =~ m/jump into a construct.*?, and will become fatal in Perl 42/) {
2222
$deprecated++;
2323
}
2424
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)