From 590a075789b541d5c1a190031fdcf061355bcfbc Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 9 Mar 2023 12:02:18 +0100 Subject: [PATCH] Avoid criticizable perl code Using `require` / `->import` instead of `use` avoids the use of a "stringy eval", making for cleaner code that we don't need to silence perlcritic about. Per Andrew Dunstan Discussion: https://postgr.es/m/7cd3bbbd-0216-4436-d571-8f80c9259a07@dunslane.net --- .../libpq_pipeline/t/001_libpq_pipeline.pl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl index fbac405d0d..7560439fec 100644 --- a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl +++ b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl @@ -9,16 +9,16 @@ use PostgreSQL::Test::Utils; use Test::More; # Use Test::Differences if installed, and select unified diff output. -# No decent way to select a context line count with this; -# we could use a sub ref to allow that. BEGIN { - #<<< protect next line from pgperltidy - if (!eval q{ use Test::Differences; unified_diff(); 1 }) ## no critic (ProhibitStringyEval) - #>>> - { - *eq_or_diff = \&is; - } + eval { + require Test::Differences; + Test::Differences->import; + unified_diff(); + }; + + # No dice -- fall back to 'is' + *eq_or_diff = \&is if $@; } my $node = PostgreSQL::Test::Cluster->new('main'); -- 2.30.2