fix use tests: all versions up to 41.7 are valid

use-ing these versions will load the :5.41 bundle, since that's
the highest one before them.

This also means that we don't need to give hints about why
'use 5.6' or 'use 5.10' fail, because they won't anymore.

Author: book

pp_ctl.c

@@ -4478,45 +4478,12 @@ S_require_version(pTHX_ SV *sv)
     }
     else {
         if ( vcmp(sv,PL_patchlevel) > 0 ) {
-            I32 first = 0;
-            AV *lav;
             SV * const req = SvRV(sv);
-            SV * const pv = *hv_fetchs(MUTABLE_HV(req), "original", FALSE);
-
-            /* get the left hand term */
-            lav = AV_FROM_REF(*hv_fetchs(MUTABLE_HV(req), "version", FALSE));
-
-            first  = SvIV(*av_fetch(lav,0,0));
-            if (   first > (int)PERL_REVISION    /* probably 'use 6.0' */
-                || hv_exists(MUTABLE_HV(req), "qv", 2 ) /* qv style */
-                || av_count(lav) > 2             /* FP with > 3 digits */
-                || strstr(SvPVX(pv),".0")        /* FP with leading 0 */
-               ) {
-                DIE(aTHX_ "Perl %" SVf " required--this is only "
-                    "%" SVf ", stopped",
-                    SVfARG(sv_2mortal(vnormal(req))),
-                    SVfARG(sv_2mortal(vnormal(PL_patchlevel)))
-                );
-            }
-            else { /* probably 'use 5.10' or 'use 5.8' */
-                SV *hintsv;
-                I32 second = 0;
-
-                if (av_count(lav) > 1)
-                    second = SvIV(*av_fetch(lav,1,0));
-
-                second /= second >= 600  ? 100 : 10;
-                hintsv = Perl_newSVpvf(aTHX_ "v%d.%d.0",
-                                       (int)first, (int)second);
-                upg_version(hintsv, TRUE);
-
-                DIE(aTHX_ "Perl %" SVf " required (did you mean %" SVf "?)"
-                    "--this is only %" SVf ", stopped",
-                    SVfARG(sv_2mortal(vnormal(req))),
-                    SVfARG(sv_2mortal(vnormal(sv_2mortal(hintsv)))),
-                    SVfARG(sv_2mortal(vnormal(PL_patchlevel)))
-                );
-            }
+            DIE(aTHX_ "Perl %" SVf " required--this is only "
+                "%" SVf ", stopped",
+                SVfARG(sv_2mortal(vnormal(req))),
+                SVfARG(sv_2mortal(vnormal(PL_patchlevel)))
+            );
         }
     }
 

t/comp/use.t

@@ -6,7 +6,7 @@ BEGIN {
     $INC{"feature.pm"} = 1; # so we don't attempt to load feature.pm
 }
 
-print "1..87\n";
+print "1..88\n";
 
 # Can't require test.pl, as we're testing the use/require mechanism here.
 
@@ -87,7 +87,7 @@ eval q{ use v5.5.630; };
 is ($@, '');
 
 eval q{ use 10.0.2; };
-like ($@, qr/^\QPerl v10.0.2 required\E/);
+is ($@, '');
 
 eval "use 5.000";	# implicit semicolon
 is ($@, '');
@@ -96,41 +96,46 @@ eval "use 5.000;";
 is ($@, '');
 
 eval "use 6.000;";
-like ($@, qr/\QPerl v6.0.0 required--this is only $^V, stopped\E/);
+is ($@, '');
 
 eval "no 6.000;";
-is ($@, '');
+like ($@, qr/\QPerls since v6.0.0 too modern--this is $^V, stopped\E/);
 
 eval "no 5.000;";
 like ($@, qr/\QPerls since v5.0.0 too modern--this is $^V, stopped\E/);
 
 eval "use 5.6;";
-like ($@, qr/\QPerl v5.600.0 required (did you mean v5.6.0?)--this is only $^V, stopped\E/);
+is ($@, '');
 
 eval "use 5.8;";
-like ($@, qr/\QPerl v5.800.0 required (did you mean v5.8.0?)--this is only $^V, stopped\E/);
+is ($@, '');
 
 eval "use 5.9;";
-like ($@, qr/\QPerl v5.900.0 required (did you mean v5.9.0?)--this is only $^V, stopped\E/);
+is ($@, '');
 
 eval "use 5.10;";
-like ($@, qr/\QPerl v5.100.0 required (did you mean v5.10.0?)--this is only $^V, stopped\E/);
+is ($@, '');
 
 eval "use 5.11;";
-like ($@, qr/\QPerl v5.110.0 required (did you mean v5.11.0?)--this is only $^V, stopped\E/);
+is ($@, '');
 
 eval sprintf "use %.6f;", $];
 is ($@, '');
 
 
-eval sprintf "use %.6f;", $] - 0.000001;
+eval sprintf "use %.6f;", $] - 0.001;
 is ($@, '');
 
+my $Vthis = int $];
+my $Vnext = $Vthis + 1;
 eval sprintf("use %.6f;", $] + 1);
-like ($@, qr/Perl v6\.\d+\.\d+ required--this is only \Q$^V\E, stopped/a);
+like ($@, qr/Perl v$Vnext\.\d+\.\d+ required--this is only \Q$^V\E, stopped/a);
+
+eval sprintf "use %.6f;", $] + 0.001;
+like ($@, qr/Perl v$Vthis\.\d+\.\d+ required--this is only \Q$^V\E, stopped/a);
 
-eval sprintf "use %.6f;", $] + 0.00001;
-like ($@, qr/Perl v5\.\d+\.\d+ required--this is only \Q$^V\E, stopped/a);
+eval sprintf "use %.3f;", $Vthis + .999;
+like ($@, qr/Perl v$Vthis\.\d+\.\d+ required--this is only \Q$^V\E, stopped/a);
 
 # check that "use 5.11.0" (and higher) loads strictures
 eval 'use 5.11.0; ${"foo"} = "bar";';