diff --git a/op.c b/op.c index 1b5c11c58bc1..0cb664dc29d0 100644 --- a/op.c +++ b/op.c @@ -8287,7 +8287,7 @@ Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *idop, OP *arg) } else { /* OK let's at least warn */ - deprecate_fatal_in(WARN_DEPRECATED__SUBSEQUENT_USE_VERSION, "5.44", + deprecate_fatal_in(WARN_DEPRECATED__SUBSEQUENT_USE_VERSION, "44", "Changing use VERSION while another use VERSION is in scope"); } } diff --git a/pp_ctl.c b/pp_ctl.c index 90404895d379..3ca1214909bd 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -3585,7 +3585,7 @@ PP(pp_goto) : 1; if (enterops[i]) deprecate_fatal_in(WARN_DEPRECATED__GOTO_CONSTRUCT, - "5.42", + "42", "Use of \"goto\" to jump into a construct"); } diff --git a/t/lib/feature/implicit b/t/lib/feature/implicit index d8e186af2648..c11ad9bbd081 100644 --- a/t/lib/feature/implicit +++ b/t/lib/feature/implicit @@ -69,7 +69,7 @@ evalbytes "say 'yes'"; use 5.014; evalbytes; EXPECT -Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 8. +Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 8. say sub yes evalbytes sub @@ -81,7 +81,7 @@ print 'ss' =~ /$sharp_s/i ? "ok\n" : "nok\n"; use v5.14; print 'ss' =~ /$sharp_s/i ? "ok\n" : "nok\n"; EXPECT -Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 5. +Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 5. nok ok ######## @@ -93,6 +93,6 @@ print eval "use utf8; q|$long_s|" eq "\x{17f}" ? "ok\n" : "nok\n"; use v5.15; print eval "use utf8; q|$long_s|" eq $long_s ? "ok\n" : "nok\n"; EXPECT -Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 6. +Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 6. ok ok diff --git a/t/lib/warnings/op b/t/lib/warnings/op index cf067d9e5378..2d3207a68d19 100644 --- a/t/lib/warnings/op +++ b/t/lib/warnings/op @@ -2249,7 +2249,7 @@ use warnings; use v5.12; use v5.20; EXPECT -Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 3. +Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 3. ######## use warnings; use v5.8; @@ -2260,7 +2260,7 @@ use warnings; use v5.10; use v5.8; EXPECT -Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 5.44 at - line 3. +Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at - line 3. ######## use warnings; use v5.12; diff --git a/t/lib/warnings/pp_ctl b/t/lib/warnings/pp_ctl index c67f7fe9471d..ed3ef7d1fddc 100644 --- a/t/lib/warnings/pp_ctl +++ b/t/lib/warnings/pp_ctl @@ -251,7 +251,7 @@ EXPECT use warnings; eval 'use 5.012; use 5.14.0'; EXPECT -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. +Changing use VERSION while another use VERSION is in scope is deprecated, and will become fatal in Perl 44 at (eval 1) line 1. ######## # SKIP ? !$Config{default_inc_includes_dot} # NAME check warning for do with no . in @INC diff --git a/t/op/goto.t b/t/op/goto.t index c2a16fe7d1b1..0c2090f9c95e 100644 --- a/t/op/goto.t +++ b/t/op/goto.t @@ -18,7 +18,7 @@ our $TODO; my $deprecated = 0; local $SIG{__WARN__} = sub { - if ($_[0] =~ m/jump into a construct.*?, and will become fatal in Perl 5\.42/) { + if ($_[0] =~ m/jump into a construct.*?, and will become fatal in Perl 42/) { $deprecated++; } else { warn $_[0] } diff --git a/t/porting/deprecation.t b/t/porting/deprecation.t index 67f759e5c6c1..044c98d7a0c1 100644 --- a/t/porting/deprecation.t +++ b/t/porting/deprecation.t @@ -103,7 +103,7 @@ if (-e ".git") { goto LABEL; DONE: like($warning, - qr/Use of "goto" to jump into a construct is deprecated, and will become fatal in Perl 5\.42/, + qr/Use of "goto" to jump into a construct is deprecated, and will become fatal in Perl 42/, "Got expected deprecation warning"); } # Test that we can silence deprecation warnings with "no warnings 'deprecated'"