From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 784981FD5A for ; Sat, 16 Oct 2021 01:01:04 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 11/12] inbox + search: use 5.10.1 and do some golfing Date: Sat, 16 Oct 2021 01:01:02 +0000 Message-Id: <20211016010103.30825-12-e@80x24.org> In-Reply-To: <20211016010103.30825-1-e@80x24.org> References: <20211016010103.30825-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Some yak-shaving while I try to track down other bugs... --- lib/PublicInbox/Inbox.pm | 11 +++++------ lib/PublicInbox/Search.pm | 7 +++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index 74b8a74f8856..b7b71268187e 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -4,6 +4,7 @@ # Represents a public-inbox (which may have multiple mailing addresses) package PublicInbox::Inbox; use strict; +use v5.10.1; use PublicInbox::Git; use PublicInbox::MID qw(mid2path); use PublicInbox::Eml; @@ -293,17 +294,15 @@ sub msg_by_smsg ($$) { # ghosts may have undef smsg (from SearchThread.node) or # no {blob} field - return unless defined $smsg; - defined(my $blob = $smsg->{blob}) or return; - - $self->git->cat_file($blob); + $smsg // return; + $self->git->cat_file($smsg->{blob} // return); } sub smsg_eml { my ($self, $smsg) = @_; my $bref = msg_by_smsg($self, $smsg) or return; my $eml = PublicInbox::Eml->new($bref); - $smsg->populate($eml) unless exists($smsg->{num}); # v1 w/o SQLite + $smsg->{num} // $smsg->populate($eml); $eml; } @@ -313,7 +312,7 @@ sub smsg_by_mid ($$) { my $smsg; if (my $mm = $self->mm) { # favor the Message-ID we used for the NNTP article number: - defined(my $num = $mm->num_for($mid)) or return; + my $num = $mm->num_for($mid) // return; $smsg = $over->get_art($num); } else { my ($id, $prev); diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 145fb56ce750..600e6400d4b6 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -5,6 +5,7 @@ # Read-only search interface for use by the web and NNTP interfaces package PublicInbox::Search; use strict; +use v5.10.1; use parent qw(Exporter); our @EXPORT_OK = qw(retry_reopen int_val get_pct xap_terms); use List::Util qw(max); @@ -398,12 +399,10 @@ sub retry_reopen { my ($self, $cb, @arg) = @_; for my $i (1..10) { if (wantarray) { - my @ret; - eval { @ret = $cb->($self, @arg) }; + my @ret = eval { $cb->($self, @arg) }; return @ret unless $@; } else { - my $ret; - eval { $ret = $cb->($self, @arg) }; + my $ret = eval { $cb->($self, @arg) }; return $ret unless $@; } # Exception: The revision being read has been discarded -