all: sort imports
R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5319072
diff --git a/src/cmd/godoc/index.go b/src/cmd/godoc/index.go
index 68d1abe..172eae3 100644
--- a/src/cmd/godoc/index.go
+++ b/src/cmd/godoc/index.go
@@ -43,8 +43,8 @@
"errors"
"go/ast"
"go/parser"
- "go/token"
"go/scanner"
+ "go/token"
"gob"
"index/suffixarray"
"io"
diff --git a/src/cmd/godoc/snippet.go b/src/cmd/godoc/snippet.go
index 68e27d9..c2b74ee 100644
--- a/src/cmd/godoc/snippet.go
+++ b/src/cmd/godoc/snippet.go
@@ -11,9 +11,9 @@
import (
"bytes"
+ "fmt"
"go/ast"
"go/token"
- "fmt"
)
type Snippet struct {
diff --git a/src/cmd/govet/govet.go b/src/cmd/govet/govet.go
index e826f89..e62c16f 100644
--- a/src/cmd/govet/govet.go
+++ b/src/cmd/govet/govet.go
@@ -10,11 +10,11 @@
"bytes"
"flag"
"fmt"
- "io"
"go/ast"
"go/parser"
"go/printer"
"go/token"
+ "io"
"os"
"path/filepath"
"reflect"
diff --git a/src/cmd/goyacc/goyacc.go b/src/cmd/goyacc/goyacc.go
index d1a9079..ff18fa7 100644
--- a/src/cmd/goyacc/goyacc.go
+++ b/src/cmd/goyacc/goyacc.go
@@ -45,12 +45,12 @@
//
import (
+ "bufio"
+ "bytes"
"flag"
"fmt"
- "bufio"
"os"
"strings"
- "bytes"
)
// the following are adjustable
diff --git a/src/pkg/archive/zip/reader.go b/src/pkg/archive/zip/reader.go
index 64152b4..b705ebe 100644
--- a/src/pkg/archive/zip/reader.go
+++ b/src/pkg/archive/zip/reader.go
@@ -7,10 +7,10 @@
import (
"bufio"
"compress/flate"
+ "encoding/binary"
"errors"
"hash"
"hash/crc32"
- "encoding/binary"
"io"
"io/ioutil"
"os"
diff --git a/src/pkg/container/heap/heap_test.go b/src/pkg/container/heap/heap_test.go
index 6625e3a..cb31ef6 100644
--- a/src/pkg/container/heap/heap_test.go
+++ b/src/pkg/container/heap/heap_test.go
@@ -5,8 +5,8 @@
package heap_test
import (
- "testing"
. "container/heap"
+ "testing"
)
type myHeap []int
diff --git a/src/pkg/crypto/ecdsa/ecdsa_test.go b/src/pkg/crypto/ecdsa/ecdsa_test.go
index d6b4039..baa3c9e 100644
--- a/src/pkg/crypto/ecdsa/ecdsa_test.go
+++ b/src/pkg/crypto/ecdsa/ecdsa_test.go
@@ -7,8 +7,8 @@
import (
"big"
"crypto/elliptic"
- "crypto/sha1"
"crypto/rand"
+ "crypto/sha1"
"encoding/hex"
"testing"
)
diff --git a/src/pkg/crypto/hmac/hmac_test.go b/src/pkg/crypto/hmac/hmac_test.go
index bcae63b..03431c9 100644
--- a/src/pkg/crypto/hmac/hmac_test.go
+++ b/src/pkg/crypto/hmac/hmac_test.go
@@ -5,8 +5,8 @@
package hmac
import (
- "hash"
"fmt"
+ "hash"
"testing"
)
diff --git a/src/pkg/crypto/openpgp/s2k/s2k_test.go b/src/pkg/crypto/openpgp/s2k/s2k_test.go
index ec4012c..3a094a10 100644
--- a/src/pkg/crypto/openpgp/s2k/s2k_test.go
+++ b/src/pkg/crypto/openpgp/s2k/s2k_test.go
@@ -6,8 +6,8 @@
import (
"bytes"
- "crypto/sha1"
"crypto/rand"
+ "crypto/sha1"
"encoding/hex"
"testing"
)
diff --git a/src/pkg/crypto/tls/generate_cert.go b/src/pkg/crypto/tls/generate_cert.go
index 41206e2..ee8784c 100644
--- a/src/pkg/crypto/tls/generate_cert.go
+++ b/src/pkg/crypto/tls/generate_cert.go
@@ -9,10 +9,10 @@
import (
"big"
- "crypto/x509/pkix"
"crypto/rand"
"crypto/rsa"
"crypto/x509"
+ "crypto/x509/pkix"
"encoding/pem"
"flag"
"log"
diff --git a/src/pkg/crypto/x509/pkcs1.go b/src/pkg/crypto/x509/pkcs1.go
index 0d3ade3..8338ae1 100644
--- a/src/pkg/crypto/x509/pkcs1.go
+++ b/src/pkg/crypto/x509/pkcs1.go
@@ -7,8 +7,8 @@
import (
"asn1"
"big"
- "errors"
"crypto/rsa"
+ "errors"
)
// pkcs1PrivateKey is a structure which mirrors the PKCS#1 ASN.1 for an RSA private key.
diff --git a/src/pkg/crypto/x509/x509_test.go b/src/pkg/crypto/x509/x509_test.go
index e844978..d113f85 100644
--- a/src/pkg/crypto/x509/x509_test.go
+++ b/src/pkg/crypto/x509/x509_test.go
@@ -6,8 +6,8 @@
import (
"asn1"
- "bytes"
"big"
+ "bytes"
"crypto/dsa"
"crypto/rand"
"crypto/rsa"
diff --git a/src/pkg/debug/gosym/pclntab_test.go b/src/pkg/debug/gosym/pclntab_test.go
index c83e64e..562e7a0 100644
--- a/src/pkg/debug/gosym/pclntab_test.go
+++ b/src/pkg/debug/gosym/pclntab_test.go
@@ -7,8 +7,8 @@
import (
"debug/elf"
"os"
- "testing"
"syscall"
+ "testing"
)
func dotest() bool {
diff --git a/src/pkg/encoding/binary/binary.go b/src/pkg/encoding/binary/binary.go
index 65b9f01..d2f8b1e 100644
--- a/src/pkg/encoding/binary/binary.go
+++ b/src/pkg/encoding/binary/binary.go
@@ -9,8 +9,8 @@
import (
"errors"
- "math"
"io"
+ "math"
"reflect"
)
diff --git a/src/pkg/encoding/binary/binary_test.go b/src/pkg/encoding/binary/binary_test.go
index e3bf17c..fd4fdb0 100644
--- a/src/pkg/encoding/binary/binary_test.go
+++ b/src/pkg/encoding/binary/binary_test.go
@@ -5,8 +5,8 @@
package binary
import (
- "io"
"bytes"
+ "io"
"math"
"reflect"
"testing"
diff --git a/src/pkg/exec/exec_test.go b/src/pkg/exec/exec_test.go
index 6d5e893..8f63653 100644
--- a/src/pkg/exec/exec_test.go
+++ b/src/pkg/exec/exec_test.go
@@ -10,11 +10,11 @@
"fmt"
"io"
"io/ioutil"
- "testing"
"os"
"runtime"
"strconv"
"strings"
+ "testing"
)
func helperCommand(s ...string) *Cmd {
diff --git a/src/pkg/exp/inotify/inotify_linux_test.go b/src/pkg/exp/inotify/inotify_linux_test.go
index aa72604..a6bb46f 100644
--- a/src/pkg/exp/inotify/inotify_linux_test.go
+++ b/src/pkg/exp/inotify/inotify_linux_test.go
@@ -6,8 +6,8 @@
import (
"os"
- "time"
"testing"
+ "time"
)
func TestInotifyEvents(t *testing.T) {
diff --git a/src/pkg/exp/norm/normregtest.go b/src/pkg/exp/norm/normregtest.go
index 6e27f63..744bb1c 100644
--- a/src/pkg/exp/norm/normregtest.go
+++ b/src/pkg/exp/norm/normregtest.go
@@ -17,8 +17,8 @@
"path"
"regexp"
"runtime"
- "strings"
"strconv"
+ "strings"
"time"
"utf8"
)
diff --git a/src/pkg/exp/winfsnotify/winfsnotify_test.go b/src/pkg/exp/winfsnotify/winfsnotify_test.go
index ff7735a..fb2b825 100644
--- a/src/pkg/exp/winfsnotify/winfsnotify_test.go
+++ b/src/pkg/exp/winfsnotify/winfsnotify_test.go
@@ -6,8 +6,8 @@
import (
"os"
- "time"
"testing"
+ "time"
)
func expect(t *testing.T, eventstream <-chan *Event, name string, mask uint32) {
diff --git a/src/pkg/exp/wingui/gui.go b/src/pkg/exp/wingui/gui.go
index a2f16f28..5df2ee0 100644
--- a/src/pkg/exp/wingui/gui.go
+++ b/src/pkg/exp/wingui/gui.go
@@ -6,8 +6,8 @@
import (
"fmt"
- "syscall"
"os"
+ "syscall"
"unsafe"
)
diff --git a/src/pkg/exp/wingui/winapi.go b/src/pkg/exp/wingui/winapi.go
index 3201528..08059df 100644
--- a/src/pkg/exp/wingui/winapi.go
+++ b/src/pkg/exp/wingui/winapi.go
@@ -5,8 +5,8 @@
package main
import (
- "unsafe"
"syscall"
+ "unsafe"
)
type Wndclassex struct {
diff --git a/src/pkg/http/cgi/host_test.go b/src/pkg/http/cgi/host_test.go
index 2bfe18b..fd0e099 100644
--- a/src/pkg/http/cgi/host_test.go
+++ b/src/pkg/http/cgi/host_test.go
@@ -13,14 +13,14 @@
"http"
"http/httptest"
"io"
- "os"
"net"
+ "os"
"path/filepath"
+ "runtime"
"strconv"
"strings"
"testing"
"time"
- "runtime"
)
func newRequest(httpreq string) *http.Request {
diff --git a/src/pkg/http/transfer.go b/src/pkg/http/transfer.go
index 6cb8625..9477218 100644
--- a/src/pkg/http/transfer.go
+++ b/src/pkg/http/transfer.go
@@ -5,8 +5,8 @@
package http
import (
- "bytes"
"bufio"
+ "bytes"
"errors"
"fmt"
"io"
diff --git a/src/pkg/http/transport_windows.go b/src/pkg/http/transport_windows.go
index e0dc857..2a20d22 100644
--- a/src/pkg/http/transport_windows.go
+++ b/src/pkg/http/transport_windows.go
@@ -5,8 +5,8 @@
package http
import (
- "os"
"net"
+ "os"
)
func init() {
diff --git a/src/pkg/image/bmp/reader.go b/src/pkg/image/bmp/reader.go
index ad56865..58bd781 100644
--- a/src/pkg/image/bmp/reader.go
+++ b/src/pkg/image/bmp/reader.go
@@ -9,8 +9,8 @@
import (
"errors"
- "image/color"
"image"
+ "image/color"
"io"
)
diff --git a/src/pkg/image/jpeg/writer_test.go b/src/pkg/image/jpeg/writer_test.go
index 72cec93..76b5281 100644
--- a/src/pkg/image/jpeg/writer_test.go
+++ b/src/pkg/image/jpeg/writer_test.go
@@ -10,8 +10,8 @@
"image/color"
"image/png"
"io/ioutil"
- "rand"
"os"
+ "rand"
"testing"
)
diff --git a/src/pkg/io/multi_test.go b/src/pkg/io/multi_test.go
index bb439f0..0de5cc3 100644
--- a/src/pkg/io/multi_test.go
+++ b/src/pkg/io/multi_test.go
@@ -5,10 +5,10 @@
package io_test
import (
- . "io"
"bytes"
"crypto/sha1"
"fmt"
+ . "io"
"strings"
"testing"
)
diff --git a/src/pkg/log/log.go b/src/pkg/log/log.go
index 55b7e9e..b5368af 100644
--- a/src/pkg/log/log.go
+++ b/src/pkg/log/log.go
@@ -16,10 +16,10 @@
"bytes"
"fmt"
"io"
- "runtime"
"os"
- "time"
+ "runtime"
"sync"
+ "time"
)
// These flags define which text to prefix to each log entry generated by the Logger.
diff --git a/src/pkg/net/ip_test.go b/src/pkg/net/ip_test.go
index 0ca315e..df647ef 100644
--- a/src/pkg/net/ip_test.go
+++ b/src/pkg/net/ip_test.go
@@ -7,8 +7,8 @@
import (
"bytes"
"reflect"
- "testing"
"runtime"
+ "testing"
)
func isEqual(a, b []byte) bool {
diff --git a/src/pkg/net/lookup_windows.go b/src/pkg/net/lookup_windows.go
index b515d0c..61d8a88 100644
--- a/src/pkg/net/lookup_windows.go
+++ b/src/pkg/net/lookup_windows.go
@@ -5,10 +5,10 @@
package net
import (
- "syscall"
- "unsafe"
"os"
"sync"
+ "syscall"
+ "unsafe"
)
var (
diff --git a/src/pkg/net/parse_test.go b/src/pkg/net/parse_test.go
index 8d51eba..dfbaba4 100644
--- a/src/pkg/net/parse_test.go
+++ b/src/pkg/net/parse_test.go
@@ -7,8 +7,8 @@
import (
"bufio"
"os"
- "testing"
"runtime"
+ "testing"
)
func TestReadLine(t *testing.T) {
diff --git a/src/pkg/net/server_test.go b/src/pkg/net/server_test.go
index 9e54449..7d17ccd5 100644
--- a/src/pkg/net/server_test.go
+++ b/src/pkg/net/server_test.go
@@ -8,10 +8,10 @@
"flag"
"io"
"os"
+ "runtime"
"strings"
"syscall"
"testing"
- "runtime"
)
// Do not test empty datagrams by default.
diff --git a/src/pkg/old/netchan/export.go b/src/pkg/old/netchan/export.go
index a4c4c6a..d698dd5 100644
--- a/src/pkg/old/netchan/export.go
+++ b/src/pkg/old/netchan/export.go
@@ -23,8 +23,8 @@
import (
"errors"
- "log"
"io"
+ "log"
"net"
"reflect"
"strconv"
diff --git a/src/pkg/os/env_windows.go b/src/pkg/os/env_windows.go
index 795da21..ad6c8e3 100644
--- a/src/pkg/os/env_windows.go
+++ b/src/pkg/os/env_windows.go
@@ -9,8 +9,8 @@
import (
"errors"
"syscall"
- "utf16"
"unsafe"
+ "utf16"
)
// ENOENV is the error indicating that an environment variable does not exist.
diff --git a/src/pkg/os/path_test.go b/src/pkg/os/path_test.go
index f0da186..89d66c2 100644
--- a/src/pkg/os/path_test.go
+++ b/src/pkg/os/path_test.go
@@ -7,9 +7,9 @@
import (
. "os"
"path/filepath"
- "testing"
"runtime"
"syscall"
+ "testing"
)
func TestMkdirAll(t *testing.T) {
diff --git a/src/pkg/os/stat_windows.go b/src/pkg/os/stat_windows.go
index c9f1c4e..416aeea 100644
--- a/src/pkg/os/stat_windows.go
+++ b/src/pkg/os/stat_windows.go
@@ -5,8 +5,8 @@
package os
import (
- "unsafe"
"syscall"
+ "unsafe"
)
// Stat returns the FileInfo structure describing file.
diff --git a/src/pkg/path/filepath/match_test.go b/src/pkg/path/filepath/match_test.go
index cdf3b66..7bdc449 100644
--- a/src/pkg/path/filepath/match_test.go
+++ b/src/pkg/path/filepath/match_test.go
@@ -6,8 +6,8 @@
import (
. "path/filepath"
- "testing"
"runtime"
+ "testing"
)
type MatchTest struct {
diff --git a/src/pkg/rand/rand_test.go b/src/pkg/rand/rand_test.go
index 66ffa58..76215a9 100644
--- a/src/pkg/rand/rand_test.go
+++ b/src/pkg/rand/rand_test.go
@@ -6,8 +6,8 @@
import (
"errors"
- "math"
"fmt"
+ "math"
"testing"
)
diff --git a/src/pkg/rpc/server.go b/src/pkg/rpc/server.go
index 0f7f0b4..d031533 100644
--- a/src/pkg/rpc/server.go
+++ b/src/pkg/rpc/server.go
@@ -117,8 +117,8 @@
"errors"
"gob"
"http"
- "log"
"io"
+ "log"
"net"
"reflect"
"strings"
diff --git a/src/pkg/runtime/syscall_windows_test.go b/src/pkg/runtime/syscall_windows_test.go
index c99756e..9c3752f 100644
--- a/src/pkg/runtime/syscall_windows_test.go
+++ b/src/pkg/runtime/syscall_windows_test.go
@@ -6,8 +6,8 @@
import (
"syscall"
- "unsafe"
"testing"
+ "unsafe"
)
type DLL struct {
diff --git a/src/pkg/sync/once_test.go b/src/pkg/sync/once_test.go
index 157a366..37075af 100644
--- a/src/pkg/sync/once_test.go
+++ b/src/pkg/sync/once_test.go
@@ -5,9 +5,9 @@
package sync_test
import (
+ "runtime"
. "sync"
"sync/atomic"
- "runtime"
"testing"
)
diff --git a/src/pkg/time/sleep_test.go b/src/pkg/time/sleep_test.go
index 5b02c8d..029a6cc 100644
--- a/src/pkg/time/sleep_test.go
+++ b/src/pkg/time/sleep_test.go
@@ -7,8 +7,8 @@
import (
"errors"
"fmt"
- "testing"
"sort"
+ "testing"
. "time"
)
diff --git a/src/pkg/time/zoneinfo_windows.go b/src/pkg/time/zoneinfo_windows.go
index ba9295c..ba152e0 100644
--- a/src/pkg/time/zoneinfo_windows.go
+++ b/src/pkg/time/zoneinfo_windows.go
@@ -5,9 +5,9 @@
package time
import (
- "syscall"
- "sync"
"os"
+ "sync"
+ "syscall"
)
// BUG(brainman): The Windows implementation assumes that
diff --git a/src/pkg/unicode/maketables.go b/src/pkg/unicode/maketables.go
index b7c23ae..8f511fa 100644
--- a/src/pkg/unicode/maketables.go
+++ b/src/pkg/unicode/maketables.go
@@ -16,10 +16,10 @@
"log"
"os"
"path/filepath"
+ "regexp"
"sort"
"strconv"
"strings"
- "regexp"
"unicode"
)
diff --git a/src/pkg/xml/marshal_test.go b/src/pkg/xml/marshal_test.go
index 59007b3..a6f7d2d 100644
--- a/src/pkg/xml/marshal_test.go
+++ b/src/pkg/xml/marshal_test.go
@@ -5,11 +5,11 @@
package xml
import (
- "reflect"
- "testing"
"bytes"
- "strings"
+ "reflect"
"strconv"
+ "strings"
+ "testing"
)
type DriveType int
