renaming_3: gofix -r go1pkgrename src/pkg/[m-z]*

R=rsc
CC=golang-dev
https://golang.org/cl/5345045

src/pkg/math/big/int.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"rand"
+	"math/rand"
 	"strings"
 )
 

src/pkg/math/big/int_test.go

@@ -6,9 +6,9 @@ package big
 
 import (
 	"bytes"
+	"encoding/gob"
 	"encoding/hex"
 	"fmt"
-	"gob"
 	"testing"
 	"testing/quick"
 )

src/pkg/math/big/nat.go

@@ -21,7 +21,7 @@ package big
 import (
 	"errors"
 	"io"
-	"rand"
+	"math/rand"
 )
 
 // An unsigned integer x of the form

src/pkg/math/big/rat_test.go

@@ -6,8 +6,8 @@ package big
 
 import (
 	"bytes"
+	"encoding/gob"
 	"fmt"
-	"gob"
 	"testing"
 )
 

src/pkg/mime/multipart/multipart_test.go

@@ -6,10 +6,10 @@ package multipart
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"json"
 	"strings"
 	"testing"
 )

src/pkg/net/dnsclient.go

@@ -7,7 +7,7 @@ package net
 import (
 	"bytes"
 	"fmt"
-	"rand"
+	"math/rand"
 	"sort"
 )
 

src/pkg/net/dnsclient_unix.go

@@ -17,7 +17,7 @@
 package net
 
 import (
-	"rand"
+	"math/rand"
 	"sync"
 	"time"
 )

src/pkg/net/http/cgi/child.go

@@ -12,14 +12,14 @@ import (
 	"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

src/pkg/net/http/cgi/host.go

@@ -16,12 +16,12 @@ package cgi
 
 import (
 	"bufio"
-	"exec"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"runtime"

src/pkg/net/http/cgi/host_test.go

@@ -8,13 +8,13 @@ package cgi
 
 import (
 	"bufio"
-	"exec"
 	"fmt"
-	"http"
-	"http/httptest"
 	"io"
 	"net"
+	"net/http"
+	"net/http/httptest"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strconv"

src/pkg/net/http/cgi/matryoshka_test.go

@@ -10,7 +10,7 @@ package cgi
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 	"os"
 	"testing"
 )

src/pkg/net/http/client.go

@@ -14,8 +14,8 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net/url"
 	"strings"
-	"url"
 )
 
 // A Client is an HTTP client. Its zero value (DefaultClient) is a usable client

src/pkg/net/http/client_test.go

@@ -10,15 +10,15 @@ import (
 	"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) {

src/pkg/net/http/cookie_test.go

@@ -5,8 +5,8 @@
 package http
 
 import (
+	"encoding/json"
 	"fmt"
-	"json"
 	"reflect"
 	"testing"
 	"time"

src/pkg/net/http/fcgi/child.go

@@ -8,10 +8,10 @@ package fcgi
 
 import (
 	"fmt"
-	"http"
-	"http/cgi"
 	"io"
 	"net"
+	"net/http"
+	"net/http/cgi"
 	"os"
 	"time"
 )

src/pkg/net/http/filetransport_test.go

@@ -5,8 +5,8 @@
 package http_test
 
 import (
-	"http"
 	"io/ioutil"
+	"net/http"
 	"path/filepath"
 	"testing"
 )

src/pkg/net/http/fs.go

@@ -17,7 +17,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A Dir implements http.FileSystem using the native file

src/pkg/net/http/fs_test.go

@@ -6,14 +6,14 @@ package http_test
 
 import (
 	"fmt"
-	. "http"
-	"http/httptest"
 	"io/ioutil"
+	. "net/http"
+	"net/http/httptest"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
-	"url"
 )
 
 const (

src/pkg/net/http/httptest/recorder.go

@@ -7,7 +7,7 @@ package httptest
 
 import (
 	"bytes"
-	"http"
+	"net/http"
 )
 
 // ResponseRecorder is an implementation of http.ResponseWriter that

src/pkg/net/http/httptest/server.go

@@ -11,8 +11,8 @@ import (
 	"crypto/tls"
 	"flag"
 	"fmt"
-	"http"
 	"net"
+	"net/http"
 	"os"
 	"time"
 )

src/pkg/net/http/httputil/chunked.go

@@ -6,8 +6,8 @@ package httputil
 
 import (
 	"bufio"
-	"http"
 	"io"
+	"net/http"
 	"strconv"
 	"strings"
 )

src/pkg/net/http/httputil/dump.go

@@ -8,10 +8,10 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
 	"net"
+	"net/http"
 	"strings"
 )
 

src/pkg/net/http/httputil/dump_test.go

@@ -7,11 +7,11 @@ package httputil
 import (
 	"bytes"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
+	"net/http"
+	"net/url"
 	"testing"
-	"url"
 )
 
 type dumpTest struct {

src/pkg/net/http/httputil/persist.go

@@ -9,9 +9,9 @@ package httputil
 import (
 	"bufio"
 	"errors"
-	"http"
 	"io"
 	"net"
+	"net/http"
 	"net/textproto"
 	"os"
 	"sync"

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

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) {

src/pkg/net/http/pprof/pprof.go

@@ -28,8 +28,8 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
 	"os"
 	"runtime"
 	"runtime/pprof"

src/pkg/net/http/readrequest_test.go

@@ -9,9 +9,9 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"net/url"
 	"reflect"
 	"testing"
-	"url"
 )
 
 type reqTest struct {

src/pkg/net/http/request.go

@@ -18,9 +18,9 @@ import (
 	"mime"
 	"mime/multipart"
 	"net/textproto"
+	"net/url"
 	"strconv"
 	"strings"
-	"url"
 )
 
 const (

src/pkg/net/http/request_test.go

@@ -7,17 +7,17 @@ package http_test
 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) {

src/pkg/net/http/requestwrite_test.go

@@ -10,9 +10,9 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net/url"
 	"strings"
 	"testing"
-	"url"
 )
 
 type reqWriteTest struct {

src/pkg/net/http/response.go

@@ -11,9 +11,9 @@ import (
 	"errors"
 	"io"
 	"net/textproto"
+	"net/url"
 	"strconv"
 	"strings"
-	"url"
 )
 
 var respExcludeHeader = map[string]bool{

src/pkg/net/http/response_test.go

@@ -12,9 +12,9 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net/url"
 	"reflect"
 	"testing"
-	"url"
 )
 
 type respTest struct {

src/pkg/net/http/serve_test.go

@@ -11,20 +11,20 @@ import (
 	"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

src/pkg/net/http/server.go

@@ -20,13 +20,13 @@ import (
 	"io/ioutil"
 	"log"
 	"net"
+	"net/url"
 	"path"
 	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
-	"url"
 )
 
 // Errors introduced by the HTTP server.

src/pkg/net/http/sniff_test.go

@@ -6,10 +6,10 @@ package http_test
 
 import (
 	"bytes"
-	. "http"
-	"http/httptest"
 	"io/ioutil"
 	"log"
+	. "net/http"
+	"net/http/httptest"
 	"strconv"
 	"testing"
 )

src/pkg/net/http/transport.go

@@ -20,10 +20,10 @@ import (
 	"io/ioutil"
 	"log"
 	"net"
+	"net/url"
 	"os"
 	"strings"
 	"sync"
-	"url"
 )
 
 // DefaultTransport is the default implementation of Transport and is

src/pkg/net/http/transport_test.go

@@ -11,15 +11,15 @@ import (
 	"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

src/pkg/net/http/triv.go

@@ -9,9 +9,9 @@ import (
 	"expvar"
 	"flag"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"strconv"
 )

src/pkg/net/rpc/client.go

@@ -6,12 +6,12 @@ package rpc
 
 import (
 	"bufio"
+	"encoding/gob"
 	"errors"
-	"gob"
-	"http"
 	"io"
 	"log"
 	"net"
+	"net/http"
 	"sync"
 )
 

src/pkg/net/rpc/debug.go

@@ -11,9 +11,9 @@ package rpc
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 	"sort"
-	"template"
+	"text/template"
 )
 
 const debugText = `<html>

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"
 )
 

src/pkg/net/rpc/jsonrpc/client.go

@@ -7,11 +7,11 @@
 package jsonrpc
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
-	"json"
 	"net"
-	"rpc"
+	"net/rpc"
 	"sync"
 )
 

src/pkg/net/rpc/jsonrpc/server.go

@@ -5,10 +5,10 @@
 package jsonrpc
 
 import (
+	"encoding/json"
 	"errors"
 	"io"
-	"json"
-	"rpc"
+	"net/rpc"
 	"sync"
 )
 

src/pkg/net/rpc/server.go

@@ -114,17 +114,17 @@ package rpc
 
 import (
 	"bufio"
+	"encoding/gob"
 	"errors"
-	"gob"
-	"http"
 	"io"
 	"log"
 	"net"
+	"net/http"
 	"reflect"
 	"strings"
 	"sync"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 const (

src/pkg/net/rpc/server_test.go

@@ -7,10 +7,10 @@ package rpc
 import (
 	"errors"
 	"fmt"
-	"http/httptest"
 	"io"
 	"log"
 	"net"
+	"net/http/httptest"
 	"runtime"
 	"strings"
 	"sync"

src/pkg/old/netchan/common.go

@@ -5,8 +5,8 @@
 package netchan
 
 import (
+	"encoding/gob"
 	"errors"
-	"gob"
 	"io"
 	"reflect"
 	"sync"

src/pkg/old/regexp/regexp.go

@@ -72,7 +72,7 @@ import (
 	"bytes"
 	"io"
 	"strings"
-	"utf8"
+	"unicode/utf8"
 )
 
 var debug = false

src/pkg/old/template/parse.go

@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Errors returned during parsing and execution.  Users may extract the information and reformat

src/pkg/old/template/template_test.go

@@ -6,10 +6,10 @@ package template
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"json"
 	"strings"
 	"testing"
 )

src/pkg/os/env_windows.go

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

src/pkg/path/filepath/match.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"sort"
 	"strings"
-	"utf8"
+	"unicode/utf8"
 )
 
 var ErrBadPattern = errors.New("syntax error in pattern")

src/pkg/path/match.go

@@ -7,7 +7,7 @@ package path
 import (
 	"errors"
 	"strings"
-	"utf8"
+	"unicode/utf8"
 )
 
 var ErrBadPattern = errors.New("syntax error in pattern")

src/pkg/regexp/exec_test.go

@@ -9,15 +9,15 @@ import (
 	"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

src/pkg/regexp/regexp.go

@@ -60,7 +60,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"utf8"
+	"unicode/utf8"
 )
 
 var debug = false

src/pkg/regexp/syntax/parse.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // An Error describes a failure to parse a regular expression

src/pkg/runtime/softfloat64_test.go

@@ -6,7 +6,7 @@ package runtime_test
 
 import (
 	"math"
-	"rand"
+	"math/rand"
 	. "runtime"
 	"testing"
 )

src/pkg/sort/sort_test.go

@@ -7,7 +7,7 @@ package sort_test
 import (
 	"fmt"
 	"math"
-	"rand"
+	"math/rand"
 	. "sort"
 	"strconv"
 	"testing"

src/pkg/strconv/quote.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 const lowerhex = "0123456789abcdef"

src/pkg/strings/reader.go

@@ -7,7 +7,7 @@ package strings
 import (
 	"errors"
 	"io"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A Reader implements the io.Reader, io.ByteScanner, and

src/pkg/strings/strings.go

@@ -7,7 +7,7 @@ package strings
 
 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).

src/pkg/strings/strings_test.go

@@ -12,8 +12,8 @@ import (
 	. "strings"
 	"testing"
 	"unicode"
+	"unicode/utf8"
 	"unsafe"
-	"utf8"
 )
 
 func eq(a, b []string) bool {

src/pkg/syscall/exec_windows.go

@@ -8,8 +8,8 @@ package syscall
 
 import (
 	"sync"
+	"unicode/utf16"
 	"unsafe"
-	"utf16"
 )
 
 var ForkLock sync.RWMutex

src/pkg/syscall/syscall_windows.go

@@ -7,8 +7,8 @@
 package syscall
 
 import (
+	"unicode/utf16"
 	"unsafe"
-	"utf16"
 )
 
 const OS = "windows"

src/pkg/testing/quick/quick.go

@@ -9,7 +9,7 @@ import (
 	"flag"
 	"fmt"
 	"math"
-	"rand"
+	"math/rand"
 	"reflect"
 	"strings"
 )

src/pkg/testing/quick/quick_test.go

@@ -5,7 +5,7 @@
 package quick
 
 import (
-	"rand"
+	"math/rand"
 	"reflect"
 	"testing"
 )

src/pkg/testing/script/script.go

@@ -7,7 +7,7 @@ package script
 
 import (
 	"fmt"
-	"rand"
+	"math/rand"
 	"reflect"
 	"strings"
 )

src/pkg/text/scanner/scanner.go

@@ -31,7 +31,7 @@ import (
 	"io"
 	"os"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // TODO(gri): Consider changing this to use the new (token) Position package.

src/pkg/text/scanner/scanner_test.go

@@ -10,7 +10,7 @@ import (
 	"io"
 	"strings"
 	"testing"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A StringReader delivers its data one string segment at a time via Read.

src/pkg/text/tabwriter/tabwriter.go

@@ -14,7 +14,7 @@ import (
 	"bytes"
 	"io"
 	"os"
-	"utf8"
+	"unicode/utf8"
 )
 
 // ----------------------------------------------------------------------------

src/pkg/text/template/exec.go

@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"runtime"
 	"strings"
-	"template/parse"
+	"text/template/parse"
 )
 
 // state represents the state of an execution. It's not part of the

src/pkg/text/template/funcs.go

@@ -8,11 +8,11 @@ import (
 	"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.

src/pkg/text/template/parse.go

@@ -6,7 +6,7 @@ package template
 
 import (
 	"reflect"
-	"template/parse"
+	"text/template/parse"
 )
 
 // Template is the representation of a parsed template.

src/pkg/text/template/parse/lex.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // item represents a token or text string returned from the scanner.

src/pkg/text/template/set.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"io"
 	"reflect"
-	"template/parse"
+	"text/template/parse"
 )
 
 // Set holds a set of related templates that can refer to one another by name.

src/pkg/unicode/maketables.go

@@ -11,9 +11,9 @@ import (
 	"bufio"
 	"flag"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"path/filepath"
 	"regexp"

src/pkg/unicode/utf16/utf16_test.go

@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 	"unicode"
-	. "utf16"
+	. "unicode/utf16"
 )
 
 type encodeTest struct {

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) {

src/pkg/unicode/utf8/utf8_test.go

@@ -7,7 +7,7 @@ package utf8_test
 import (
 	"bytes"
 	"testing"
-	. "utf8"
+	. "unicode/utf8"
 )
 
 type Utf8Map struct {

src/pkg/websocket/client.go

@@ -9,7 +9,7 @@ import (
 	"crypto/tls"
 	"io"
 	"net"
-	"url"
+	"net/url"
 )
 
 // DialError is an error that occurs while dialling a websocket server.

src/pkg/websocket/hixie.go

@@ -13,13 +13,13 @@ import (
 	"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

src/pkg/websocket/hixie_test.go

@@ -8,11 +8,11 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
+	"net/url"
 	"strings"
 	"testing"
-	"url"
 )
 
 // Test the getChallengeResponse function with values from section

src/pkg/websocket/hybi.go

@@ -15,11 +15,11 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"fmt"
-	"http"
 	"io"
 	"io/ioutil"
+	"net/http"
+	"net/url"
 	"strings"
-	"url"
 )
 
 const (

src/pkg/websocket/hybi_test.go

@@ -8,11 +8,11 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
+	"net/url"
 	"strings"
 	"testing"
-	"url"
 )
 
 // Test the getNonceAccept function with values in

src/pkg/websocket/server.go

@@ -7,8 +7,8 @@ package websocket
 import (
 	"bufio"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
 )
 
 func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request) (conn *Conn, err error) {

src/pkg/websocket/websocket.go

@@ -9,14 +9,14 @@ package websocket
 import (
 	"bufio"
 	"crypto/tls"
-	"http"
+	"encoding/json"
 	"io"
 	"io/ioutil"
-	"json"
 	"net"
+	"net/http"
+	"net/url"
 	"os"
 	"sync"
-	"url"
 )
 
 const (

src/pkg/websocket/websocket_test.go

@@ -7,15 +7,15 @@ package websocket
 import (
 	"bytes"
 	"fmt"
-	"http"
-	"http/httptest"
 	"io"
 	"log"
 	"net"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
 	"strings"
 	"sync"
 	"testing"
-	"url"
 )
 
 var serverAddr string