Porting/corelist.pl: avoid autoderef feature

1 files changed, 12 insertions, 13 deletions

diff --git a/Porting/corelist.pl b/Porting/corelist.pl
index ce4ff2b41d..545a1027a4 100755
--- a/Porting/corelist.pl
+++ b/Porting/corelist.pl
@@ -10,7 +10,6 @@
 use autodie;
 use strict;
 use warnings;
-no  warnings 'experimental::autoderef';
 use File::Find;
 use ExtUtils::MM_Unix;
 use version;
@@ -155,14 +154,14 @@ my $delta_data = make_corelist_delta(
 my $versions_in_release = "    " . $perl_vnum . " => {\n";
 $versions_in_release .= "        delta_from => $delta_data->{delta_from},\n";
 $versions_in_release .= "        changed => {\n";
-foreach my $key (sort keys $delta_data->{changed}) {
+foreach my $key (sort keys $delta_data->{changed}->%*) {
   $versions_in_release .= sprintf "            %-24s=> %s,\n", "'$key'",
       defined $delta_data->{changed}{$key} ? "'"
         . $delta_data->{changed}{$key} . "'" : "undef";
 }
 $versions_in_release .= "        },\n";
 $versions_in_release .= "        removed => {\n";
-for my $key (sort keys($delta_data->{removed} || {})) {
+for my $key (sort keys %{ $delta_data->{removed} || {} }) {
   $versions_in_release .= sprintf "            %-24s=> %s,\n", "'$key'", 1;
 }
 $versions_in_release .= "        }\n";
@@ -261,14 +260,14 @@ $corelist =~ s/^%upstream .*? ;$/$upstream_stanza/ismx;
   my $deprecated_stanza = "    " . $perl_vnum . " => {\n";
   $deprecated_stanza .= "        delta_from => $delta_data->{delta_from},\n";
   $deprecated_stanza .= "        changed => {\n";
-  foreach my $key (sort keys $delta_data->{changed}) {
+  foreach my $key (sort keys $delta_data->{changed}->%*) {
     $deprecated_stanza .= sprintf "            %-24s=> %s,\n", "'$key'",
         defined $delta_data->{changed}{$key} ? "'"
           . $delta_data->{changed}{$key} . "'" : "undef";
   }
   $deprecated_stanza .= "        },\n";
   $deprecated_stanza .= "        removed => {\n";
-  for my $key (sort keys($delta_data->{removed} || {})) {
+  for my $key (sort keys %{ $delta_data->{removed} || {} }) {
     $deprecated_stanza .= sprintf "           %-24s=> %s,\n", "'$key'", 1;
   }
   $deprecated_stanza .= "        }\n";
@@ -312,14 +311,14 @@ my $delta_utils = make_coreutils_delta($perl_vnum, \%utils);
 my $utilities_in_release = "    " . $perl_vnum . " => {\n";
 $utilities_in_release .= "        delta_from => $delta_utils->{delta_from},\n";
 $utilities_in_release .= "        changed => {\n";
-foreach my $key (sort keys $delta_utils->{changed}) {
+foreach my $key (sort keys $delta_utils->{changed}->%*) {
   $utilities_in_release .= sprintf "            %-24s=> %s,\n", "'$key'",
       defined $delta_utils->{changed}{$key} ? "'"
         . $delta_utils->{changed}{$key} . "'" : "undef";
 }
 $utilities_in_release .= "        },\n";
 $utilities_in_release .= "        removed => {\n";
-for my $key (sort keys($delta_utils->{removed} || {})) {
+for my $key (sort keys %{ $delta_utils->{removed} || {} }) {
   $utilities_in_release .= sprintf "            %-24s=> %s,\n", "'$key'", 1;
 }
 $utilities_in_release .= "        }\n";
@@ -375,8 +374,8 @@ sub make_corelist_delta {
   }
 
   my $smallest = (sort {
-      ((keys($deltas{$a}->{changed}) + keys($deltas{$a}->{removed})) <=>
-       (keys($deltas{$b}->{changed}) + keys($deltas{$b}->{removed}))) ||
+      ((keys($deltas{$a}->{changed}->%*) + keys($deltas{$a}->{removed}->%*)) <=>
+       (keys($deltas{$b}->{changed}->%*) + keys($deltas{$b}->{removed}->%*))) ||
       $b <=> $a
     } keys %deltas)[0];
 
@@ -409,8 +408,8 @@ sub make_coreutils_delta {
   }
 
   my $smallest = (sort {
-      ((keys($deltas{$a}->{changed}) + keys($deltas{$a}->{removed})) <=>
-       (keys($deltas{$b}->{changed}) + keys($deltas{$b}->{removed}))) ||
+      ((keys($deltas{$a}->{changed}->%*) + keys($deltas{$a}->{removed}->%*)) <=>
+       (keys($deltas{$b}->{changed}->%*) + keys($deltas{$b}->{removed}->%*))) ||
       $b <=> $a
     } keys %deltas)[0];
 
@@ -426,13 +425,13 @@ sub calculate_delta {
   my($from, $to) = @_;
   my(%changed, %removed);
 
-  for my $package(keys $from) {
+  for my $package(keys %$from) {
     if(not exists $to->{$package}) {
       $removed{$package} = 1;
     }
   }
 
-  for my $package(keys $to) {
+  for my $package(keys %$to) {
     if(!exists $from->{$package}
         || (defined $from->{$package} && !defined $to->{$package})
         || (!defined $from->{$package} && defined $to->{$package})