Merge pull request #51 from rwp0/rwp0/fix-indirect-syntax

Fix indirect syntax
pmqs · Nov 23, 2023 · f1c70d0 · f1c70d0
2 parents e193f25 + 7bd8408
commit f1c70d0
Show file tree

Hide file tree

Showing 46 changed files with 49 additions and 49 deletions.
diff --git a/lib/File/GlobMapper.pm b/lib/File/GlobMapper.pm
@@ -10,14 +10,14 @@ BEGIN
 {
     if ($] < 5.006)
     {
-        require File::BSDGlob; import File::BSDGlob qw(:glob) ;
-        $CSH_GLOB = File::BSDGlob::GLOB_CSH() ;
+        require File::BSDGlob; File::BSDGlob->import(':glob');
+        $CSH_GLOB = File::BSDGlob::GLOB_CSH();
         *globber = \&File::BSDGlob::csh_glob;
     }
     else
     {
-        require File::Glob; import File::Glob qw(:glob) ;
-        $CSH_GLOB = File::Glob::GLOB_CSH() ;
+        require File::Glob; File::Glob->import(':glob');
+        $CSH_GLOB = File::Glob::GLOB_CSH();
         #*globber = \&File::Glob::bsd_glob;
         *globber = \&File::Glob::csh_glob;
     }

diff --git a/t/000prereq.t b/t/000prereq.t
@@ -22,7 +22,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
 
     my $VERSION = '2.206';

diff --git a/t/001bzip2.t b/t/001bzip2.t
@@ -19,7 +19,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 841 + $extra ;
 };

diff --git a/t/002any-transparent.t b/t/002any-transparent.t
@@ -18,7 +18,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 15 + $extra ;
 

diff --git a/t/004gziphdr.t b/t/004gziphdr.t
@@ -17,7 +17,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
 
     plan tests => 918 + $extra ;

diff --git a/t/005defhdr.t b/t/005defhdr.t
@@ -17,7 +17,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 114 + $extra ;
 

diff --git a/t/006zip.t b/t/006zip.t
@@ -17,7 +17,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 108 + $extra ;
 

diff --git a/t/010examples-bzip2.t b/t/010examples-bzip2.t
@@ -23,7 +23,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 19 + $extra ;
 }

diff --git a/t/010examples-zlib.t b/t/010examples-zlib.t
@@ -23,7 +23,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 19 + $extra ;
 }

diff --git a/t/011-streamzip.t b/t/011-streamzip.t
@@ -23,7 +23,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 136 + $extra ;
 }

diff --git a/t/01misc.t b/t/01misc.t
@@ -17,7 +17,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 163 + $extra ;
 

diff --git a/t/020isize.t b/t/020isize.t
@@ -22,7 +22,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 76 + $extra ;
 

diff --git a/t/050interop-gzip.t b/t/050interop-gzip.t
@@ -109,7 +109,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 7 + $extra ;
 

diff --git a/t/101truncate-bzip2.t b/t/101truncate-bzip2.t
@@ -19,7 +19,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 3308 + $extra;
 

diff --git a/t/101truncate-deflate.t b/t/101truncate-deflate.t
@@ -19,7 +19,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 2552 + $extra;
 

diff --git a/t/101truncate-gzip.t b/t/101truncate-gzip.t
@@ -20,7 +20,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 3040 + $extra;
 

diff --git a/t/101truncate-rawdeflate.t b/t/101truncate-rawdeflate.t
@@ -21,7 +21,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     my $tests = Compress::Raw::Zlib::is_zlibng() ? 615 : 625;
     plan tests => $tests + $extra;

diff --git a/t/101truncate-zip.t b/t/101truncate-zip.t
@@ -20,7 +20,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 7732 + $extra;
 

diff --git a/t/105oneshot-gzip-only.t b/t/105oneshot-gzip-only.t
@@ -21,7 +21,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 70 + $extra ;
 

diff --git a/t/105oneshot-zip-bzip2-only.t b/t/105oneshot-zip-bzip2-only.t
@@ -26,7 +26,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 248 + $extra ;
 

diff --git a/t/105oneshot-zip-only.t b/t/105oneshot-zip-only.t
@@ -22,7 +22,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 230 + $extra ;
 

diff --git a/t/105oneshot-zip-store-only.t b/t/105oneshot-zip-store-only.t
@@ -30,7 +30,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 1058 + $extra ;
 

diff --git a/t/107multi-zip-only.t b/t/107multi-zip-only.t
@@ -19,7 +19,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 21 + $extra ;
 

diff --git a/t/108anyunc-transparent.t b/t/108anyunc-transparent.t
@@ -18,7 +18,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 15 + $extra ;
 

diff --git a/t/111const-deflate.t b/t/111const-deflate.t
@@ -18,7 +18,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 390 + $extra ;
 }

diff --git a/t/112utf8-zip.t b/t/112utf8-zip.t
@@ -32,7 +32,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 28 + $extra;
 }

diff --git a/t/113issues.t b/t/113issues.t
@@ -32,7 +32,7 @@ BEGIN {
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 3 + $extra;
 }

diff --git a/t/compress/any.pl b/t/compress/any.pl
@@ -12,7 +12,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 48 + $extra ;
 

diff --git a/t/compress/anyunc.pl b/t/compress/anyunc.pl
@@ -12,7 +12,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 36 + $extra ;
 }

diff --git a/t/compress/destroy.pl b/t/compress/destroy.pl
@@ -15,7 +15,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 15 + $extra ;
 

diff --git a/t/compress/encode.pl b/t/compress/encode.pl
@@ -19,7 +19,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
 
-    my $st = eval { require Test::NoWarnings ;  import Test::NoWarnings; 1; };
+    my $st = eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1; };
     $extra = 1
         if $st ;
 

diff --git a/t/compress/generic.pl b/t/compress/generic.pl
@@ -14,7 +14,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
 
-    my $st = eval { require Test::NoWarnings ;  import Test::NoWarnings; 1; };
+    my $st = eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1; };
     $extra = 1
         if $st ;
 

diff --git a/t/compress/merge.pl b/t/compress/merge.pl
@@ -17,7 +17,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 165 + $extra ;
 

diff --git a/t/compress/multi.pl b/t/compress/multi.pl
@@ -11,7 +11,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 1828 + $extra ;
 

diff --git a/t/compress/newtied.pl b/t/compress/newtied.pl
@@ -27,7 +27,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => $tests + $extra ;
 

diff --git a/t/compress/oneshot.pl b/t/compress/oneshot.pl
@@ -14,7 +14,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 1007 + $extra ;
 

diff --git a/t/compress/prime.pl b/t/compress/prime.pl
@@ -17,7 +17,7 @@ BEGIN
     # use Test::NoWarnings, if available
     $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
 }
 

diff --git a/t/compress/tied.pl b/t/compress/tied.pl
@@ -17,7 +17,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     my $tests ;
     $BadPerl = ($] >= 5.006 and $] <= 5.008) ;

diff --git a/t/compress/zlib-generic.pl b/t/compress/zlib-generic.pl
@@ -11,7 +11,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 49 + $extra ;
 }

diff --git a/t/cz-01version.t b/t/cz-01version.t
@@ -16,7 +16,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 2 + $extra ;
 

diff --git a/t/cz-03zlib-v1.t b/t/cz-03zlib-v1.t
@@ -21,7 +21,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     my $count = 0 ;
     if ($] < 5.005) {

diff --git a/t/cz-05examples.t b/t/cz-05examples.t
@@ -23,7 +23,7 @@ BEGIN
     # use Test::NoWarnings, if available
     my $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 
     plan tests => 26 + $extra ;
 }

diff --git a/t/cz-06gzsetp.t b/t/cz-06gzsetp.t
@@ -32,7 +32,7 @@ BEGIN
     # use Test::NoWarnings, if available
     $extra = 0 ;
     $extra = 1
-        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
+        if eval { require Test::NoWarnings ;  Test::NoWarnings->import; 1 };
 }
 
 my $ver = Compress::Zlib::zlib_version();