solver: drop warnings, modernize use v5.10.1, use SEEK_SET

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index c32a5baecdbc2a6366c64bb3ad79400e9eacdb34..dd95f40043b14c3cf230393845ed812bf898d489 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -9,12 +9,11 @@
 # local filesystem layouts in the process.
 package PublicInbox::SolverGit;
 use strict;
-use warnings;
-use 5.010_001;
+use v5.10.1;
 use File::Temp 0.19 (); # 0.19 for ->newdir
 use Fcntl qw(SEEK_SET);
 use PublicInbox::Git qw(git_unquote git_quote);
-use PublicInbox::MsgIter qw(msg_iter msg_part_text);
+use PublicInbox::MsgIter qw(msg_part_text);
 use PublicInbox::Qspawn;
 use PublicInbox::Tmpfile;
 use URI::Escape qw(uri_escape_utf8);
@@ -229,12 +228,11 @@ sub find_extract_diffs ($$$) {
                }
        }
 
-       my $msgs = $srch->query($q, { relevance => 1 });
-
+       my $mset = $srch->mset($q, { relevance => 1 });
        my $diffs = [];
-       foreach my $smsg (@$msgs) {
-               $ibx->smsg_mime($smsg) or next;
-               msg_iter(delete $smsg->{mime}, \&extract_diff,
+       for my $smsg (@{$srch->mset_to_smsg($ibx, $mset)}) {
+               my $eml = $ibx->smsg_eml($smsg) or next;
+               $eml->each_part(\&extract_diff,
                                [$self, $diffs, $pre, $post, $ibx, $smsg], 1);
        }
        @$diffs ? $diffs : undef;
@@ -271,7 +269,7 @@ sub prepare_index ($) {
        my $in = tmpfile("update-index.$oid_full") or die "tmpfile: $!";
        print $in "$mode_a $oid_full\t$path_a\0" or die "print: $!";
        $in->flush or die "flush: $!";
-       sysseek($in, 0, 0) or die "seek: $!";
+       sysseek($in, 0, SEEK_SET) or die "seek: $!";
 
        dbg($self, 'preparing index');
        my $rdr = { 0 => $in };
@@ -594,7 +592,7 @@ sub new {
 }
 
 # recreate $oid_want using $hints
-# hints keys: path_a, path_b, oid_a
+# hints keys: path_a, path_b, oid_a (note: `oid_b' is NOT a hint)
 # Calls {user_cb} with: [ ::Git object, oid_full, type, size, di (diff_info) ]
 # with found object, or undef if nothing was found
 # Calls {user_cb} with a string error on fatal errors