all: sort imports

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5319072

src/cmd/godoc/index.go

@@ -43,8 +43,8 @@ import (
 	"errors"
 	"go/ast"
 	"go/parser"
-	"go/token"
 	"go/scanner"
+	"go/token"
 	"gob"
 	"index/suffixarray"
 	"io"

src/cmd/godoc/snippet.go

@@ -11,9 +11,9 @@ package main
 
 import (
 	"bytes"
+	"fmt"
 	"go/ast"
 	"go/token"
-	"fmt"
 )
 
 type Snippet struct {

src/cmd/govet/govet.go

@@ -10,11 +10,11 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"io"
 	"go/ast"
 	"go/parser"
 	"go/printer"
 	"go/token"
+	"io"
 	"os"
 	"path/filepath"
 	"reflect"

src/cmd/goyacc/goyacc.go

@@ -45,12 +45,12 @@ package main
 //
 
 import (
+	"bufio"
+	"bytes"
 	"flag"
 	"fmt"
-	"bufio"
 	"os"
 	"strings"
-	"bytes"
 )
 
 // the following are adjustable

src/pkg/archive/zip/reader.go

@@ -7,10 +7,10 @@ package zip
 import (
 	"bufio"
 	"compress/flate"
+	"encoding/binary"
 	"errors"
 	"hash"
 	"hash/crc32"
-	"encoding/binary"
 	"io"
 	"io/ioutil"
 	"os"

src/pkg/container/heap/heap_test.go

@@ -5,8 +5,8 @@
 package heap_test
 
 import (
-	"testing"
 	. "container/heap"
+	"testing"
 )
 
 type myHeap []int

src/pkg/crypto/ecdsa/ecdsa_test.go

@@ -7,8 +7,8 @@ package ecdsa
 import (
 	"big"
 	"crypto/elliptic"
-	"crypto/sha1"
 	"crypto/rand"
+	"crypto/sha1"
 	"encoding/hex"
 	"testing"
 )

src/pkg/crypto/hmac/hmac_test.go

@@ -5,8 +5,8 @@
 package hmac
 
 import (
-	"hash"
 	"fmt"
+	"hash"
 	"testing"
 )
 

src/pkg/crypto/openpgp/s2k/s2k_test.go

@@ -6,8 +6,8 @@ package s2k
 
 import (
 	"bytes"
-	"crypto/sha1"
 	"crypto/rand"
+	"crypto/sha1"
 	"encoding/hex"
 	"testing"
 )

src/pkg/crypto/tls/generate_cert.go

@@ -9,10 +9,10 @@ package main
 
 import (
 	"big"
-	"crypto/x509/pkix"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
+	"crypto/x509/pkix"
 	"encoding/pem"
 	"flag"
 	"log"

src/pkg/crypto/x509/pkcs1.go

@@ -7,8 +7,8 @@ package x509
 import (
 	"asn1"
 	"big"
-	"errors"
 	"crypto/rsa"
+	"errors"
 )
 
 // pkcs1PrivateKey is a structure which mirrors the PKCS#1 ASN.1 for an RSA private key.

src/pkg/crypto/x509/x509_test.go

@@ -6,8 +6,8 @@ package x509
 
 import (
 	"asn1"
-	"bytes"
 	"big"
+	"bytes"
 	"crypto/dsa"
 	"crypto/rand"
 	"crypto/rsa"

src/pkg/debug/gosym/pclntab_test.go

@@ -7,8 +7,8 @@ package gosym
 import (
 	"debug/elf"
 	"os"
-	"testing"
 	"syscall"
+	"testing"
 )
 
 func dotest() bool {

src/pkg/encoding/binary/binary.go

@@ -9,8 +9,8 @@ package binary
 
 import (
 	"errors"
-	"math"
 	"io"
+	"math"
 	"reflect"
 )
 

src/pkg/encoding/binary/binary_test.go

@@ -5,8 +5,8 @@
 package binary
 
 import (
-	"io"
 	"bytes"
+	"io"
 	"math"
 	"reflect"
 	"testing"

src/pkg/exec/exec_test.go

@@ -10,11 +10,11 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"testing"
 	"os"
 	"runtime"
 	"strconv"
 	"strings"
+	"testing"
 )
 
 func helperCommand(s ...string) *Cmd {

src/pkg/exp/inotify/inotify_linux_test.go

@@ -6,8 +6,8 @@ package inotify
 
 import (
 	"os"
-	"time"
 	"testing"
+	"time"
 )
 
 func TestInotifyEvents(t *testing.T) {

src/pkg/exp/norm/normregtest.go

@@ -17,8 +17,8 @@ import (
 	"path"
 	"regexp"
 	"runtime"
-	"strings"
 	"strconv"
+	"strings"
 	"time"
 	"utf8"
 )

src/pkg/exp/winfsnotify/winfsnotify_test.go

@@ -6,8 +6,8 @@ package winfsnotify
 
 import (
 	"os"
-	"time"
 	"testing"
+	"time"
 )
 
 func expect(t *testing.T, eventstream <-chan *Event, name string, mask uint32) {

src/pkg/exp/wingui/gui.go

@@ -6,8 +6,8 @@ package main
 
 import (
 	"fmt"
-	"syscall"
 	"os"
+	"syscall"
 	"unsafe"
 )
 

src/pkg/exp/wingui/winapi.go

@@ -5,8 +5,8 @@
 package main
 
 import (
-	"unsafe"
 	"syscall"
+	"unsafe"
 )
 
 type Wndclassex struct {

src/pkg/http/cgi/host_test.go

@@ -13,14 +13,14 @@ import (
 	"http"
 	"http/httptest"
 	"io"
-	"os"
 	"net"
+	"os"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
-	"runtime"
 )
 
 func newRequest(httpreq string) *http.Request {

src/pkg/http/transfer.go

@@ -5,8 +5,8 @@
 package http
 
 import (
-	"bytes"
 	"bufio"
+	"bytes"
 	"errors"
 	"fmt"
 	"io"

src/pkg/http/transport_windows.go

@@ -5,8 +5,8 @@
 package http
 
 import (
-	"os"
 	"net"
+	"os"
 )
 
 func init() {

src/pkg/image/bmp/reader.go

@@ -9,8 +9,8 @@ package bmp
 
 import (
 	"errors"
-	"image/color"
 	"image"
+	"image/color"
 	"io"
 )
 

src/pkg/image/jpeg/writer_test.go

@@ -10,8 +10,8 @@ import (
 	"image/color"
 	"image/png"
 	"io/ioutil"
-	"rand"
 	"os"
+	"rand"
 	"testing"
 )
 

src/pkg/io/multi_test.go

@@ -5,10 +5,10 @@
 package io_test
 
 import (
-	. "io"
 	"bytes"
 	"crypto/sha1"
 	"fmt"
+	. "io"
 	"strings"
 	"testing"
 )

src/pkg/log/log.go

@@ -16,10 +16,10 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"runtime"
 	"os"
-	"time"
+	"runtime"
 	"sync"
+	"time"
 )
 
 // These flags define which text to prefix to each log entry generated by the Logger.

src/pkg/net/ip_test.go

@@ -7,8 +7,8 @@ package net
 import (
 	"bytes"
 	"reflect"
-	"testing"
 	"runtime"
+	"testing"
 )
 
 func isEqual(a, b []byte) bool {

src/pkg/net/lookup_windows.go

@@ -5,10 +5,10 @@
 package net
 
 import (
-	"syscall"
-	"unsafe"
 	"os"
 	"sync"
+	"syscall"
+	"unsafe"
 )
 
 var (

src/pkg/net/parse_test.go

@@ -7,8 +7,8 @@ package net
 import (
 	"bufio"
 	"os"
-	"testing"
 	"runtime"
+	"testing"
 )
 
 func TestReadLine(t *testing.T) {

src/pkg/net/server_test.go

@@ -8,10 +8,10 @@ import (
 	"flag"
 	"io"
 	"os"
+	"runtime"
 	"strings"
 	"syscall"
 	"testing"
-	"runtime"
 )
 
 // Do not test empty datagrams by default.

src/pkg/old/netchan/export.go

@@ -23,8 +23,8 @@ package netchan
 
 import (
 	"errors"
-	"log"
 	"io"
+	"log"
 	"net"
 	"reflect"
 	"strconv"

src/pkg/os/env_windows.go

@@ -9,8 +9,8 @@ package os
 import (
 	"errors"
 	"syscall"
-	"utf16"
 	"unsafe"
+	"utf16"
 )
 
 // ENOENV is the error indicating that an environment variable does not exist.

src/pkg/os/path_test.go

@@ -7,9 +7,9 @@ package os_test
 import (
 	. "os"
 	"path/filepath"
-	"testing"
 	"runtime"
 	"syscall"
+	"testing"
 )
 
 func TestMkdirAll(t *testing.T) {

src/pkg/os/stat_windows.go

@@ -5,8 +5,8 @@
 package os
 
 import (
-	"unsafe"
 	"syscall"
+	"unsafe"
 )
 
 // Stat returns the FileInfo structure describing file.

src/pkg/path/filepath/match_test.go

@@ -6,8 +6,8 @@ package filepath_test
 
 import (
 	. "path/filepath"
-	"testing"
 	"runtime"
+	"testing"
 )
 
 type MatchTest struct {

src/pkg/rand/rand_test.go

@@ -6,8 +6,8 @@ package rand
 
 import (
 	"errors"
-	"math"
 	"fmt"
+	"math"
 	"testing"
 )
 

src/pkg/rpc/server.go

@@ -117,8 +117,8 @@ import (
 	"errors"
 	"gob"
 	"http"
-	"log"
 	"io"
+	"log"
 	"net"
 	"reflect"
 	"strings"

src/pkg/runtime/syscall_windows_test.go

@@ -6,8 +6,8 @@ package runtime_test
 
 import (
 	"syscall"
-	"unsafe"
 	"testing"
+	"unsafe"
 )
 
 type DLL struct {

src/pkg/sync/once_test.go

@@ -5,9 +5,9 @@
 package sync_test
 
 import (
+	"runtime"
 	. "sync"
 	"sync/atomic"
-	"runtime"
 	"testing"
 )
 

src/pkg/time/sleep_test.go

@@ -7,8 +7,8 @@ package time_test
 import (
 	"errors"
 	"fmt"
-	"testing"
 	"sort"
+	"testing"
 	. "time"
 )
 

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

src/pkg/unicode/maketables.go

@@ -16,10 +16,10 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
-	"regexp"
 	"unicode"
 )
 

src/pkg/xml/marshal_test.go

@@ -5,11 +5,11 @@
 package xml
 
 import (
-	"reflect"
-	"testing"
 	"bytes"
-	"strings"
+	"reflect"
 	"strconv"
+	"strings"
+	"testing"
 )
 
 type DriveType int