From: Matt Joiner Date: Tue, 8 Apr 2014 09:39:34 +0000 (+1000) Subject: goimports decided to reorganise imports X-Git-Tag: v1.0.0~1759 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=1415c0d82408c7e22dc64ce5363b72379914a916;p=btrtrc.git goimports decided to reorganise imports --- diff --git a/cmd/scrape/main.go b/cmd/scrape/main.go index d0ee043e..4b059684 100644 --- a/cmd/scrape/main.go +++ b/cmd/scrape/main.go @@ -1,13 +1,14 @@ package main import ( + "flag" + "log" + "os" + "bitbucket.org/anacrolix/go.torrent" "bitbucket.org/anacrolix/go.torrent/tracker" _ "bitbucket.org/anacrolix/go.torrent/tracker/udp" - "flag" metainfo "github.com/nsf/libtorgo/torrent" - "log" - "os" ) func main() { diff --git a/cmd/torrent-create/main.go b/cmd/torrent-create/main.go index 2ff1d84f..ba372868 100644 --- a/cmd/torrent-create/main.go +++ b/cmd/torrent-create/main.go @@ -2,11 +2,12 @@ package main import ( "flag" - "github.com/nsf/libtorgo/torrent" "log" "os" "path/filepath" "runtime" + + "github.com/nsf/libtorgo/torrent" ) var ( diff --git a/cmd/torrent-metainfo-pprint/main.go b/cmd/torrent-metainfo-pprint/main.go index afe288fa..291fe0ee 100644 --- a/cmd/torrent-metainfo-pprint/main.go +++ b/cmd/torrent-metainfo-pprint/main.go @@ -3,8 +3,9 @@ package main import ( "flag" "fmt" - "github.com/nsf/libtorgo/torrent" "log" + + "github.com/nsf/libtorgo/torrent" ) func main() { diff --git a/cmd/torrent-verify/main.go b/cmd/torrent-verify/main.go index 7becbc80..a107a5da 100644 --- a/cmd/torrent-verify/main.go +++ b/cmd/torrent-verify/main.go @@ -1,17 +1,19 @@ package main import ( - "bitbucket.org/anacrolix/go.torrent" "bytes" "crypto/sha1" "flag" "fmt" + + "bitbucket.org/anacrolix/go.torrent" // "github.com/davecheney/profile" - metainfo "github.com/nsf/libtorgo/torrent" - "launchpad.net/gommap" "log" "os" "path/filepath" + + metainfo "github.com/nsf/libtorgo/torrent" + "launchpad.net/gommap" ) var ( diff --git a/cmd/torrentfs/main.go b/cmd/torrentfs/main.go index 7a13a3fe..694c8938 100644 --- a/cmd/torrentfs/main.go +++ b/cmd/torrentfs/main.go @@ -1,12 +1,7 @@ package main import ( - "bazil.org/fuse" - fusefs "bazil.org/fuse/fs" - "bitbucket.org/anacrolix/go.torrent" - "bitbucket.org/anacrolix/go.torrent/fs" "flag" - metainfo "github.com/nsf/libtorgo/torrent" "log" "net" "net/http" @@ -17,6 +12,12 @@ import ( "path/filepath" "syscall" "time" + + "bazil.org/fuse" + fusefs "bazil.org/fuse/fs" + "bitbucket.org/anacrolix/go.torrent" + "bitbucket.org/anacrolix/go.torrent/fs" + metainfo "github.com/nsf/libtorgo/torrent" ) var ( diff --git a/fs/torrentfs.go b/fs/torrentfs.go index 44710e8a..1c9567f0 100644 --- a/fs/torrentfs.go +++ b/fs/torrentfs.go @@ -1,13 +1,14 @@ package torrentfs import ( + "log" + "os" + "sync" + "bazil.org/fuse" fusefs "bazil.org/fuse/fs" "bitbucket.org/anacrolix/go.torrent" metainfo "github.com/nsf/libtorgo/torrent" - "log" - "os" - "sync" ) const ( diff --git a/mmap_span.go b/mmap_span.go index 3fe53654..810c8257 100644 --- a/mmap_span.go +++ b/mmap_span.go @@ -2,6 +2,7 @@ package torrent import ( "io" + "launchpad.net/gommap" ) diff --git a/tracker/udp/udp_tracker.go b/tracker/udp/udp_tracker.go index 71d79830..76a5ca52 100644 --- a/tracker/udp/udp_tracker.go +++ b/tracker/udp/udp_tracker.go @@ -1,7 +1,6 @@ package udp_tracker import ( - "bitbucket.org/anacrolix/go.torrent/tracker" "bytes" "encoding/binary" "errors" @@ -10,6 +9,8 @@ import ( "net" "net/url" "time" + + "bitbucket.org/anacrolix/go.torrent/tracker" ) type Action int32 diff --git a/tracker/udp/udp_tracker_test.go b/tracker/udp/udp_tracker_test.go index 4d3a9b0d..95df6bc4 100644 --- a/tracker/udp/udp_tracker_test.go +++ b/tracker/udp/udp_tracker_test.go @@ -1,7 +1,6 @@ package udp_tracker import ( - "bitbucket.org/anacrolix/go.torrent/tracker" "bytes" "crypto/rand" "encoding/binary" @@ -10,6 +9,8 @@ import ( "sync" "syscall" "testing" + + "bitbucket.org/anacrolix/go.torrent/tracker" ) // Ensure net.IPs are stored big-endian, to match the way they're read from