go vet

diff --git a/cmd/torrent-pick/main.go b/cmd/torrent-pick/main.go
index c41e1a073f675b6bbb279e456a14a1446a16c315..5389e3841e358eaf2e0ed43ae12421fc06bb49af 100644 (file)
--- a/cmd/torrent-pick/main.go
+++ b/cmd/torrent-pick/main.go
@@ -91,7 +91,7 @@ func main() {
        parser.Usage = "[OPTIONS] (magnet URI or .torrent file path)..."
        posArgs, err := parser.Parse()
        if err != nil {
-               fmt.Fprintln(os.Stderr, "Download from the BitTorrent network.\n")
+               fmt.Fprintf(os.Stderr, "%s", "Download from the BitTorrent network.\n\n")
                fmt.Println(err)
                os.Exit(2)
        }

diff --git a/dht/msg_test.go b/dht/msg_test.go
index 1f1aeb3e70a7aeec6913565a655fb232d8927b46..7c84623470f41159ba354bca5e0288df0c2b3df1 100644 (file)
--- a/dht/msg_test.go
+++ b/dht/msg_test.go
@@ -4,10 +4,11 @@ import (
        "net"
        "testing"
 
-       "github.com/anacrolix/torrent/bencode"
-       "github.com/anacrolix/torrent/util"
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/require"
+
+       "github.com/anacrolix/torrent/bencode"
+       "github.com/anacrolix/torrent/util"
 )
 
 func testMarshalUnmarshalMsg(t *testing.T, m Msg, expected string) {
@@ -71,7 +72,10 @@ func TestMarshalUnmarshalMsg(t *testing.T) {
                R: &Return{
                        ID: "\xeb\xff6isQ\xffJ\xec)ͺ\xab\xf2\xfb\xe3F|\xc2g",
                },
-               IP: util.CompactPeer{net.IPv4(124, 168, 180, 8).To4(), 62844},
+               IP: util.CompactPeer{
+                       IP:   net.IPv4(124, 168, 180, 8).To4(),
+                       Port: 62844,
+               },
        }, "d2:ip6:|\xa8\xb4\b\xf5|1:rd2:id20:\xeb\xff6isQ\xffJ\xec)ͺ\xab\xf2\xfb\xe3F|\xc2ge1:t1:\x031:y1:re")
 }
 

diff --git a/metainfo/metainfo.go b/metainfo/metainfo.go
index deb936a203f28857c1b18ccf0c0395f5db3b18ec..ad674887572efdf5f1f578a0408f0e6f16ff63e1 100644 (file)
--- a/metainfo/metainfo.go
+++ b/metainfo/metainfo.go
@@ -92,12 +92,12 @@ func (info *Info) writeFiles(w io.Writer, open func(fi FileInfo) (io.ReadCloser,
        for _, fi := range info.UpvertedFiles() {
                r, err := open(fi)
                if err != nil {
-                       return fmt.Errorf("error opening %s: %s", fi, err)
+                       return fmt.Errorf("error opening %v: %s", fi, err)
                }
                wn, err := io.CopyN(w, r, fi.Length)
                r.Close()
                if wn != fi.Length || err != nil {
-                       return fmt.Errorf("error hashing %s: %s", fi, err)
+                       return fmt.Errorf("error hashing %v: %s", fi, err)
                }
        }
        return nil