gofmt simplify

diff --git a/client_test.go b/client_test.go
index 0835a9760ea499e7325c01dfb180bc76b03a6d80..7aad22f824d85878a6ffe09d9f18f28a26f167f2 100644 (file)
--- a/client_test.go
+++ b/client_test.go
@@ -576,7 +576,7 @@ func TestCompletedPieceWrongSize(t *testing.T) {
                PieceLength: 15,
                Pieces:      make([]byte, 20),
                Files: []metainfo.FileInfo{
-                       metainfo.FileInfo{Path: []string{"greeting"}, Length: 13},
+                       {Path: []string{"greeting"}, Length: 13},
                },
        }
        b, err := bencode.Marshal(info)
@@ -993,7 +993,7 @@ func TestClientDynamicListenPortNoProtocols(t *testing.T) {
 
 func addClientPeer(t *Torrent, cl *Client) {
        t.AddPeers([]Peer{
-               Peer{
+               {
                        IP:   missinggo.AddrIP(cl.ListenAddr()),
                        Port: missinggo.AddrPort(cl.ListenAddr()),
                },
@@ -1100,7 +1100,7 @@ func TestMultipleTorrentsWithEncryption(t *testing.T) {
        testutil.ExportStatusWriter(client, "c")
        tr, err := client.AddMagnet(magnet1)
        require.NoError(t, err)
-       tr.AddPeers([]Peer{Peer{
+       tr.AddPeers([]Peer{{
                IP:   missinggo.AddrIP(server.ListenAddr()),
                Port: missinggo.AddrPort(server.ListenAddr()),
        }})

diff --git a/dht/krpc/msg_test.go b/dht/krpc/msg_test.go
index 7b30cf02b21c5d48fd29fde91cb27e12d94b3425..d5e20407eb9db57c9ffad0c70ac106b494868c74 100644 (file)
--- a/dht/krpc/msg_test.go
+++ b/dht/krpc/msg_test.go
@@ -59,7 +59,7 @@ func TestMarshalUnmarshalMsg(t *testing.T) {
                T: "\x8c%",
                R: &Return{
                        Values: []util.CompactPeer{
-                               util.CompactPeer{
+                               {
                                        IP:   net.IPv4(1, 2, 3, 4).To4(),
                                        Port: 0x5678,
                                },

diff --git a/fs/torrentfs_test.go b/fs/torrentfs_test.go
index e77d63cd3995c581f543e11e474a3b5ff084e1d7..53fcc400b06185796dedf2dc7517cc4b992b8c1d 100644 (file)
--- a/fs/torrentfs_test.go
+++ b/fs/torrentfs_test.go
@@ -186,7 +186,7 @@ func TestDownloadOnDemand(t *testing.T) {
        defer leecher.Close()
        leecherTorrent, _ := leecher.AddTorrent(layout.Metainfo)
        leecherTorrent.AddPeers([]torrent.Peer{
-               torrent.Peer{
+               {
                        IP:   missinggo.AddrIP(seeder.ListenAddr()),
                        Port: missinggo.AddrPort(seeder.ListenAddr()),
                },

diff --git a/tracker/udp_test.go b/tracker/udp_test.go
index df639dbd83818bc4befc223dffcf061aa72676f2..4bff2f85dc1974eb33364f402527d36bde4f10cc 100644 (file)
--- a/tracker/udp_test.go
+++ b/tracker/udp_test.go
@@ -88,7 +88,7 @@ func TestAnnounceLocalhost(t *testing.T) {
        t.Parallel()
        srv := server{
                t: map[[20]byte]torrent{
-                       [20]byte{0xa3, 0x56, 0x41, 0x43, 0x74, 0x23, 0xe6, 0x26, 0xd9, 0x38, 0x25, 0x4a, 0x6b, 0x80, 0x49, 0x10, 0xa6, 0x67, 0xa, 0xc1}: {
+                       {0xa3, 0x56, 0x41, 0x43, 0x74, 0x23, 0xe6, 0x26, 0xd9, 0x38, 0x25, 0x4a, 0x6b, 0x80, 0x49, 0x10, 0xa6, 0x67, 0xa, 0xc1}: {
                                Seeders:  1,
                                Leechers: 2,
                                Peers: []util.CompactPeer{

diff --git a/util/dirwatch/dirwatch.go b/util/dirwatch/dirwatch.go
index 3c506637659cbc1325ee492820d842a5075327e6..4b71a2a60672138832a084ea024cffbb97448b05 100644 (file)
--- a/util/dirwatch/dirwatch.go
+++ b/util/dirwatch/dirwatch.go
@@ -169,7 +169,7 @@ func (i *Instance) torrentAdded(e entity) {
 func (i *Instance) refresh() {
        _new := scanDir(i.dirName)
        old := i.dirState
-       for ih, _ := range old {
+       for ih := range old {
                _, ok := _new[ih]
                if !ok {
                        i.torrentRemoved(ih)