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.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE 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 2D6671F59D for ; Sat, 20 Aug 2022 08:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1660982496; bh=5LEgSFokvCIuQ6eJPpQrUHGby5V3clAt1VBqW6I3rvw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Z2b0PRjjGG+yoj201wxkwWGo6xfpuF3RjQ2OElsiYQyPGN8lNJ/mjuDKPslxDeW3n shcbeV7xWxuzYyAth1zyCN/TppX6b1JShk6dKMGD1wLzVZBicVvH+0t1FkHSfsMli8 Ht0tBkaZ2lWNYmx6uK7qTUPgecCrPCKm4+J+dxas= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/5] import: take advantage of some Perl 5.10.x features Date: Sat, 20 Aug 2022 08:01:31 +0000 Message-Id: <20220820080135.58439-2-e@80x24.org> In-Reply-To: <20220820080135.58439-1-e@80x24.org> References: <20220820080135.58439-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We can save a few lines of code this way and reduce the verbosity of some lines we keep. --- lib/PublicInbox/Import.pm | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index 60ce7b66..aef49033 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # # git fast-import-based ssoma-mda MDA replacement @@ -103,7 +103,7 @@ sub _check_path ($$$$) { return if $tip eq ''; print $w "ls $tip $path\n" or wfail; local $/ = "\n"; - defined(my $info = <$r>) or die "EOF from fast-import: $!"; + my $info = <$r> // die "EOF from fast-import: $!"; $info =~ /\Amissing / ? undef : $info; } @@ -111,22 +111,21 @@ sub _cat_blob ($$$) { my ($r, $w, $oid) = @_; print $w "cat-blob $oid\n" or wfail; local $/ = "\n"; - my $info = <$r>; - defined $info or die "EOF from fast-import / cat-blob: $!"; + my $info = <$r> // die "EOF from fast-import / cat-blob: $!"; $info =~ /\A[a-f0-9]{40,} blob ([0-9]+)\n\z/ or return; my $left = $1; my $offset = 0; my $buf = ''; my $n; while ($left > 0) { - $n = read($r, $buf, $left, $offset); - defined($n) or die "read cat-blob failed: $!"; + $n = read($r, $buf, $left, $offset) // + die "read cat-blob failed: $!"; $n == 0 and die 'fast-export (cat-blob) died'; $left -= $n; $offset += $n; } - $n = read($r, my $lf, 1); - defined($n) or die "read final byte of cat-blob failed: $!"; + $n = read($r, my $lf, 1) // + die "read final byte of cat-blob failed: $!"; die "bad read on final byte: <$lf>" if $lf ne "\n"; # fixup some bugginess in old versions: @@ -148,10 +147,8 @@ sub check_remove_v1 { my $oid = $1; my $msg = _cat_blob($r, $w, $oid) or die "BUG: cat-blob $1 failed"; my $cur = PublicInbox::Eml->new($msg); - my $cur_s = $cur->header('Subject'); - $cur_s = '' unless defined $cur_s; - my $cur_m = $mime->header('Subject'); - $cur_m = '' unless defined $cur_m; + my $cur_s = $cur->header('Subject') // ''; + my $cur_m = $mime->header('Subject') // ''; if ($cur_s ne $cur_m || norm_body($cur) ne norm_body($mime)) { return ('MISMATCH', $cur); } @@ -219,7 +216,7 @@ sub get_mark { die "not active\n" unless $self->{in}; my ($r, $w) = $self->gfi_start; print $w "get-mark $mark\n" or wfail; - defined(my $oid = <$r>) or die "get-mark failed, need git 2.6.0+\n"; + my $oid = <$r> // die "get-mark failed, need git 2.6.0+\n"; chomp($oid); $oid; }