In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/a2656c4ab81b216a427d1e0db6a3aa25b4350ba8?hp=d04589db35f09d1a2397c7ca43216163acba7a2d>

- Log -----------------------------------------------------------------
commit a2656c4ab81b216a427d1e0db6a3aa25b4350ba8
Author: David Mitchell <[email protected]>
Date:   Fri Mar 1 16:31:06 2013 +0000

    revert: Benchmark iteration warnings should warn
    
    This commit reverts:
    
        commit a820780c62918236069b3b55502640c99a9e812a
        Author:     David Golden <[email protected]>
        AuthorDate: Tue Feb 5 22:23:37 2013 -0500
        Commit:     David Golden <[email protected]>
        CommitDate: Tue Feb 5 22:49:36 2013 -0500
    
            Benchmark iteration warnings should warn, not print
    
    because the warnings appearing on STDERR weren't being trapped by
    Benchmark.t (see [perl #116831]). Revert for now, and re-address after
    5.18.
-----------------------------------------------------------------------

Summary of changes:
 lib/Benchmark.pm  |    4 ++--
 pod/perldelta.pod |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/Benchmark.pm b/lib/Benchmark.pm
index 728b0b9..1fa187e 100644
--- a/lib/Benchmark.pm
+++ b/lib/Benchmark.pm
@@ -440,7 +440,7 @@ our(@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION);
              clearcache clearallcache disablecache enablecache);
 %EXPORT_TAGS=( all => [ @EXPORT, @EXPORT_OK ] ) ;
 
-$VERSION = 1.14;
+$VERSION = 1.15;
 
 # --- ':hireswallclock' special handling
 
@@ -836,7 +836,7 @@ sub timethis{
     # A conservative warning to spot very silly tests.
     # Don't assume that your benchmark is ok simply because
     # you don't get this warning!
-    warn "            (warning: too few iterations for a reliable count)\n"
+    print "            (warning: too few iterations for a reliable count)\n"
        if     $n < $Min_Count
            || ($t->real < 1 && $n < 1000)
            || $t->cpu_a < $Min_CPU;
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index aa6474e..8be911f 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -96,7 +96,11 @@ XXX
 
 =item *
 
-L<XXX> has been upgraded from version A.xx to B.yy.
+L<Benchmark> has been upgraded from version 1.14 to 1.15.
+
+This reverts (for now) a change in 1.14 whereby the "too few iterations"
+message became a warning on STDERR instead of being output on STDOUT. It's
+now on STDOUT again.
 
 =back
 

--
Perl5 Master Repository

Reply via email to