cleaning up Critic gripes

beyondgrep · May 26, 2008 · 8600ed7 · 8600ed7
1 parent 92125da
commit 8600ed7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Ack.pm b/Ack.pm
@@ -375,7 +375,8 @@ sub def_types_from_ARGV {
                 unless exists $mappings{$type};
         }
 
-        my @exts = map { s/^\.//; $_ } split ',', $ext; # %types stores extensions without leading '.'
+        my @exts = split /,/, $ext;
+        s/^\.// for @exts;
 
         if ( !exists $mappings{$type} || ref($mappings{$type}) eq 'ARRAY' ) {
             push @{$mappings{$type}}, @exts;

diff --git a/Changes b/Changes
@@ -1,6 +1,6 @@
 Changelog for ack
 
-1.84
+1.84        Sun May 25 00:17:41 CDT 2008
     [ENHANCEMENTS]
     Support color on Windows.  Thanks, Jan Dubois.
 

diff --git a/ack-standalone b/ack-standalone
@@ -1256,7 +1256,8 @@ sub def_types_from_ARGV {
                 unless exists $mappings{$type};
         }
 
-        my @exts = map { s/^\.//; $_ } split ',', $ext; # %types stores extensions without leading '.'
+        my @exts = split /,/, $ext;
+        s/^\.// for @exts;
 
         if ( !exists $mappings{$type} || ref($mappings{$type}) eq 'ARRAY' ) {
             push @{$mappings{$type}}, @exts;

diff --git a/t/module.t b/t/module.t
@@ -64,7 +64,7 @@ HIDE_THE_WRAPPERS: {
 
 }
 
-my $iter1;
+my $original_iterator;
 {
     @result = ();
     @warns  = ();
@@ -76,7 +76,7 @@ my $iter1;
     my $what = App::Ack::get_starting_points( [$dir], \%opts );
     lists_match( $what, ["t${dir_sep}text"], 'get_starting_points' );
     my $iter = App::Ack::get_iterator( $what, \%opts );
-    $iter1 = $iter;
+    $original_iterator = $iter;
     isa_ok( $iter, 'CODE' );
     App::Ack::filetype_setup();
     App::Ack::print_matches( $iter, \%opts );
@@ -113,7 +113,7 @@ my $iter1;
     my $what = App::Ack::get_starting_points( [$dir, 't/etc'], \%opts );
     lists_match( $what, ["t${dir_sep}text", "t${dir_sep}etc"], 'get_starting_points' );
     my $iter = App::Ack::get_iterator( $what, \%opts );
-    isnt( $iter, $iter1, 'different iterators' );
+    isnt( $iter, $original_iterator, 'different iterators' );
     isa_ok( $iter, 'CODE' );
     App::Ack::filetype_setup();
     App::Ack::print_matches( $iter, \%opts );