summaryrefslogtreecommitdiff
path: root/dist/PathTools
diff options
context:
space:
mode:
authorNicolas R <atoomic@cpan.org>2017-09-12 13:20:25 -0600
committerTodd Rinaldo <toddr@cpan.org>2017-11-11 01:07:18 -0600
commit1a58b39af83e11fcbeef7ae4cd90c565b1f6b8cb (patch)
tree542b8e3ec768e2b3a533354d694d53c6c161e8e5 /dist/PathTools
parent33394adc9b131beee7dbbaf29bc7e8e02900f654 (diff)
downloadperl-1a58b39af83e11fcbeef7ae4cd90c565b1f6b8cb.tar.gz
Replace multiple 'use vars' by 'our' in dist
Using vars pragma is discouraged and has been superseded by 'our' declarations available in Perl v5.6.0 or later. Additionally using 'vars' pragma increase the memory consumption of a program by about 700 kB for no good reason. This commit is about replacing the usage of 'vars' pragma by 'our' in blead where it makes sense. ( leaving 'cpan' directory outside of the scope ) -- using vars perl -e 'use vars qw(@ISA $AUTOLOAD $VERSION); print qx{grep RSS /proc/$$/status} ' VmRSS: 2588 kB -- using our instead perl -e 'our (@ISA, $AUTOLOAD, $VERSION); print qx{grep RSS /proc/$$/status} ' VmRSS: 1864 kB
Diffstat (limited to 'dist/PathTools')
-rw-r--r--dist/PathTools/Cwd.pm9
-rw-r--r--dist/PathTools/lib/File/Spec.pm5
-rw-r--r--dist/PathTools/lib/File/Spec/AmigaOS.pm5
-rw-r--r--dist/PathTools/lib/File/Spec/Cygwin.pm5
-rw-r--r--dist/PathTools/lib/File/Spec/Epoc.pm5
-rw-r--r--dist/PathTools/lib/File/Spec/Functions.pm12
-rw-r--r--dist/PathTools/lib/File/Spec/Mac.pm5
-rw-r--r--dist/PathTools/lib/File/Spec/OS2.pm5
-rw-r--r--dist/PathTools/lib/File/Spec/Unix.pm3
-rw-r--r--dist/PathTools/lib/File/Spec/VMS.pm5
-rw-r--r--dist/PathTools/lib/File/Spec/Win32.pm5
-rw-r--r--dist/PathTools/t/Spec.t3
12 files changed, 27 insertions, 40 deletions
diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
index cc77e58e2b..0315622396 100644
--- a/dist/PathTools/Cwd.pm
+++ b/dist/PathTools/Cwd.pm
@@ -1,16 +1,15 @@
package Cwd;
use strict;
use Exporter;
-use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-$VERSION = '3.68';
+our $VERSION = '3.69';
my $xs_version = $VERSION;
$VERSION =~ tr/_//d;
-@ISA = qw/ Exporter /;
-@EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
+our @ISA = qw/ Exporter /;
+our @EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
push @EXPORT, qw(getdcwd) if $^O eq 'MSWin32';
-@EXPORT_OK = qw(chdir abs_path fast_abs_path realpath fast_realpath);
+our @EXPORT_OK = qw(chdir abs_path fast_abs_path realpath fast_realpath);
# sys_cwd may keep the builtin command
diff --git a/dist/PathTools/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm
index aa2a5c80b3..366e6b9c6f 100644
--- a/dist/PathTools/lib/File/Spec.pm
+++ b/dist/PathTools/lib/File/Spec.pm
@@ -1,9 +1,8 @@
package File::Spec;
use strict;
-use vars qw(@ISA $VERSION);
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
my %module = (MacOS => 'Mac',
@@ -21,7 +20,7 @@ my %module = (MacOS => 'Mac',
my $module = $module{$^O} || 'Unix';
require "File/Spec/$module.pm";
-@ISA = ("File::Spec::$module");
+our @ISA = ("File::Spec::$module");
1;
diff --git a/dist/PathTools/lib/File/Spec/AmigaOS.pm b/dist/PathTools/lib/File/Spec/AmigaOS.pm
index 0af106cd0a..316f67c76c 100644
--- a/dist/PathTools/lib/File/Spec/AmigaOS.pm
+++ b/dist/PathTools/lib/File/Spec/AmigaOS.pm
@@ -1,13 +1,12 @@
package File::Spec::AmigaOS;
use strict;
-use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
-@ISA = qw(File::Spec::Unix);
+our @ISA = qw(File::Spec::Unix);
=head1 NAME
diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm
index bffeb3d131..a0280b68a8 100644
--- a/dist/PathTools/lib/File/Spec/Cygwin.pm
+++ b/dist/PathTools/lib/File/Spec/Cygwin.pm
@@ -1,13 +1,12 @@
package File::Spec::Cygwin;
use strict;
-use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
-@ISA = qw(File::Spec::Unix);
+our @ISA = qw(File::Spec::Unix);
=head1 NAME
diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm
index a911b5e1eb..01f208688c 100644
--- a/dist/PathTools/lib/File/Spec/Epoc.pm
+++ b/dist/PathTools/lib/File/Spec/Epoc.pm
@@ -1,13 +1,12 @@
package File::Spec::Epoc;
use strict;
-use vars qw($VERSION @ISA);
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
require File::Spec::Unix;
-@ISA = qw(File::Spec::Unix);
+our @ISA = qw(File::Spec::Unix);
=head1 NAME
diff --git a/dist/PathTools/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm
index 71f0e6a750..22eeb4a0a9 100644
--- a/dist/PathTools/lib/File/Spec/Functions.pm
+++ b/dist/PathTools/lib/File/Spec/Functions.pm
@@ -3,16 +3,14 @@ package File::Spec::Functions;
use File::Spec;
use strict;
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
-
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
require Exporter;
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-@EXPORT = qw(
+our @EXPORT = qw(
canonpath
catdir
catfile
@@ -24,7 +22,7 @@ require Exporter;
path
);
-@EXPORT_OK = qw(
+our @EXPORT_OK = qw(
devnull
tmpdir
splitpath
@@ -35,7 +33,7 @@ require Exporter;
case_tolerant
);
-%EXPORT_TAGS = ( ALL => [ @EXPORT_OK, @EXPORT ] );
+our %EXPORT_TAGS = ( ALL => [ @EXPORT_OK, @EXPORT ] );
require File::Spec::Unix;
my %udeps = (
diff --git a/dist/PathTools/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm
index 31e7a4dce0..082b9b8e80 100644
--- a/dist/PathTools/lib/File/Spec/Mac.pm
+++ b/dist/PathTools/lib/File/Spec/Mac.pm
@@ -1,13 +1,12 @@
package File::Spec::Mac;
use strict;
-use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
-@ISA = qw(File::Spec::Unix);
+our @ISA = qw(File::Spec::Unix);
my $macfiles;
if ($^O eq 'MacOS') {
diff --git a/dist/PathTools/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm
index 71ef5ac663..b126c279c2 100644
--- a/dist/PathTools/lib/File/Spec/OS2.pm
+++ b/dist/PathTools/lib/File/Spec/OS2.pm
@@ -1,13 +1,12 @@
package File::Spec::OS2;
use strict;
-use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
-@ISA = qw(File::Spec::Unix);
+our @ISA = qw(File::Spec::Unix);
sub devnull {
return "/dev/nul";
diff --git a/dist/PathTools/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm
index e1a30f8ca1..eecd8c80fc 100644
--- a/dist/PathTools/lib/File/Spec/Unix.pm
+++ b/dist/PathTools/lib/File/Spec/Unix.pm
@@ -1,9 +1,8 @@
package File::Spec::Unix;
use strict;
-use vars qw($VERSION);
-$VERSION = '3.68';
+our $VERSION = '3.69';
my $xs_version = $VERSION;
$VERSION =~ tr/_//d;
diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm
index 20630c7678..5b32027526 100644
--- a/dist/PathTools/lib/File/Spec/VMS.pm
+++ b/dist/PathTools/lib/File/Spec/VMS.pm
@@ -1,13 +1,12 @@
package File::Spec::VMS;
use strict;
-use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
-@ISA = qw(File::Spec::Unix);
+our @ISA = qw(File::Spec::Unix);
use File::Basename;
use VMS::Filespec;
diff --git a/dist/PathTools/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm
index 9dc6cb0e4c..a62e594928 100644
--- a/dist/PathTools/lib/File/Spec/Win32.pm
+++ b/dist/PathTools/lib/File/Spec/Win32.pm
@@ -2,13 +2,12 @@ package File::Spec::Win32;
use strict;
-use vars qw(@ISA $VERSION);
require File::Spec::Unix;
-$VERSION = '3.68';
+our $VERSION = '3.69';
$VERSION =~ tr/_//d;
-@ISA = qw(File::Spec::Unix);
+our @ISA = qw(File::Spec::Unix);
# Some regexes we use for path splitting
my $DRIVE_RX = '[a-zA-Z]:';
diff --git a/dist/PathTools/t/Spec.t b/dist/PathTools/t/Spec.t
index d4fb69a2f1..2982b8c588 100644
--- a/dist/PathTools/t/Spec.t
+++ b/dist/PathTools/t/Spec.t
@@ -802,8 +802,7 @@ can_ok('File::Spec::Win32', '_cwd');
{
package File::Spec::FakeWin32;
- use vars qw(@ISA);
- @ISA = qw(File::Spec::Win32);
+ our @ISA = qw(File::Spec::Win32);
sub _cwd { 'C:\\one\\two' }