Skip some File::Copy tests on Win32 since file permissions do not

[perl5.git] / lib / feature.pm

diff --git a/lib/feature.pm b/lib/feature.pm
index f4e2ef8..915b5c7 100644 (file)
--- a/lib/feature.pm
+++ b/lib/feature.pm
@@ -1,6 +1,6 @@
 package feature;
 
-our $VERSION = '1.12';
+our $VERSION = '1.13';
 
 # (feature name) => (internal name, used in %^H)
 my %feature = (
@@ -12,15 +12,12 @@ my %feature = (
 # NB. the latest bundle must be loaded by the -E switch (see toke.c)
 
 my %feature_bundle = (
-    "5.10.0" => [qw(switch say state)],
-    "5.11.0" => [qw(switch say state)],
+    "5.10" => [qw(switch say state)],
+    "5.11" => [qw(switch say state)],
 );
 
-# latest version here
-$feature_bundle{"5.11"} = $feature_bundle{sprintf("%vd",$^V)};
-
-$feature_bundle{"5.10"} = $feature_bundle{"5.10.0"};
-$feature_bundle{"5.9.5"} = $feature_bundle{"5.10.0"};
+# special case
+$feature_bundle{"5.9.5"} = $feature_bundle{"5.10"};
 
 # TODO:
 # - think about versioned features (use feature switch => 2)
@@ -103,11 +100,11 @@ See L<perlsub/"Persistent Private Variables"> for details.
 It's possible to load a whole slew of features in one go, using
 a I<feature bundle>. The name of a feature bundle is prefixed with
 a colon, to distinguish it from an actual feature. At present, the
-only feature bundles are C<use feature ":5.10"> and C<use feature ":5.10.0">,
-which both are equivalent to C<use feature qw(switch say state)>.
+only feature bundle is C<use feature ":5.10"> which is equivalent
+to C<use feature qw(switch say state)>.
 
-In the forthcoming 5.10.X perl releases, C<use feature ":5.10"> will be
-equivalent to the latest C<use feature ":5.10.X">.
+Specifying sub-versions such as the C<0> in C<5.10.0> in feature bundles has
+no effect: feature bundles are guaranteed to be the same for all sub-versions.
 
 =head1 IMPLICIT LOADING
 
@@ -130,9 +127,10 @@ the C<use VERSION> construct, and when the version is higher than or equal to
 
 will do an implicit
 
-    use feature ':5.10.0';
+    use feature ':5.10';
 
-and so on.
+and so on. Note how the trailing sub-version is automatically stripped from the
+version.
 
 But to avoid portability warnings (see L<perlfunc/use>), you may prefer:
 
@@ -154,7 +152,10 @@ sub import {
        if (substr($name, 0, 1) eq ":") {
            my $v = substr($name, 1);
            if (!exists $feature_bundle{$v}) {
-               unknown_feature_bundle($v);
+               $v =~ s/^([0-9]+)\.([0-9]+).[0-9]+$/$1.$2/;
+               if (!exists $feature_bundle{$v}) {
+                   unknown_feature_bundle(substr($name, 1));
+               }
            }
            unshift @_, @{$feature_bundle{$v}};
            next;
@@ -180,7 +181,10 @@ sub unimport {
        if (substr($name, 0, 1) eq ":") {
            my $v = substr($name, 1);
            if (!exists $feature_bundle{$v}) {
-               unknown_feature_bundle($v);
+               $v =~ s/^([0-9]+)\.([0-9]+).[0-9]+$/$1.$2/;
+               if (!exists $feature_bundle{$v}) {
+                   unknown_feature_bundle(substr($name, 1));
+               }
            }
            unshift @_, @{$feature_bundle{$v}};
            next;