From a7d4f457ec2b4531b3aaeb6cef1383bbda5b431a Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 31 Dec 2019 10:30:12 +0000 Subject: filter/base: export REJECT as a constant And update callers to use it, as it makes the code a bit cleaner. Probably irrelvant, but it should be faster, too, as "perl -I lib -w -MO=Deparse $FILE" shows REJECT() calls are constant-folded. --- lib/PublicInbox/Filter/Base.pm | 2 ++ lib/PublicInbox/InboxWritable.pm | 3 +-- lib/PublicInbox/WatchMaildir.pm | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/PublicInbox/Filter/Base.pm b/lib/PublicInbox/Filter/Base.pm index 7a0c720f..81adab2a 100644 --- a/lib/PublicInbox/Filter/Base.pm +++ b/lib/PublicInbox/Filter/Base.pm @@ -6,6 +6,8 @@ package PublicInbox::Filter::Base; use strict; use warnings; use PublicInbox::MsgIter; +use parent qw(Exporter); +our @EXPORT_OK = qw(REJECT); # we may export IGNORE if/when needed sub No ($) { "*** We only accept plain-text mail, No $_[0] ***" } diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm index d8391251..228e786c 100644 --- a/lib/PublicInbox/InboxWritable.pm +++ b/lib/PublicInbox/InboxWritable.pm @@ -7,8 +7,7 @@ use strict; use warnings; use base qw(PublicInbox::Inbox); use PublicInbox::Import; -use PublicInbox::Filter::Base; -*REJECT = *PublicInbox::Filter::Base::REJECT; +use PublicInbox::Filter::Base qw(REJECT); use constant { PERM_UMASK => 0, diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm index 003baec9..7803b58a 100644 --- a/lib/PublicInbox/WatchMaildir.pm +++ b/lib/PublicInbox/WatchMaildir.pm @@ -10,9 +10,8 @@ use PublicInbox::MIME; use PublicInbox::Spawn qw(spawn); use PublicInbox::InboxWritable; use File::Temp 0.19 (); -use PublicInbox::Filter::Base; +use PublicInbox::Filter::Base qw(REJECT); use PublicInbox::Spamcheck; -*REJECT = *PublicInbox::Filter::Base::REJECT; *maildir_path_load = *PublicInbox::InboxWritable::maildir_path_load; sub new { -- cgit v1.2.3-24-ge0c7