get rid of unnecessary bytes::length usage

[public-inbox.git] / lib / PublicInbox / ViewDiff.pm

diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index 8fe7261ff2909220b7e3e28c6f7f07b97c9e173f..f492b6971981706753480f8bc36554f7cd43b120 100644 (file)
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -7,17 +7,15 @@
 # (or reconstruct) blobs.
 
 package PublicInbox::ViewDiff;
-use 5.010_001;
 use strict;
-use warnings;
-use base qw(Exporter);
+use v5.10.1;
+use parent qw(Exporter);
 our @EXPORT_OK = qw(flush_diff);
 use URI::Escape qw(uri_escape_utf8);
 use PublicInbox::Hval qw(ascii_html to_attr);
 use PublicInbox::Git qw(git_unquote);
 
-sub UNSAFE () { "^A-Za-z0-9\-\._~/" }
-
+my $UNSAFE = "^A-Za-z0-9\-\._~/"; # '/' + $URI::Escape::Unsafe{RFC3986}
 my $OID_NULL = '0{7,}';
 my $OID_BLOB = '[a-f0-9]{7,}';
 my $LF = qr!\n!;
@@ -30,7 +28,7 @@ my $DIFFSTAT_COMMENT =
 my $NULL_TO_BLOB = qr/^(index $OID_NULL\.\.)($OID_BLOB)\b/ms;
 my $BLOB_TO_NULL = qr/^index ($OID_BLOB)(\.\.$OID_NULL)\b/ms;
 my $BLOB_TO_BLOB = qr/^index ($OID_BLOB)\.\.($OID_BLOB)/ms;
-my $EXTRACT_DIFFS = qr/(
+our $EXTRACT_DIFFS = qr/(
                (?:     # begin header stuff, don't capture filenames, here,
                        # but instead wait for the --- and +++ lines.
                        (?:^diff\x20--git\x20$FN\x20$FN$LF)
@@ -41,7 +39,7 @@ my $EXTRACT_DIFFS = qr/(
                ^index\x20($OID_BLOB)\.\.($OID_BLOB)$ANY*$LF
                ^---\x20($FN)$LF
                ^\+{3}\x20($FN)$LF)/msx;
-my $IS_OID = qr/\A$OID_BLOB\z/s;
+our $IS_OID = qr/\A$OID_BLOB\z/s;
 
 # link to line numbers in blobs
 sub diff_hunk ($$$$) {
@@ -79,7 +77,7 @@ sub anchor0 ($$$$) {
        # which works well in practice. If projects put "=>", or trailing
        # spaces in filenames, oh well :P
        $fn =~ s/$DIFFSTAT_COMMENT//;
-       $fn =~ s/{(?:.+) => (.+)}/$1/ or $fn =~ s/.* => (.+)/$1/;
+       $fn =~ s/\{(?:.+) => (.+)\}/$1/ or $fn =~ s/.* => (.+)/$1/;
        $fn = git_unquote($fn);
 
        # long filenames will require us to check in anchor1()
@@ -122,17 +120,17 @@ sub diff_header ($$$) {
        my $dctx = { spfx => $spfx };
 
        # get rid of leading "a/" or "b/" (or whatever --{src,dst}-prefix are)
-       $pa = (split('/', git_unquote($pa), 2))[1] if $pa ne '/dev/null';
-       $pb = (split('/', git_unquote($pb), 2))[1] if $pb ne '/dev/null';
+       $pa = (split(m'/', git_unquote($pa), 2))[1] if $pa ne '/dev/null';
+       $pb = (split(m'/', git_unquote($pb), 2))[1] if $pb ne '/dev/null';
        if ($pa eq $pb && $pb ne '/dev/null') {
-               $dctx->{Q} = "?b=".uri_escape_utf8($pb, UNSAFE);
+               $dctx->{Q} = "?b=".uri_escape_utf8($pb, $UNSAFE);
        } else {
                my @q;
                if ($pb ne '/dev/null') {
-                       push @q, 'b='.uri_escape_utf8($pb, UNSAFE);
+                       push @q, 'b='.uri_escape_utf8($pb, $UNSAFE);
                }
                if ($pa ne '/dev/null') {
-                       push @q, 'a='.uri_escape_utf8($pa, UNSAFE);
+                       push @q, 'a='.uri_escape_utf8($pa, $UNSAFE);
                }
                $dctx->{Q} = '?'.join('&', @q);
        }