Use rogpeppe's sortimports to fix this goimports ordering madness

client.go

@@ -38,24 +38,23 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/bradfitz/iter"
-
-	"github.com/anacrolix/torrent/mse"
-
 	"github.com/anacrolix/libtorgo/bencode"
 	"github.com/anacrolix/libtorgo/metainfo"
 	"github.com/anacrolix/sync"
+	"github.com/anacrolix/utp"
+	"github.com/bradfitz/iter"
+
 	"github.com/anacrolix/torrent/data"
 	filePkg "github.com/anacrolix/torrent/data/file"
 	"github.com/anacrolix/torrent/dht"
 	"github.com/anacrolix/torrent/internal/pieceordering"
 	"github.com/anacrolix/torrent/iplist"
 	"github.com/anacrolix/torrent/logonce"
+	"github.com/anacrolix/torrent/mse"
 	pp "github.com/anacrolix/torrent/peer_protocol"
 	"github.com/anacrolix/torrent/tracker"
 	_ "github.com/anacrolix/torrent/tracker/udp"
 	. "github.com/anacrolix/torrent/util"
-	"github.com/anacrolix/utp"
 )
 
 var (

client_test.go

@@ -11,14 +11,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/anacrolix/torrent/data/blob"
+	"github.com/anacrolix/libtorgo/bencode"
-
+	"github.com/anacrolix/utp"
 	"github.com/bradfitz/iter"
 
+	"github.com/anacrolix/torrent/data/blob"
 	"github.com/anacrolix/torrent/internal/testutil"
 	"github.com/anacrolix/torrent/util"
-	"github.com/anacrolix/utp"
-	"github.com/anacrolix/libtorgo/bencode"
 )
 
 func init() {

cmd/torrent-verify/main.go

@@ -9,9 +9,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/torrent/mmap_span"
 	"github.com/anacrolix/libtorgo/metainfo"
 	"launchpad.net/gommap"
+
+	"github.com/anacrolix/torrent/mmap_span"
 )
 
 var (

cmd/torrent/main.go

@@ -10,13 +10,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/dustin/go-humanize"
-
-	"github.com/jessevdk/go-flags"
-
 	_ "github.com/anacrolix/envpprof"
-
 	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/dustin/go-humanize"
+	"github.com/jessevdk/go-flags"
 
 	"github.com/anacrolix/torrent"
 )

cmd/torrentfs/main.go

@@ -13,14 +13,13 @@ import (
 	"syscall"
 	"time"
 
-	_ "github.com/anacrolix/envpprof"
-
-	"github.com/anacrolix/torrent/util/dirwatch"
-
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
+	_ "github.com/anacrolix/envpprof"
+
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/fs"
+	"github.com/anacrolix/torrent/util/dirwatch"
 )
 
 var (

connection.go

@@ -12,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/anacrolix/libtorgo/bencode"
+
 	"github.com/anacrolix/torrent/internal/pieceordering"
 	pp "github.com/anacrolix/torrent/peer_protocol"
 )

connection_test.go

@@ -4,12 +4,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/bradfitz/iter"
 	. "gopkg.in/check.v1"
 
-	"github.com/bradfitz/iter"
-
 	"github.com/anacrolix/torrent/internal/pieceordering"
-
 	"github.com/anacrolix/torrent/peer_protocol"
 )
 

data/blob/store.go

@@ -12,8 +12,9 @@ import (
 	"sort"
 	"time"
 
-	dataPkg "github.com/anacrolix/torrent/data"
 	"github.com/anacrolix/libtorgo/metainfo"
+
+	dataPkg "github.com/anacrolix/torrent/data"
 )
 
 const (

data/mmap/mmap.go

@@ -5,9 +5,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/anacrolix/torrent/mmap_span"
 	"github.com/anacrolix/libtorgo/metainfo"
 	"launchpad.net/gommap"
+
+	"github.com/anacrolix/torrent/mmap_span"
 )
 
 func TorrentData(md *metainfo.Info, location string) (mms *mmap_span.MMapSpan, err error) {

dht/dht.go

@@ -14,11 +14,12 @@ import (
 	"os"
 	"time"
 
+	"github.com/anacrolix/libtorgo/bencode"
+	"github.com/anacrolix/sync"
+
 	"github.com/anacrolix/torrent/iplist"
 	"github.com/anacrolix/torrent/logonce"
 	"github.com/anacrolix/torrent/util"
-	"github.com/anacrolix/sync"
-	"github.com/anacrolix/libtorgo/bencode"
 )
 
 const (

dht/getpeers.go

@@ -6,11 +6,11 @@ import (
 	"log"
 	"time"
 
-	"github.com/anacrolix/torrent/logonce"
-
-	"github.com/anacrolix/torrent/util"
 	"github.com/anacrolix/sync"
 	"github.com/willf/bloom"
+
+	"github.com/anacrolix/torrent/logonce"
+	"github.com/anacrolix/torrent/util"
 )
 
 type peerDiscovery struct {

fs/torrentfs.go

@@ -9,11 +9,11 @@ import (
 	"sync"
 	"time"
 
+	"bazil.org/fuse"
+	fusefs "bazil.org/fuse/fs"
 	"github.com/anacrolix/libtorgo/metainfo"
 	"golang.org/x/net/context"
 
-	"bazil.org/fuse"
-	fusefs "bazil.org/fuse/fs"
 	"github.com/anacrolix/torrent"
 )
 

fs/torrentfs_test.go

@@ -14,19 +14,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/anacrolix/torrent/data"
+	"bazil.org/fuse"
-
+	fusefs "bazil.org/fuse/fs"
+	"github.com/anacrolix/libtorgo/metainfo"
 	"golang.org/x/net/context"
 
 	"github.com/anacrolix/torrent"
+	"github.com/anacrolix/torrent/data"
 	"github.com/anacrolix/torrent/data/mmap"
 	"github.com/anacrolix/torrent/internal/testutil"
 	"github.com/anacrolix/torrent/util"
-
-	"github.com/anacrolix/libtorgo/metainfo"
-
-	"bazil.org/fuse"
-	fusefs "bazil.org/fuse/fs"
 )
 
 func TestTCPAddrString(t *testing.T) {

mse/mse.go

@@ -17,9 +17,9 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/anacrolix/torrent/util"
-
 	"github.com/bradfitz/iter"
+
+	"github.com/anacrolix/torrent/util"
 )
 
 const (

mse/mse_test.go

@@ -7,10 +7,9 @@ import (
 	"io/ioutil"
 	"net"
 	"sync"
+	"testing"
 
 	"github.com/bradfitz/iter"
-
-	"testing"
 )
 
 func TestReadUntil(t *testing.T) {

torrent.go

@@ -12,10 +12,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bradfitz/iter"
-
 	"github.com/anacrolix/libtorgo/bencode"
 	"github.com/anacrolix/libtorgo/metainfo"
+	"github.com/bradfitz/iter"
+
 	"github.com/anacrolix/torrent/data"
 	pp "github.com/anacrolix/torrent/peer_protocol"
 	"github.com/anacrolix/torrent/tracker"

util/dirwatch/dirwatch.go

@@ -9,10 +9,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/anacrolix/torrent"
-	"github.com/anacrolix/torrent/util"
 	"github.com/anacrolix/libtorgo/metainfo"
 	"github.com/go-fsnotify/fsnotify"
+
+	"github.com/anacrolix/torrent"
+	"github.com/anacrolix/torrent/util"
 )
 
 type Change uint