X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Ffeature.pm;h=5990b727c8a4b2d4c5ad6631ff84f740d8e8df55;hb=2da7a6b5eab232c468b68576568f84877f032fd6;hp=f33ce2d42b23447506234dad659aba91345080d2;hpb=7be54ea7d51824e3590034a7880ff325459e8d52;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/feature.pm b/lib/feature.pm
index f33ce2d..5990b72 100644
--- a/lib/feature.pm
+++ b/lib/feature.pm
@@ -1,22 +1,20 @@
 package feature;
 
-our $VERSION = '1.10';
+our $VERSION = '1.11';
 
 # (feature name) => (internal name, used in %^H)
 my %feature = (
     switch => 'feature_switch',
     say    => "feature_say",
-    err    => "feature_err",
     state  => "feature_state",
 );
 
 my %feature_bundle = (
-    "5.10.0" => [qw(switch say err state)],
+    "5.10.0" => [qw(switch say state)],
 );
+
 # latest version here
-# keep it harcoded until we actually bump the version number to 5.10
-$feature_bundle{"5.10"} = $feature_bundle{"5.10.0"};
-#$feature_bundle{"5.10"} = $feature_bundle{sprintf("%vd",$^V)};
+$feature_bundle{"5.10"} = $feature_bundle{sprintf("%vd",$^V)};
 
 $feature_bundle{"5.9.5"} = $feature_bundle{"5.10.0"};
 
@@ -89,14 +87,6 @@ C<say> function.
 
 See L<perlfunc/say> for details.
 
-=head2 the 'err' feature
-
-C<use feature 'err'> tells the compiler to enable the C<err>
-operator.
-
-C<err> is a low-precedence variant of the C<//> operator:
-see C<perlop> for details.
-
 =head2 the 'state' feature
 
 C<use feature 'state'> tells the compiler to enable C<state>
@@ -110,7 +100,7 @@ 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 err state)>.
+which both are 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">.
@@ -130,16 +120,22 @@ all available features in the main compilation unit (that is, the one-liner.)
 
 By requiring explicitly a minimal Perl version number for your program, with
 the C<use VERSION> construct, and when the version is higher than or equal to
-5.9.5. That is,
+5.10.0. That is,
 
-    use 5.9.5;
+    use 5.10.0;
 
 will do an implicit
 
-    use feature ':5.9.5';
+    use feature ':5.10.0';
 
 and so on.
 
+But to avoid portability warnings (see L<perlfunc/use>), you may prefer:
+
+    use 5.010;
+
+with the same effect.
+
 =back
 
 =cut
@@ -151,7 +147,8 @@ sub import {
     }
     while (@_) {
 	my $name = shift(@_);
-	if (substr($name, 0, 1) eq ":" and (my $v = substr($name, 1))) {
+	if (substr($name, 0, 1) eq ":") {
+	    my $v = substr($name, 1);
 	    if (!exists $feature_bundle{$v}) {
 		unknown_feature_bundle($v);
 	    }
@@ -176,7 +173,8 @@ sub unimport {
 
     while (@_) {
 	my $name = shift;
-	if (substr($name, 0, 1) eq ":" and (my $v = substr($name, 1))) {
+	if (substr($name, 0, 1) eq ":") {
+	    my $v = substr($name, 1);
 	    if (!exists $feature_bundle{$v}) {
 		unknown_feature_bundle($v);
 	    }