Upgrade to Test-Simple 0.86

Remove local changes 34491 (no longer required) and 34763 (fixed
properly by change 35076), but keep 34545 and 34762 for now (with
a VERSION bump in Test::Simple as a reminder)

p4raw-id: //depot/perl@35077

6 files changed, 10 insertions, 7 deletions

diff --git a/lib/Test/Builder.pm b/lib/Test/Builder.pm
index 4ed13d52e3..b38744426a 100644
--- a/lib/Test/Builder.pm
+++ b/lib/Test/Builder.pm
@@ -5,7 +5,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '0.85_02';
+our $VERSION = '0.86';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 # Make Test::Builder thread-safe for ithreads.
@@ -457,7 +457,7 @@ sub _unoverload {
     my $self = shift;
     my $type = shift;
 
-    $self->_try(sub { require overload; }, die_on_fail => 0);
+    $self->_try(sub { require overload; }, die_on_fail => 1);
 
     foreach my $thing (@_) {
         if( $self->_is_object($$thing) ) {
@@ -487,7 +487,6 @@ sub _unoverload_num {
 
     $self->_unoverload( '0+', @_ );
 
-    no warnings 'numeric';
     for my $val (@_) {
         next unless $self->_is_dualvar($$val);
         $$val = $$val + 0;
diff --git a/lib/Test/Builder/Module.pm b/lib/Test/Builder/Module.pm
index 8cbd7a3a75..4ccdf09b7a 100644
--- a/lib/Test/Builder/Module.pm
+++ b/lib/Test/Builder/Module.pm
@@ -8,7 +8,7 @@ use Test::Builder;
 require Exporter;
 our @ISA = qw(Exporter);
 
-our $VERSION = '0.85_01';
+our $VERSION = '0.86';
 
 # 5.004's Exporter doesn't have export_to_level.
 my $_export_to_level = sub {
diff --git a/lib/Test/Builder/Tester.pm b/lib/Test/Builder/Tester.pm
index 168ef6f9af..8b1f46b6a6 100644
--- a/lib/Test/Builder/Tester.pm
+++ b/lib/Test/Builder/Tester.pm
@@ -2,7 +2,7 @@ package Test::Builder::Tester;
 # $Id: /mirror/googlecode/test-more-trunk/lib/Test/Builder/Tester.pm 67223 2008-10-15T03:08:18.888155Z schwern  $
 
 use strict;
-our $VERSION = "1.17_01";
+our $VERSION = "1.18";
 
 use Test::Builder;
 use Symbol;
diff --git a/lib/Test/More.pm b/lib/Test/More.pm
index 6c00a8c0ea..2ccd314e1e 100644
--- a/lib/Test/More.pm
+++ b/lib/Test/More.pm
@@ -18,7 +18,7 @@ sub _carp {
     return warn @_, " at $file line $line\n";
 }
 
-our $VERSION = '0.85_01';
+our $VERSION = '0.86';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::Builder::Module;
diff --git a/lib/Test/Simple.pm b/lib/Test/Simple.pm
index 93b8feb950..a7924cc3e4 100644
--- a/lib/Test/Simple.pm
+++ b/lib/Test/Simple.pm
@@ -5,7 +5,7 @@ use 5.004;
 
 use strict;
 
-our $VERSION = '0.85_02';
+our $VERSION = '0.86_01';
 $VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
 
 use Test::Builder::Module;
diff --git a/lib/Test/Simple/Changes b/lib/Test/Simple/Changes
index c89a140af2..09a5662bff 100644
--- a/lib/Test/Simple/Changes
+++ b/lib/Test/Simple/Changes
@@ -1,3 +1,7 @@
+0.86  Sun Nov  9 01:09:05 PST 2008
+    Same as 0.85_01
+
+
 0.85_01  Thu Oct 23 18:57:38 PDT 2008
     New Features
     * cmp_ok() now displays the error if the comparison throws one.