From 3b7b5442c4321ae802867cbda9bd33235ab2a5a3 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 18 Apr 2021 08:31:39 +0000 Subject: [PATCH] avoid wrong/needless squote_maybe shortcuts We'll keep it in PublicInbox::Config for now, since I'm not sure if there's a better place to put it. --- lib/PublicInbox/LeiSavedSearch.pm | 4 +--- t/reply.t | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm index f40fe76b..3076d14c 100644 --- a/lib/PublicInbox/LeiSavedSearch.pm +++ b/lib/PublicInbox/LeiSavedSearch.pm @@ -13,8 +13,6 @@ use PublicInbox::Spawn qw(run_die); use PublicInbox::ContentHash qw(git_sha); use Digest::SHA qw(sha256_hex); -*squote_maybe = \&PublicInbox::Config::squote_maybe; - # move this to PublicInbox::Config if other things use it: my %cquote = ("\n" => '\\n', "\t" => '\\t', "\b" => '\\b'); sub cquote_val ($) { # cf. git-config(1) @@ -61,7 +59,7 @@ sub new { $self->{-cfg} = {}; my $f = $self->{'-f'} = "$dir/lei.saved-search"; open my $fh, '>', $f or return $lei->fail("open $f: $!"); - my $sq_dst = squote_maybe($dst); + my $sq_dst = PublicInbox::Config::squote_maybe($dst); my $q = $lei->{mset_opt}->{q_raw} // die 'BUG: {q_raw} missing'; if (ref $q) { $q = join("\n", map { "\tq = ".cquote_val($_) } @$q); diff --git a/t/reply.t b/t/reply.t index 1e89973e..41d72db2 100644 --- a/t/reply.t +++ b/t/reply.t @@ -1,8 +1,9 @@ +#!perl -w # Copyright (C) 2017-2021 all contributors # License: AGPL-3+ use strict; -use warnings; use Test::More; +use PublicInbox::Config; use PublicInbox::Eml; use_ok 'PublicInbox::Reply'; @@ -15,7 +16,7 @@ my @q = ( while (@q) { my $input = shift @q; my $expect = shift @q; - my $res = PublicInbox::Reply::squote_maybe($input); + my $res = PublicInbox::Config::squote_maybe($input); is($res, $expect, "quote $input => $res"); } -- 2.44.0