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,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 4C64D1F4C5; Tue, 15 Oct 2019 20:36:34 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Cc: "Eric W. Biederman" Subject: [PATCH 4/7] config: avoid unnecessary '||' use Date: Tue, 15 Oct 2019 20:36:30 +0000 Message-Id: <20191015203633.17665-5-e@80x24.org> In-Reply-To: <20191015203633.17665-1-e@80x24.org> References: <20191015203633.17665-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: '//' is available in Perl 5.10+ which allows `0' and `""' (empty string) to remain unclobbered. We also don't need '||=' for initializing our internal caches. --- lib/PublicInbox/Config.pm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 2b99346a..e0329ebf 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -29,13 +29,13 @@ sub new { } bless $self, $class; # caches - $self->{-by_addr} ||= {}; - $self->{-by_list_id} ||= {}; - $self->{-by_name} ||= {}; - $self->{-by_newsgroup} ||= {}; - $self->{-no_obfuscate} ||= {}; - $self->{-limiters} ||= {}; - $self->{-code_repos} ||= {}; # nick => PublicInbox::Git object + $self->{-by_addr} = {}; + $self->{-by_list_id} = {}; + $self->{-by_name} = {}; + $self->{-by_newsgroup} = {}; + $self->{-no_obfuscate} = {}; + $self->{-limiters} = {}; + $self->{-code_repos} = {}; # nick => PublicInbox::Git object $self->{-cgitrc_unparsed} = $self->{'publicinbox.cgitrc'}; if (my $no = delete $self->{'publicinbox.noobfuscate'}) { @@ -85,7 +85,7 @@ sub lookup_list_id { sub lookup_name ($$) { my ($self, $name) = @_; - $self->{-by_name}->{$name} || _fill($self, "publicinbox.$name"); + $self->{-by_name}->{$name} // _fill($self, "publicinbox.$name"); } sub each_inbox { @@ -106,7 +106,7 @@ sub lookup_newsgroup { sub limiter { my ($self, $name) = @_; - $self->{-limiters}->{$name} ||= do { + $self->{-limiters}->{$name} //= do { require PublicInbox::Qspawn; my $max = $self->{"publicinboxlimiter.$name.max"} || 1; my $limiter = PublicInbox::Qspawn::Limiter->new($max); @@ -115,7 +115,7 @@ sub limiter { }; } -sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" } +sub config_dir { $ENV{PI_DIR} // "$ENV{HOME}/.public-inbox" } sub default_file { my $f = $ENV{PI_CONFIG}; @@ -206,8 +206,8 @@ sub cgit_repo_merge ($$$) { $self->{-cgit_remove_suffix} and $rel =~ s!/?\.git\z!!; } - $self->{"coderepo.$rel.dir"} ||= $path; - $self->{"coderepo.$rel.cgiturl"} ||= $rel; + $self->{"coderepo.$rel.dir"} //= $path; + $self->{"coderepo.$rel.cgiturl"} //= $rel; } sub is_git_dir ($) { @@ -338,7 +338,7 @@ sub _fill_code_repo { # cgit supports "/blob/?id=%s", but it's only a plain-text # display and requires an unabbreviated id= foreach my $t (qw(blob commit tag)) { - $git->{$t.'_url_format'} ||= map { + $git->{$t.'_url_format'} //= map { "$_/$t/?id=%s" } @$cgits; } @@ -426,7 +426,7 @@ sub _fill { $valid += valid_inbox_name($_) foreach (@parts); $valid == scalar(@parts) or next; - my $repo = $code_repos->{$nick} ||= + my $repo = $code_repos->{$nick} //= _fill_code_repo($self, $nick); push @$repo_objs, $repo if $repo; }