Merge pull request #1010 from haarg/no-use-vars

don't use vars, use our

Author: exodist

lib/Test/Builder/IO/Scalar.pm

@@ -32,16 +32,15 @@ modify it under the same terms as Perl itself.
 
 use Carp;
 use strict;
-use vars qw($VERSION @ISA);
 use IO::Handle;
 
 use 5.005;
 
 ### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = "2.114";
+our $VERSION = "2.114";
 
 ### Inheritance:
-@ISA = qw(IO::Handle);
+our @ISA = qw(IO::Handle);
 
 #==============================
 

lib/Test/Tester.pm

@@ -16,12 +16,10 @@ use Test::Tester::Delegate;
 
 require Exporter;
 
-use vars qw( @ISA @EXPORT );
-
 our $VERSION = '1.302205';
 
-@EXPORT = qw( run_tests check_tests check_test cmp_results show_space );
-@ISA = qw( Exporter );
+our @EXPORT = qw( run_tests check_tests check_test cmp_results show_space );
+our @ISA = qw( Exporter );
 
 my $Test = Test::Builder->new;
 my $Capture = Test::Tester::Capture->new;

lib/Test/Tester/Capture.pm

@@ -7,8 +7,7 @@ our $VERSION = '1.302205';
 
 use Test::Builder;
 
-use vars qw( @ISA );
-@ISA = qw( Test::Builder );
+our @ISA = qw( Test::Builder );
 
 # Make Test::Tester::Capture thread-safe for ithreads.
 BEGIN {

lib/Test/Tester/Delegate.pm

@@ -7,8 +7,6 @@ our $VERSION = '1.302205';
 
 use Scalar::Util();
 
-use vars '$AUTOLOAD';
-
 sub new
 {
 	my $pkg = shift;
@@ -21,7 +19,7 @@ sub new
 
 sub AUTOLOAD
 {
-	my ($sub) = $AUTOLOAD =~ /.*::(.*?)$/;
+	my ($sub) = our $AUTOLOAD =~ /.*::(.*?)$/;
 
 	return if $sub eq "DESTROY";
 

lib/Test2/EventFacet/Meta.pm

@@ -5,7 +5,6 @@ use warnings;
 our $VERSION = '1.302205';
 
 BEGIN { require Test2::EventFacet; our @ISA = qw(Test2::EventFacet) }
-use vars qw/$AUTOLOAD/;
 
 # replace set_details
 {
@@ -35,7 +34,7 @@ sub can {
 }
 
 sub AUTOLOAD {
-    my $name = $AUTOLOAD;
+    my $name = our $AUTOLOAD;
     $name =~ s/^.*:://g;
     my $sub = $_[0]->can($name);
     goto &$sub;

lib/Test2/Tools/Spec.pm

@@ -15,7 +15,7 @@ use Test2::Workflow::Task::Group();
 use Test2::Tools::Mock();
 use Test2::Util::Importer();
 
-use vars qw/@EXPORT @EXPORT_OK/;
+our (@EXPORT, @EXPORT_OK);
 push @EXPORT => qw{describe cases};
 push @EXPORT_OK => qw{include_workflow include_workflows spec_defaults};
 

t/lib/SmallTest.pm

@@ -5,9 +5,8 @@ package SmallTest;
 
 require Exporter;
 
-use vars qw( @ISA @EXPORT );
-@ISA = qw( Exporter );
-@EXPORT = qw( ok is_eq is_num );
+our @ISA = qw( Exporter );
+our @EXPORT = qw( ok is_eq is_num );
 
 use Test::Builder;
 

t/modules/Plugin/Times.t

@@ -4,7 +4,7 @@ use Test2::API qw/intercept context/;
 
 use Test2::Tools::Defer qw/def do_def/;
 
-use vars qw/@CALLBACKS/;
+our @CALLBACKS;
 
 BEGIN {
     no warnings 'redefine';

t/regression/todo_and_facets.t

@@ -13,8 +13,6 @@ BEGIN {
     *bas_ok  = \&Test2::Tools::Basic::ok;
 }
 
-use vars qw/$TODO/;
-
 sub leg_ok($;$@) {
     my ($bool, $name, @diag);
     my $ctx = context();
@@ -33,7 +31,7 @@ sub new_ok($;$@) {
 }
 
 {
-    local $TODO = "Testing TODO";
+    local our $TODO = "Testing TODO";
 
     tm_ok(0, "tm_ok fail");
     tm_fail('tm_fail');