renaming_3: gofix -r go1pkgrename src/pkg/[m-z]*
R=rsc
CC=golang-dev
https://golang.org/cl/5345045
diff --git a/src/pkg/math/big/int.go b/src/pkg/math/big/int.go
index f325723..533a97f 100644
--- a/src/pkg/math/big/int.go
+++ b/src/pkg/math/big/int.go
@@ -10,7 +10,7 @@
"errors"
"fmt"
"io"
- "rand"
+ "math/rand"
"strings"
)
diff --git a/src/pkg/math/big/int_test.go b/src/pkg/math/big/int_test.go
index d66bb5f..163c662 100644
--- a/src/pkg/math/big/int_test.go
+++ b/src/pkg/math/big/int_test.go
@@ -6,9 +6,9 @@
import (
"bytes"
+ "encoding/gob"
"encoding/hex"
"fmt"
- "gob"
"testing"
"testing/quick"
)
diff --git a/src/pkg/math/big/nat.go b/src/pkg/math/big/nat.go
index a46f782..3fa41e7 100644
--- a/src/pkg/math/big/nat.go
+++ b/src/pkg/math/big/nat.go
@@ -21,7 +21,7 @@
import (
"errors"
"io"
- "rand"
+ "math/rand"
)
// An unsigned integer x of the form
diff --git a/src/pkg/math/big/rat_test.go b/src/pkg/math/big/rat_test.go
index 2443450..f7f31ae 100644
--- a/src/pkg/math/big/rat_test.go
+++ b/src/pkg/math/big/rat_test.go
@@ -6,8 +6,8 @@
import (
"bytes"
+ "encoding/gob"
"fmt"
- "gob"
"testing"
)
diff --git a/src/pkg/mime/multipart/multipart_test.go b/src/pkg/mime/multipart/multipart_test.go
index ce2a27c..89ff5e4 100644
--- a/src/pkg/mime/multipart/multipart_test.go
+++ b/src/pkg/mime/multipart/multipart_test.go
@@ -6,10 +6,10 @@
import (
"bytes"
+ "encoding/json"
"fmt"
"io"
"io/ioutil"
- "json"
"strings"
"testing"
)
diff --git a/src/pkg/net/dnsclient.go b/src/pkg/net/dnsclient.go
index e66f28c..f4ed8b8 100644
--- a/src/pkg/net/dnsclient.go
+++ b/src/pkg/net/dnsclient.go
@@ -7,7 +7,7 @@
import (
"bytes"
"fmt"
- "rand"
+ "math/rand"
"sort"
)
diff --git a/src/pkg/net/dnsclient_unix.go b/src/pkg/net/dnsclient_unix.go
index e321ed9..bab5f2a 100644
--- a/src/pkg/net/dnsclient_unix.go
+++ b/src/pkg/net/dnsclient_unix.go
@@ -17,7 +17,7 @@
package net
import (
- "rand"
+ "math/rand"
"sync"
"time"
)
diff --git a/src/pkg/net/http/cgi/child.go b/src/pkg/net/http/cgi/child.go
index 1618268..e188cd4 100644
--- a/src/pkg/net/http/cgi/child.go
+++ b/src/pkg/net/http/cgi/child.go
@@ -12,14 +12,14 @@
"crypto/tls"
"errors"
"fmt"
- "http"
"io"
"io/ioutil"
"net"
+ "net/http"
+ "net/url"
"os"
"strconv"
"strings"
- "url"
)
// Request returns the HTTP request as represented in the current
diff --git a/src/pkg/net/http/cgi/host.go b/src/pkg/net/http/cgi/host.go
index 8c999c0..615d366 100644
--- a/src/pkg/net/http/cgi/host.go
+++ b/src/pkg/net/http/cgi/host.go
@@ -16,12 +16,12 @@
import (
"bufio"
- "exec"
"fmt"
- "http"
"io"
"log"
+ "net/http"
"os"
+ "os/exec"
"path/filepath"
"regexp"
"runtime"
diff --git a/src/pkg/net/http/cgi/host_test.go b/src/pkg/net/http/cgi/host_test.go
index fd0e099..635a855 100644
--- a/src/pkg/net/http/cgi/host_test.go
+++ b/src/pkg/net/http/cgi/host_test.go
@@ -8,13 +8,13 @@
import (
"bufio"
- "exec"
"fmt"
- "http"
- "http/httptest"
"io"
"net"
+ "net/http"
+ "net/http/httptest"
"os"
+ "os/exec"
"path/filepath"
"runtime"
"strconv"
diff --git a/src/pkg/net/http/cgi/matryoshka_test.go b/src/pkg/net/http/cgi/matryoshka_test.go
index 3e4a6ad..1a44df2 100644
--- a/src/pkg/net/http/cgi/matryoshka_test.go
+++ b/src/pkg/net/http/cgi/matryoshka_test.go
@@ -10,7 +10,7 @@
import (
"fmt"
- "http"
+ "net/http"
"os"
"testing"
)
diff --git a/src/pkg/net/http/client.go b/src/pkg/net/http/client.go
index 17b4adc..211ac44 100644
--- a/src/pkg/net/http/client.go
+++ b/src/pkg/net/http/client.go
@@ -14,8 +14,8 @@
"errors"
"fmt"
"io"
+ "net/url"
"strings"
- "url"
)
// A Client is an HTTP client. Its zero value (DefaultClient) is a usable client
diff --git a/src/pkg/net/http/client_test.go b/src/pkg/net/http/client_test.go
index fdad2cd..d224380 100644
--- a/src/pkg/net/http/client_test.go
+++ b/src/pkg/net/http/client_test.go
@@ -10,15 +10,15 @@
"crypto/tls"
"errors"
"fmt"
- . "http"
- "http/httptest"
"io"
"io/ioutil"
"net"
+ . "net/http"
+ "net/http/httptest"
+ "net/url"
"strconv"
"strings"
"testing"
- "url"
)
var robotsTxtHandler = HandlerFunc(func(w ResponseWriter, r *Request) {
diff --git a/src/pkg/net/http/cookie_test.go b/src/pkg/net/http/cookie_test.go
index 9a537f9..24adf20 100644
--- a/src/pkg/net/http/cookie_test.go
+++ b/src/pkg/net/http/cookie_test.go
@@ -5,8 +5,8 @@
package http
import (
+ "encoding/json"
"fmt"
- "json"
"reflect"
"testing"
"time"
diff --git a/src/pkg/net/http/fcgi/child.go b/src/pkg/net/http/fcgi/child.go
index f6591e0..7b56395 100644
--- a/src/pkg/net/http/fcgi/child.go
+++ b/src/pkg/net/http/fcgi/child.go
@@ -8,10 +8,10 @@
import (
"fmt"
- "http"
- "http/cgi"
"io"
"net"
+ "net/http"
+ "net/http/cgi"
"os"
"time"
)
diff --git a/src/pkg/net/http/filetransport_test.go b/src/pkg/net/http/filetransport_test.go
index aaee73e..265a3b9 100644
--- a/src/pkg/net/http/filetransport_test.go
+++ b/src/pkg/net/http/filetransport_test.go
@@ -5,8 +5,8 @@
package http_test
import (
- "http"
"io/ioutil"
+ "net/http"
"path/filepath"
"testing"
)
diff --git a/src/pkg/net/http/fs.go b/src/pkg/net/http/fs.go
index eb0c67d..5f91ff5 100644
--- a/src/pkg/net/http/fs.go
+++ b/src/pkg/net/http/fs.go
@@ -17,7 +17,7 @@
"strconv"
"strings"
"time"
- "utf8"
+ "unicode/utf8"
)
// A Dir implements http.FileSystem using the native file
diff --git a/src/pkg/net/http/fs_test.go b/src/pkg/net/http/fs_test.go
index 76312e8..e1a784c 100644
--- a/src/pkg/net/http/fs_test.go
+++ b/src/pkg/net/http/fs_test.go
@@ -6,14 +6,14 @@
import (
"fmt"
- . "http"
- "http/httptest"
"io/ioutil"
+ . "net/http"
+ "net/http/httptest"
+ "net/url"
"os"
"path/filepath"
"strings"
"testing"
- "url"
)
const (
diff --git a/src/pkg/net/http/httptest/recorder.go b/src/pkg/net/http/httptest/recorder.go
index f69279f..9aa0d51 100644
--- a/src/pkg/net/http/httptest/recorder.go
+++ b/src/pkg/net/http/httptest/recorder.go
@@ -7,7 +7,7 @@
import (
"bytes"
- "http"
+ "net/http"
)
// ResponseRecorder is an implementation of http.ResponseWriter that
diff --git a/src/pkg/net/http/httptest/server.go b/src/pkg/net/http/httptest/server.go
index ea719cf..f09e826 100644
--- a/src/pkg/net/http/httptest/server.go
+++ b/src/pkg/net/http/httptest/server.go
@@ -11,8 +11,8 @@
"crypto/tls"
"flag"
"fmt"
- "http"
"net"
+ "net/http"
"os"
"time"
)
diff --git a/src/pkg/net/http/httputil/chunked.go b/src/pkg/net/http/httputil/chunked.go
index 8286692..34e47c7 100644
--- a/src/pkg/net/http/httputil/chunked.go
+++ b/src/pkg/net/http/httputil/chunked.go
@@ -6,8 +6,8 @@
import (
"bufio"
- "http"
"io"
+ "net/http"
"strconv"
"strings"
)
diff --git a/src/pkg/net/http/httputil/dump.go b/src/pkg/net/http/httputil/dump.go
index 5b861b7..31696ae 100644
--- a/src/pkg/net/http/httputil/dump.go
+++ b/src/pkg/net/http/httputil/dump.go
@@ -8,10 +8,10 @@
"bytes"
"errors"
"fmt"
- "http"
"io"
"io/ioutil"
"net"
+ "net/http"
"strings"
)
diff --git a/src/pkg/net/http/httputil/dump_test.go b/src/pkg/net/http/httputil/dump_test.go
index b9856ce..819efb5 100644
--- a/src/pkg/net/http/httputil/dump_test.go
+++ b/src/pkg/net/http/httputil/dump_test.go
@@ -7,11 +7,11 @@
import (
"bytes"
"fmt"
- "http"
"io"
"io/ioutil"
+ "net/http"
+ "net/url"
"testing"
- "url"
)
type dumpTest struct {
diff --git a/src/pkg/net/http/httputil/persist.go b/src/pkg/net/http/httputil/persist.go
index 5d22cdd..d7b6701 100644
--- a/src/pkg/net/http/httputil/persist.go
+++ b/src/pkg/net/http/httputil/persist.go
@@ -9,9 +9,9 @@
import (
"bufio"
"errors"
- "http"
"io"
"net"
+ "net/http"
"net/textproto"
"os"
"sync"
diff --git a/src/pkg/net/http/httputil/reverseproxy.go b/src/pkg/net/http/httputil/reverseproxy.go
index 1c5a446..bfcb3ca 100644
--- a/src/pkg/net/http/httputil/reverseproxy.go
+++ b/src/pkg/net/http/httputil/reverseproxy.go
@@ -7,14 +7,14 @@
package httputil
import (
- "http"
"io"
"log"
"net"
+ "net/http"
+ "net/url"
"strings"
"sync"
"time"
- "url"
)
// ReverseProxy is an HTTP Handler that takes an incoming request and
diff --git a/src/pkg/net/http/httputil/reverseproxy_test.go b/src/pkg/net/http/httputil/reverseproxy_test.go
index d76829a..655784b 100644
--- a/src/pkg/net/http/httputil/reverseproxy_test.go
+++ b/src/pkg/net/http/httputil/reverseproxy_test.go
@@ -7,11 +7,11 @@
package httputil
import (
- "http"
- "http/httptest"
"io/ioutil"
+ "net/http"
+ "net/http/httptest"
+ "net/url"
"testing"
- "url"
)
func TestReverseProxy(t *testing.T) {
diff --git a/src/pkg/net/http/pprof/pprof.go b/src/pkg/net/http/pprof/pprof.go
index a118a25..c0327a9 100644
--- a/src/pkg/net/http/pprof/pprof.go
+++ b/src/pkg/net/http/pprof/pprof.go
@@ -28,8 +28,8 @@
"bufio"
"bytes"
"fmt"
- "http"
"io"
+ "net/http"
"os"
"runtime"
"runtime/pprof"
diff --git a/src/pkg/net/http/readrequest_test.go b/src/pkg/net/http/readrequest_test.go
index 524b208..2219d43 100644
--- a/src/pkg/net/http/readrequest_test.go
+++ b/src/pkg/net/http/readrequest_test.go
@@ -9,9 +9,9 @@
"bytes"
"fmt"
"io"
+ "net/url"
"reflect"
"testing"
- "url"
)
type reqTest struct {
diff --git a/src/pkg/net/http/request.go b/src/pkg/net/http/request.go
index 0cf1224..4410ca1 100644
--- a/src/pkg/net/http/request.go
+++ b/src/pkg/net/http/request.go
@@ -18,9 +18,9 @@
"mime"
"mime/multipart"
"net/textproto"
+ "net/url"
"strconv"
"strings"
- "url"
)
const (
diff --git a/src/pkg/net/http/request_test.go b/src/pkg/net/http/request_test.go
index d6487e1..714cb64 100644
--- a/src/pkg/net/http/request_test.go
+++ b/src/pkg/net/http/request_test.go
@@ -7,17 +7,17 @@
import (
"bytes"
"fmt"
- . "http"
- "http/httptest"
"io"
"io/ioutil"
"mime/multipart"
+ . "net/http"
+ "net/http/httptest"
+ "net/url"
"os"
"reflect"
"regexp"
"strings"
"testing"
- "url"
)
func TestQuery(t *testing.T) {
diff --git a/src/pkg/net/http/requestwrite_test.go b/src/pkg/net/http/requestwrite_test.go
index 3da8ad7..8081589 100644
--- a/src/pkg/net/http/requestwrite_test.go
+++ b/src/pkg/net/http/requestwrite_test.go
@@ -10,9 +10,9 @@
"fmt"
"io"
"io/ioutil"
+ "net/url"
"strings"
"testing"
- "url"
)
type reqWriteTest struct {
diff --git a/src/pkg/net/http/response.go b/src/pkg/net/http/response.go
index 7be7150..ae314b5 100644
--- a/src/pkg/net/http/response.go
+++ b/src/pkg/net/http/response.go
@@ -11,9 +11,9 @@
"errors"
"io"
"net/textproto"
+ "net/url"
"strconv"
"strings"
- "url"
)
var respExcludeHeader = map[string]bool{
diff --git a/src/pkg/net/http/response_test.go b/src/pkg/net/http/response_test.go
index 6a14179..be717aa 100644
--- a/src/pkg/net/http/response_test.go
+++ b/src/pkg/net/http/response_test.go
@@ -12,9 +12,9 @@
"fmt"
"io"
"io/ioutil"
+ "net/url"
"reflect"
"testing"
- "url"
)
type respTest struct {
diff --git a/src/pkg/net/http/serve_test.go b/src/pkg/net/http/serve_test.go
index fac2f5a..e278396 100644
--- a/src/pkg/net/http/serve_test.go
+++ b/src/pkg/net/http/serve_test.go
@@ -11,20 +11,20 @@
"bytes"
"crypto/tls"
"fmt"
- . "http"
- "http/httptest"
"io"
"io/ioutil"
"log"
"net"
+ . "net/http"
+ "net/http/httptest"
"net/http/httputil"
+ "net/url"
"os"
"reflect"
"strings"
"syscall"
"testing"
"time"
- "url"
)
type dummyAddr string
diff --git a/src/pkg/net/http/server.go b/src/pkg/net/http/server.go
index f2a4f01..8c48894 100644
--- a/src/pkg/net/http/server.go
+++ b/src/pkg/net/http/server.go
@@ -20,13 +20,13 @@
"io/ioutil"
"log"
"net"
+ "net/url"
"path"
"runtime/debug"
"strconv"
"strings"
"sync"
"time"
- "url"
)
// Errors introduced by the HTTP server.
diff --git a/src/pkg/net/http/sniff_test.go b/src/pkg/net/http/sniff_test.go
index e9195a5..a414e64 100644
--- a/src/pkg/net/http/sniff_test.go
+++ b/src/pkg/net/http/sniff_test.go
@@ -6,10 +6,10 @@
import (
"bytes"
- . "http"
- "http/httptest"
"io/ioutil"
"log"
+ . "net/http"
+ "net/http/httptest"
"strconv"
"testing"
)
diff --git a/src/pkg/net/http/transport.go b/src/pkg/net/http/transport.go
index 5e167fe..da5244b 100644
--- a/src/pkg/net/http/transport.go
+++ b/src/pkg/net/http/transport.go
@@ -20,10 +20,10 @@
"io/ioutil"
"log"
"net"
+ "net/url"
"os"
"strings"
"sync"
- "url"
)
// DefaultTransport is the default implementation of Transport and is
diff --git a/src/pkg/net/http/transport_test.go b/src/pkg/net/http/transport_test.go
index b2d0eba..7729797 100644
--- a/src/pkg/net/http/transport_test.go
+++ b/src/pkg/net/http/transport_test.go
@@ -11,15 +11,15 @@
"compress/gzip"
"crypto/rand"
"fmt"
- . "http"
- "http/httptest"
"io"
"io/ioutil"
+ . "net/http"
+ "net/http/httptest"
+ "net/url"
"strconv"
"strings"
"testing"
"time"
- "url"
)
// TODO: test 5 pipelined requests with responses: 1) OK, 2) OK, Connection: Close
diff --git a/src/pkg/net/http/triv.go b/src/pkg/net/http/triv.go
index a8fd99a..994fc0e 100644
--- a/src/pkg/net/http/triv.go
+++ b/src/pkg/net/http/triv.go
@@ -9,9 +9,9 @@
"expvar"
"flag"
"fmt"
- "http"
"io"
"log"
+ "net/http"
"os"
"strconv"
)
diff --git a/src/pkg/net/rpc/client.go b/src/pkg/net/rpc/client.go
index ecc84de..6fb414e 100644
--- a/src/pkg/net/rpc/client.go
+++ b/src/pkg/net/rpc/client.go
@@ -6,12 +6,12 @@
import (
"bufio"
+ "encoding/gob"
"errors"
- "gob"
- "http"
"io"
"log"
"net"
+ "net/http"
"sync"
)
diff --git a/src/pkg/net/rpc/debug.go b/src/pkg/net/rpc/debug.go
index 02d577f..663663f 100644
--- a/src/pkg/net/rpc/debug.go
+++ b/src/pkg/net/rpc/debug.go
@@ -11,9 +11,9 @@
import (
"fmt"
- "http"
+ "net/http"
"sort"
- "template"
+ "text/template"
)
const debugText = `<html>
diff --git a/src/pkg/net/rpc/jsonrpc/all_test.go b/src/pkg/net/rpc/jsonrpc/all_test.go
index 1451a0f..e6c7441 100644
--- a/src/pkg/net/rpc/jsonrpc/all_test.go
+++ b/src/pkg/net/rpc/jsonrpc/all_test.go
@@ -5,12 +5,12 @@
package jsonrpc
import (
+ "encoding/json"
"errors"
"fmt"
"io"
- "json"
"net"
- "rpc"
+ "net/rpc"
"testing"
)
diff --git a/src/pkg/net/rpc/jsonrpc/client.go b/src/pkg/net/rpc/jsonrpc/client.go
index f0475f0..3fa8cbf 100644
--- a/src/pkg/net/rpc/jsonrpc/client.go
+++ b/src/pkg/net/rpc/jsonrpc/client.go
@@ -7,11 +7,11 @@
package jsonrpc
import (
+ "encoding/json"
"fmt"
"io"
- "json"
"net"
- "rpc"
+ "net/rpc"
"sync"
)
diff --git a/src/pkg/net/rpc/jsonrpc/server.go b/src/pkg/net/rpc/jsonrpc/server.go
index 9fe3470..4c54553 100644
--- a/src/pkg/net/rpc/jsonrpc/server.go
+++ b/src/pkg/net/rpc/jsonrpc/server.go
@@ -5,10 +5,10 @@
package jsonrpc
import (
+ "encoding/json"
"errors"
"io"
- "json"
- "rpc"
+ "net/rpc"
"sync"
)
diff --git a/src/pkg/net/rpc/server.go b/src/pkg/net/rpc/server.go
index d031533..920ae91 100644
--- a/src/pkg/net/rpc/server.go
+++ b/src/pkg/net/rpc/server.go
@@ -114,17 +114,17 @@
import (
"bufio"
+ "encoding/gob"
"errors"
- "gob"
- "http"
"io"
"log"
"net"
+ "net/http"
"reflect"
"strings"
"sync"
"unicode"
- "utf8"
+ "unicode/utf8"
)
const (
diff --git a/src/pkg/net/rpc/server_test.go b/src/pkg/net/rpc/server_test.go
index 119de7f..f289521 100644
--- a/src/pkg/net/rpc/server_test.go
+++ b/src/pkg/net/rpc/server_test.go
@@ -7,10 +7,10 @@
import (
"errors"
"fmt"
- "http/httptest"
"io"
"log"
"net"
+ "net/http/httptest"
"runtime"
"strings"
"sync"
diff --git a/src/pkg/old/netchan/common.go b/src/pkg/old/netchan/common.go
index 855b717..dfd1fd0 100644
--- a/src/pkg/old/netchan/common.go
+++ b/src/pkg/old/netchan/common.go
@@ -5,8 +5,8 @@
package netchan
import (
+ "encoding/gob"
"errors"
- "gob"
"io"
"reflect"
"sync"
diff --git a/src/pkg/old/regexp/regexp.go b/src/pkg/old/regexp/regexp.go
index 720aaf3..86df4de 100644
--- a/src/pkg/old/regexp/regexp.go
+++ b/src/pkg/old/regexp/regexp.go
@@ -72,7 +72,7 @@
"bytes"
"io"
"strings"
- "utf8"
+ "unicode/utf8"
)
var debug = false
diff --git a/src/pkg/old/template/parse.go b/src/pkg/old/template/parse.go
index fc9885f..b8c8064 100644
--- a/src/pkg/old/template/parse.go
+++ b/src/pkg/old/template/parse.go
@@ -14,7 +14,7 @@
"strconv"
"strings"
"unicode"
- "utf8"
+ "unicode/utf8"
)
// Errors returned during parsing and execution. Users may extract the information and reformat
diff --git a/src/pkg/old/template/template_test.go b/src/pkg/old/template/template_test.go
index c883469..9462c7e 100644
--- a/src/pkg/old/template/template_test.go
+++ b/src/pkg/old/template/template_test.go
@@ -6,10 +6,10 @@
import (
"bytes"
+ "encoding/json"
"fmt"
"io"
"io/ioutil"
- "json"
"strings"
"testing"
)
diff --git a/src/pkg/os/env_windows.go b/src/pkg/os/env_windows.go
index ad6c8e3..4e90385 100644
--- a/src/pkg/os/env_windows.go
+++ b/src/pkg/os/env_windows.go
@@ -9,8 +9,8 @@
import (
"errors"
"syscall"
+ "unicode/utf16"
"unsafe"
- "utf16"
)
// ENOENV is the error indicating that an environment variable does not exist.
diff --git a/src/pkg/path/filepath/match.go b/src/pkg/path/filepath/match.go
index bc0930e..8cf1f9a 100644
--- a/src/pkg/path/filepath/match.go
+++ b/src/pkg/path/filepath/match.go
@@ -9,7 +9,7 @@
"os"
"sort"
"strings"
- "utf8"
+ "unicode/utf8"
)
var ErrBadPattern = errors.New("syntax error in pattern")
diff --git a/src/pkg/path/match.go b/src/pkg/path/match.go
index bc685f4..ba7e4de 100644
--- a/src/pkg/path/match.go
+++ b/src/pkg/path/match.go
@@ -7,7 +7,7 @@
import (
"errors"
"strings"
- "utf8"
+ "unicode/utf8"
)
var ErrBadPattern = errors.New("syntax error in pattern")
diff --git a/src/pkg/regexp/exec_test.go b/src/pkg/regexp/exec_test.go
index 499d1a5..d981f54 100644
--- a/src/pkg/regexp/exec_test.go
+++ b/src/pkg/regexp/exec_test.go
@@ -9,15 +9,15 @@
"compress/bzip2"
"fmt"
"io"
+ "math/rand"
old "old/regexp"
"os"
"path/filepath"
- "rand"
"regexp/syntax"
"strconv"
"strings"
"testing"
- "utf8"
+ "unicode/utf8"
)
// TestRE2 tests this package's regexp API against test cases
diff --git a/src/pkg/regexp/regexp.go b/src/pkg/regexp/regexp.go
index 9e9fb85..b906076 100644
--- a/src/pkg/regexp/regexp.go
+++ b/src/pkg/regexp/regexp.go
@@ -60,7 +60,7 @@
"strconv"
"strings"
"sync"
- "utf8"
+ "unicode/utf8"
)
var debug = false
diff --git a/src/pkg/regexp/syntax/parse.go b/src/pkg/regexp/syntax/parse.go
index 29ad4d2..6c37df9 100644
--- a/src/pkg/regexp/syntax/parse.go
+++ b/src/pkg/regexp/syntax/parse.go
@@ -8,7 +8,7 @@
"sort"
"strings"
"unicode"
- "utf8"
+ "unicode/utf8"
)
// An Error describes a failure to parse a regular expression
diff --git a/src/pkg/runtime/softfloat64_test.go b/src/pkg/runtime/softfloat64_test.go
index fb7f3d3..df63010 100644
--- a/src/pkg/runtime/softfloat64_test.go
+++ b/src/pkg/runtime/softfloat64_test.go
@@ -6,7 +6,7 @@
import (
"math"
- "rand"
+ "math/rand"
. "runtime"
"testing"
)
diff --git a/src/pkg/sort/sort_test.go b/src/pkg/sort/sort_test.go
index a564015..ee8a9d0 100644
--- a/src/pkg/sort/sort_test.go
+++ b/src/pkg/sort/sort_test.go
@@ -7,7 +7,7 @@
import (
"fmt"
"math"
- "rand"
+ "math/rand"
. "sort"
"strconv"
"testing"
diff --git a/src/pkg/strconv/quote.go b/src/pkg/strconv/quote.go
index 24b19be..9b48c07 100644
--- a/src/pkg/strconv/quote.go
+++ b/src/pkg/strconv/quote.go
@@ -8,7 +8,7 @@
"bytes"
"strings"
"unicode"
- "utf8"
+ "unicode/utf8"
)
const lowerhex = "0123456789abcdef"
diff --git a/src/pkg/strings/reader.go b/src/pkg/strings/reader.go
index 4f24b5b..8ff851f 100644
--- a/src/pkg/strings/reader.go
+++ b/src/pkg/strings/reader.go
@@ -7,7 +7,7 @@
import (
"errors"
"io"
- "utf8"
+ "unicode/utf8"
)
// A Reader implements the io.Reader, io.ByteScanner, and
diff --git a/src/pkg/strings/strings.go b/src/pkg/strings/strings.go
index 4f6e8a6..b4d9207 100644
--- a/src/pkg/strings/strings.go
+++ b/src/pkg/strings/strings.go
@@ -7,7 +7,7 @@
import (
"unicode"
- "utf8"
+ "unicode/utf8"
)
// explode splits s into an array of UTF-8 sequences, one per Unicode character (still strings) up to a maximum of n (n < 0 means no limit).
diff --git a/src/pkg/strings/strings_test.go b/src/pkg/strings/strings_test.go
index 2cf4bde..304d69a 100644
--- a/src/pkg/strings/strings_test.go
+++ b/src/pkg/strings/strings_test.go
@@ -12,8 +12,8 @@
. "strings"
"testing"
"unicode"
+ "unicode/utf8"
"unsafe"
- "utf8"
)
func eq(a, b []string) bool {
diff --git a/src/pkg/syscall/exec_windows.go b/src/pkg/syscall/exec_windows.go
index e4fafdb..56eeb52 100644
--- a/src/pkg/syscall/exec_windows.go
+++ b/src/pkg/syscall/exec_windows.go
@@ -8,8 +8,8 @@
import (
"sync"
+ "unicode/utf16"
"unsafe"
- "utf16"
)
var ForkLock sync.RWMutex
diff --git a/src/pkg/syscall/syscall_windows.go b/src/pkg/syscall/syscall_windows.go
index ea62df6..124cdf9 100644
--- a/src/pkg/syscall/syscall_windows.go
+++ b/src/pkg/syscall/syscall_windows.go
@@ -7,8 +7,8 @@
package syscall
import (
+ "unicode/utf16"
"unsafe"
- "utf16"
)
const OS = "windows"
diff --git a/src/pkg/testing/quick/quick.go b/src/pkg/testing/quick/quick.go
index 9e6b84b..f94c541 100644
--- a/src/pkg/testing/quick/quick.go
+++ b/src/pkg/testing/quick/quick.go
@@ -9,7 +9,7 @@
"flag"
"fmt"
"math"
- "rand"
+ "math/rand"
"reflect"
"strings"
)
diff --git a/src/pkg/testing/quick/quick_test.go b/src/pkg/testing/quick/quick_test.go
index e9ff1aa..a6cf0dc 100644
--- a/src/pkg/testing/quick/quick_test.go
+++ b/src/pkg/testing/quick/quick_test.go
@@ -5,7 +5,7 @@
package quick
import (
- "rand"
+ "math/rand"
"reflect"
"testing"
)
diff --git a/src/pkg/testing/script/script.go b/src/pkg/testing/script/script.go
index 98f3625..d8f8093 100644
--- a/src/pkg/testing/script/script.go
+++ b/src/pkg/testing/script/script.go
@@ -7,7 +7,7 @@
import (
"fmt"
- "rand"
+ "math/rand"
"reflect"
"strings"
)
diff --git a/src/pkg/text/scanner/scanner.go b/src/pkg/text/scanner/scanner.go
index 9e23017..f46f63d 100644
--- a/src/pkg/text/scanner/scanner.go
+++ b/src/pkg/text/scanner/scanner.go
@@ -31,7 +31,7 @@
"io"
"os"
"unicode"
- "utf8"
+ "unicode/utf8"
)
// TODO(gri): Consider changing this to use the new (token) Position package.
diff --git a/src/pkg/text/scanner/scanner_test.go b/src/pkg/text/scanner/scanner_test.go
index b07e559..bb3adb5 100644
--- a/src/pkg/text/scanner/scanner_test.go
+++ b/src/pkg/text/scanner/scanner_test.go
@@ -10,7 +10,7 @@
"io"
"strings"
"testing"
- "utf8"
+ "unicode/utf8"
)
// A StringReader delivers its data one string segment at a time via Read.
diff --git a/src/pkg/text/tabwriter/tabwriter.go b/src/pkg/text/tabwriter/tabwriter.go
index d588b38..c136ca2 100644
--- a/src/pkg/text/tabwriter/tabwriter.go
+++ b/src/pkg/text/tabwriter/tabwriter.go
@@ -14,7 +14,7 @@
"bytes"
"io"
"os"
- "utf8"
+ "unicode/utf8"
)
// ----------------------------------------------------------------------------
diff --git a/src/pkg/text/template/exec.go b/src/pkg/text/template/exec.go
index 8ebd52b..1910882 100644
--- a/src/pkg/text/template/exec.go
+++ b/src/pkg/text/template/exec.go
@@ -10,7 +10,7 @@
"reflect"
"runtime"
"strings"
- "template/parse"
+ "text/template/parse"
)
// state represents the state of an execution. It's not part of the
diff --git a/src/pkg/text/template/funcs.go b/src/pkg/text/template/funcs.go
index 1eff716..2ca09a7 100644
--- a/src/pkg/text/template/funcs.go
+++ b/src/pkg/text/template/funcs.go
@@ -8,11 +8,11 @@
"bytes"
"fmt"
"io"
+ "net/url"
"reflect"
"strings"
"unicode"
- "url"
- "utf8"
+ "unicode/utf8"
)
// FuncMap is the type of the map defining the mapping from names to functions.
diff --git a/src/pkg/text/template/parse.go b/src/pkg/text/template/parse.go
index 6ecd2f5..fa56214 100644
--- a/src/pkg/text/template/parse.go
+++ b/src/pkg/text/template/parse.go
@@ -6,7 +6,7 @@
import (
"reflect"
- "template/parse"
+ "text/template/parse"
)
// Template is the representation of a parsed template.
diff --git a/src/pkg/text/template/parse/lex.go b/src/pkg/text/template/parse/lex.go
index 04c105d1..97c19a1 100644
--- a/src/pkg/text/template/parse/lex.go
+++ b/src/pkg/text/template/parse/lex.go
@@ -8,7 +8,7 @@
"fmt"
"strings"
"unicode"
- "utf8"
+ "unicode/utf8"
)
// item represents a token or text string returned from the scanner.
diff --git a/src/pkg/text/template/set.go b/src/pkg/text/template/set.go
index ba5dc00..747cc78 100644
--- a/src/pkg/text/template/set.go
+++ b/src/pkg/text/template/set.go
@@ -8,7 +8,7 @@
"fmt"
"io"
"reflect"
- "template/parse"
+ "text/template/parse"
)
// Set holds a set of related templates that can refer to one another by name.
diff --git a/src/pkg/unicode/maketables.go b/src/pkg/unicode/maketables.go
index 8f511fa..a405da3 100644
--- a/src/pkg/unicode/maketables.go
+++ b/src/pkg/unicode/maketables.go
@@ -11,9 +11,9 @@
"bufio"
"flag"
"fmt"
- "http"
"io"
"log"
+ "net/http"
"os"
"path/filepath"
"regexp"
diff --git a/src/pkg/unicode/utf16/utf16_test.go b/src/pkg/unicode/utf16/utf16_test.go
index 7ea290a..d453b2f 100644
--- a/src/pkg/unicode/utf16/utf16_test.go
+++ b/src/pkg/unicode/utf16/utf16_test.go
@@ -8,7 +8,7 @@
"reflect"
"testing"
"unicode"
- . "utf16"
+ . "unicode/utf16"
)
type encodeTest struct {
diff --git a/src/pkg/unicode/utf8/string_test.go b/src/pkg/unicode/utf8/string_test.go
index 920d2a0..2c139be 100644
--- a/src/pkg/unicode/utf8/string_test.go
+++ b/src/pkg/unicode/utf8/string_test.go
@@ -5,9 +5,9 @@
package utf8_test
import (
- "rand"
+ "math/rand"
"testing"
- . "utf8"
+ . "unicode/utf8"
)
func TestScanForwards(t *testing.T) {
diff --git a/src/pkg/unicode/utf8/utf8_test.go b/src/pkg/unicode/utf8/utf8_test.go
index 857bcf6..6351426 100644
--- a/src/pkg/unicode/utf8/utf8_test.go
+++ b/src/pkg/unicode/utf8/utf8_test.go
@@ -7,7 +7,7 @@
import (
"bytes"
"testing"
- . "utf8"
+ . "unicode/utf8"
)
type Utf8Map struct {
diff --git a/src/pkg/websocket/client.go b/src/pkg/websocket/client.go
index 3da39a0..5dfd824 100644
--- a/src/pkg/websocket/client.go
+++ b/src/pkg/websocket/client.go
@@ -9,7 +9,7 @@
"crypto/tls"
"io"
"net"
- "url"
+ "net/url"
)
// DialError is an error that occurs while dialling a websocket server.
diff --git a/src/pkg/websocket/hixie.go b/src/pkg/websocket/hixie.go
index 63eebc9..4d5360f 100644
--- a/src/pkg/websocket/hixie.go
+++ b/src/pkg/websocket/hixie.go
@@ -13,13 +13,13 @@
"crypto/md5"
"encoding/binary"
"fmt"
- "http"
"io"
"io/ioutil"
- "rand"
+ "math/rand"
+ "net/http"
+ "net/url"
"strconv"
"strings"
- "url"
)
// An aray of characters to be randomly inserted to construct Sec-WebSocket-Key
diff --git a/src/pkg/websocket/hixie_test.go b/src/pkg/websocket/hixie_test.go
index 40cb53f..bf537c0 100644
--- a/src/pkg/websocket/hixie_test.go
+++ b/src/pkg/websocket/hixie_test.go
@@ -8,11 +8,11 @@
"bufio"
"bytes"
"fmt"
- "http"
"io"
+ "net/http"
+ "net/url"
"strings"
"testing"
- "url"
)
// Test the getChallengeResponse function with values from section
diff --git a/src/pkg/websocket/hybi.go b/src/pkg/websocket/hybi.go
index d3d4258..b17d947 100644
--- a/src/pkg/websocket/hybi.go
+++ b/src/pkg/websocket/hybi.go
@@ -15,11 +15,11 @@
"encoding/base64"
"encoding/binary"
"fmt"
- "http"
"io"
"io/ioutil"
+ "net/http"
+ "net/url"
"strings"
- "url"
)
const (
diff --git a/src/pkg/websocket/hybi_test.go b/src/pkg/websocket/hybi_test.go
index df0f555..60375ff 100644
--- a/src/pkg/websocket/hybi_test.go
+++ b/src/pkg/websocket/hybi_test.go
@@ -8,11 +8,11 @@
"bufio"
"bytes"
"fmt"
- "http"
"io"
+ "net/http"
+ "net/url"
"strings"
"testing"
- "url"
)
// Test the getNonceAccept function with values in
diff --git a/src/pkg/websocket/server.go b/src/pkg/websocket/server.go
index 8f16517..57dc4fd 100644
--- a/src/pkg/websocket/server.go
+++ b/src/pkg/websocket/server.go
@@ -7,8 +7,8 @@
import (
"bufio"
"fmt"
- "http"
"io"
+ "net/http"
)
func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request) (conn *Conn, err error) {
diff --git a/src/pkg/websocket/websocket.go b/src/pkg/websocket/websocket.go
index 9732ae1..1e4036c 100644
--- a/src/pkg/websocket/websocket.go
+++ b/src/pkg/websocket/websocket.go
@@ -9,14 +9,14 @@
import (
"bufio"
"crypto/tls"
- "http"
+ "encoding/json"
"io"
"io/ioutil"
- "json"
"net"
+ "net/http"
+ "net/url"
"os"
"sync"
- "url"
)
const (
diff --git a/src/pkg/websocket/websocket_test.go b/src/pkg/websocket/websocket_test.go
index 25fe264..f41c355 100644
--- a/src/pkg/websocket/websocket_test.go
+++ b/src/pkg/websocket/websocket_test.go
@@ -7,15 +7,15 @@
import (
"bytes"
"fmt"
- "http"
- "http/httptest"
"io"
"log"
"net"
+ "net/http"
+ "net/http/httptest"
+ "net/url"
"strings"
"sync"
"testing"
- "url"
)
var serverAddr string
