Remove useless trailing commas in Perl scripts

We no longer need the CodeLayout::RequireTrailingCommaAtNewline
perlcritic policy.

Author: Julien-Elie

.perlcriticrc

@@ -205,6 +205,12 @@ allow = lock
 # innreport.
 [-CodeLayout::RequireFinalSemicolon]
 
+# perltidy takes care of the preferred formatting with regards to trailing
+# commas.  Its -dwic flag omits the comma if there is a single argument so that
+# the call will be collapsed to a single line if it will fit whereas this
+# policy always wants it.
+[-CodeLayout::RequireTrailingCommaAtNewline]
+
 # Getopt::Std is still used and fits our needs.
 [-Community::PreferredAlternatives]
 

.perltidyrc

@@ -28,6 +28,8 @@
 -wtc=m          # add trailing commas to all multi-line lists
 -atc            # add trailing commas where needed
 -dtc            # delete trailing commas where needed
+-altc           # add trailing comma to long arguments (perlcritic needs this)
+-dwic           # delete commas that interfere with welding
 -dia            # delete interbracket arrows
 -viu            # align trailing unless with if
 

control/perl-nocem.in

@@ -14,7 +14,7 @@
 # Documentation improved by Jeffrey M. Vinocur (2002), Russ Allbery (2006)
 # and Julien Élie (2007).
 # Various bug fixes, code and documentation improvements by Julien Élie
-# in 2007-2009, 2013, 2014, 2016, 2018, 2020-2024.
+# in 2007-2009, 2013, 2014, 2016, 2018, 2020-2025.
 ##############################################################################
 
 require 5.00403;
@@ -248,7 +248,7 @@ sub do_nocem {
               . "(%d ids, %d skipped, %.5f s, %.1f/s)",
             $msgid, $nid, $issuer, $type, $nr, $skipped, $diff,
             ($nr + $skipped) / $diff,
-        ),
+        )
     );
 }
 
@@ -350,7 +350,7 @@ sub read_nocem {
                 "Article %s: %s notice %s by %s for %s (%d ids)",
                 $msgid, $opt_u ? "skipped" : "unwanted", $hdrs{'notice-id'},
                 $hdrs{issuer}, $hdrs{type}, $skipped,
-            ),
+            )
         );
         return;
     }

perl/INN/ovsqlite_client.pm

@@ -400,12 +400,12 @@ BEGIN {
             {
                 name    => "cutofflow",
                 default => 0,
-            },
+            }
         ],
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -453,7 +453,7 @@ BEGIN {
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -490,7 +490,7 @@ BEGIN {
             {
                 name     => "groupname",
                 required => 1,
-            },
+            }
         ],
         [
             {
@@ -544,12 +544,12 @@ BEGIN {
             {
                 name     => "groupname",
                 required => 1,
-            },
+            }
         ],
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -659,7 +659,7 @@ BEGIN {
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -733,7 +733,7 @@ BEGIN {
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -831,7 +831,7 @@ BEGIN {
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -1004,7 +1004,7 @@ BEGIN {
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -1055,12 +1055,12 @@ BEGIN {
             {
                 name     => "groupname",
                 required => 1,
-            },
+            }
         ],
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -1103,7 +1103,7 @@ BEGIN {
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -1141,7 +1141,7 @@ BEGIN {
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 
@@ -1168,12 +1168,12 @@ BEGIN {
             {
                 name     => "callback",
                 required => 1,
-            },
+            }
         ],
         [
             {
                 name => "errmsg",
-            },
+            }
         ],
     );
 

scripts/inncheck.in

@@ -533,7 +533,7 @@ sub incoming_conf {
             },
             'group' => {},
             'peer'  => {},
-        },
+        }
     );
     return;
 }
@@ -659,7 +659,7 @@ sub innfeed_conf {
             '<include>' => {
                 '$INCLUDE' => 'ignore',
             },
-        },
+        }
     );
     # check some numeric values
     foreach my $group (keys %groups) {
@@ -1043,7 +1043,7 @@ sub readers_conf {
             '<include>' => {
                 'include' => 'ignore',
             },
-        },
+        }
     );
     return;
 }
@@ -1063,8 +1063,8 @@ sub storage_conf {
                 'exactmatch' => 'boolean',
                 'filtered'   => 'boolean',
                 'path'       => 'string',    # uwildmat_poison
-            },
-        },
+            }
+        }
     );
     # allowed method names include: cnfs timecaf timehash tradspool trash
     foreach my $method (keys %groups) {