renaming_2: gofix -r go1pkgrename src/pkg/[a-l]*

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

src/pkg/archive/zip/writer_test.go

@@ -7,7 +7,7 @@ package zip
 import (
 	"bytes"
 	"io/ioutil"
-	"rand"
+	"math/rand"
 	"testing"
 )
 

src/pkg/bufio/bufio.go

@@ -11,7 +11,7 @@ import (
 	"bytes"
 	"io"
 	"strconv"
-	"utf8"
+	"unicode/utf8"
 )
 
 const (

src/pkg/bufio/bufio_test.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"testing"
 	"testing/iotest"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Reads from a reader and rot13s the result.

src/pkg/bytes/buffer.go

@@ -9,7 +9,7 @@ package bytes
 import (
 	"errors"
 	"io"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A Buffer is a variable-sized buffer of bytes with Read and Write methods.

src/pkg/bytes/buffer_test.go

@@ -7,9 +7,9 @@ package bytes_test
 import (
 	. "bytes"
 	"io"
-	"rand"
+	"math/rand"
 	"testing"
-	"utf8"
+	"unicode/utf8"
 )
 
 const N = 10000  // make this bigger for a larger (and slower) test

src/pkg/bytes/bytes.go

@@ -8,7 +8,7 @@ package bytes
 
 import (
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Compare returns an integer comparing the two byte arrays lexicographically.

src/pkg/bytes/bytes_test.go

@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"testing"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 func eq(a, b []string) bool {

src/pkg/crypto/dsa/dsa.go

@@ -6,9 +6,9 @@
 package dsa
 
 import (
-	"big"
 	"errors"
 	"io"
+	"math/big"
 )
 
 // Parameters represents the domain parameters for a key. These parameters can

src/pkg/crypto/dsa/dsa_test.go

@@ -5,8 +5,8 @@
 package dsa
 
 import (
-	"big"
 	"crypto/rand"
+	"math/big"
 	"testing"
 )
 

src/pkg/crypto/ecdsa/ecdsa.go

@@ -13,9 +13,9 @@ package ecdsa
 //     http://www.secg.org/download/aid-780/sec1-v2.pdf
 
 import (
-	"big"
 	"crypto/elliptic"
 	"io"
+	"math/big"
 )
 
 // PublicKey represents an ECDSA public key.

src/pkg/crypto/ecdsa/ecdsa_test.go

@@ -5,11 +5,11 @@
 package ecdsa
 
 import (
-	"big"
 	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/sha1"
 	"encoding/hex"
+	"math/big"
 	"testing"
 )
 

src/pkg/crypto/elliptic/elliptic.go

@@ -14,8 +14,8 @@ package elliptic
 // reverse the transform than to operate in affine coordinates.
 
 import (
-	"big"
 	"io"
+	"math/big"
 	"sync"
 )
 

src/pkg/crypto/elliptic/elliptic_test.go

@@ -5,9 +5,9 @@
 package elliptic
 
 import (
-	"big"
 	"crypto/rand"
 	"fmt"
+	"math/big"
 	"testing"
 )
 

src/pkg/crypto/ocsp/ocsp.go

@@ -8,12 +8,12 @@
 package ocsp
 
 import (
-	"asn1"
 	"crypto"
 	"crypto/rsa"
 	_ "crypto/sha1"
 	"crypto/x509"
 	"crypto/x509/pkix"
+	"encoding/asn1"
 	"time"
 )
 

src/pkg/crypto/openpgp/elgamal/elgamal.go

@@ -13,11 +13,11 @@
 package elgamal
 
 import (
-	"big"
 	"crypto/rand"
 	"crypto/subtle"
 	"errors"
 	"io"
+	"math/big"
 )
 
 // PublicKey represents an ElGamal public key.

src/pkg/crypto/openpgp/elgamal/elgamal_test.go

@@ -5,9 +5,9 @@
 package elgamal
 
 import (
-	"big"
 	"bytes"
 	"crypto/rand"
+	"math/big"
 	"testing"
 )
 

src/pkg/crypto/openpgp/packet/encrypted_key.go

@@ -5,13 +5,13 @@
 package packet
 
 import (
-	"big"
 	"crypto/openpgp/elgamal"
 	error_ "crypto/openpgp/error"
 	"crypto/rand"
 	"crypto/rsa"
 	"encoding/binary"
 	"io"
+	"math/big"
 	"strconv"
 )
 

src/pkg/crypto/openpgp/packet/encrypted_key_test.go

@@ -5,11 +5,11 @@
 package packet
 
 import (
-	"big"
 	"bytes"
 	"crypto/rand"
 	"crypto/rsa"
 	"fmt"
+	"math/big"
 	"testing"
 )
 

src/pkg/crypto/openpgp/packet/packet.go

@@ -7,12 +7,12 @@
 package packet
 
 import (
-	"big"
 	"crypto/aes"
 	"crypto/cast5"
 	"crypto/cipher"
 	error_ "crypto/openpgp/error"
 	"io"
+	"math/big"
 )
 
 // readFull is the same as io.ReadFull except that reading zero bytes returns

src/pkg/crypto/openpgp/packet/private_key.go

@@ -5,7 +5,6 @@
 package packet
 
 import (
-	"big"
 	"bytes"
 	"crypto/cipher"
 	"crypto/dsa"
@@ -16,6 +15,7 @@ import (
 	"crypto/sha1"
 	"io"
 	"io/ioutil"
+	"math/big"
 	"strconv"
 )
 

src/pkg/crypto/openpgp/packet/public_key.go

@@ -5,7 +5,6 @@
 package packet
 
 import (
-	"big"
 	"crypto/dsa"
 	"crypto/openpgp/elgamal"
 	error_ "crypto/openpgp/error"
@@ -15,6 +14,7 @@ import (
 	"fmt"
 	"hash"
 	"io"
+	"math/big"
 	"strconv"
 )
 

src/pkg/crypto/rand/util.go

@@ -5,8 +5,8 @@
 package rand
 
 import (
-	"big"
 	"io"
+	"math/big"
 	"os"
 )
 

src/pkg/crypto/rsa/pkcs1v15.go

@@ -5,11 +5,11 @@
 package rsa
 
 import (
-	"big"
 	"crypto"
 	"crypto/subtle"
 	"errors"
 	"io"
+	"math/big"
 )
 
 // This file implements encryption and decryption using PKCS#1 v1.5 padding.

src/pkg/crypto/rsa/pkcs1v15_test.go

@@ -5,7 +5,6 @@
 package rsa
 
 import (
-	"big"
 	"bytes"
 	"crypto"
 	"crypto/rand"
@@ -13,6 +12,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"io"
+	"math/big"
 	"testing"
 	"testing/quick"
 )

src/pkg/crypto/rsa/rsa.go

@@ -8,12 +8,12 @@ package rsa
 // TODO(agl): Add support for PSS padding.
 
 import (
-	"big"
 	"crypto/rand"
 	"crypto/subtle"
 	"errors"
 	"hash"
 	"io"
+	"math/big"
 )
 
 var bigZero = big.NewInt(0)

src/pkg/crypto/rsa/rsa_test.go

@@ -5,10 +5,10 @@
 package rsa
 
 import (
-	"big"
 	"bytes"
 	"crypto/rand"
 	"crypto/sha1"
+	"math/big"
 	"testing"
 )
 

src/pkg/crypto/tls/generate_cert.go

@@ -8,7 +8,6 @@
 package main
 
 import (
-	"big"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
@@ -16,6 +15,7 @@ import (
 	"encoding/pem"
 	"flag"
 	"log"
+	"math/big"
 	"os"
 	"time"
 )

src/pkg/crypto/tls/handshake_messages_test.go

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

src/pkg/crypto/tls/handshake_server_test.go

@@ -5,12 +5,12 @@
 package tls
 
 import (
-	"big"
 	"bytes"
 	"crypto/rsa"
 	"encoding/hex"
 	"flag"
 	"io"
+	"math/big"
 	"net"
 	"strconv"
 	"strings"

src/pkg/crypto/tls/key_agreement.go

@@ -5,7 +5,6 @@
 package tls
 
 import (
-	"big"
 	"crypto"
 	"crypto/elliptic"
 	"crypto/md5"
@@ -14,6 +13,7 @@ import (
 	"crypto/x509"
 	"errors"
 	"io"
+	"math/big"
 )
 
 // rsaKeyAgreement implements the standard TLS key agreement where the client

src/pkg/crypto/x509/pkcs1.go

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

src/pkg/crypto/x509/pkix/pkix.go

@@ -7,8 +7,8 @@
 package pkix
 
 import (
-	"asn1"
+	"encoding/asn1"
-	"big"
+	"math/big"
 	"time"
 )
 

src/pkg/crypto/x509/x509.go

@@ -6,17 +6,17 @@
 package x509
 
 import (
-	"asn1"
-	"big"
 	"bytes"
 	"crypto"
 	"crypto/dsa"
 	"crypto/rsa"
 	"crypto/sha1"
 	"crypto/x509/pkix"
+	"encoding/asn1"
 	"encoding/pem"
 	"errors"
 	"io"
+	"math/big"
 	"time"
 )
 

src/pkg/crypto/x509/x509_test.go

@@ -5,16 +5,16 @@
 package x509
 
 import (
-	"asn1"
-	"big"
 	"bytes"
 	"crypto/dsa"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509/pkix"
+	"encoding/asn1"
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/pem"
+	"math/big"
 	"testing"
 	"time"
 )

src/pkg/encoding/asn1/asn1.go

@@ -20,8 +20,8 @@ package asn1
 // everything by any means.
 
 import (
-	"big"
 	"fmt"
+	"math/big"
 	"reflect"
 	"time"
 )

src/pkg/encoding/asn1/marshal.go

@@ -5,10 +5,10 @@
 package asn1
 
 import (
-	"big"
 	"bytes"
 	"fmt"
 	"io"
+	"math/big"
 	"reflect"
 	"time"
 )

src/pkg/encoding/csv/writer.go

@@ -9,7 +9,7 @@ import (
 	"io"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A Writer writes records to a CSV encoded file.

src/pkg/encoding/gob/dump.go

@@ -3,8 +3,8 @@ package main
 // Need to compile package gob with debug.go to build this program.
 
 import (
+	"encoding/gob"
 	"fmt"
-	"gob"
 	"os"
 )
 

src/pkg/encoding/gob/type.go

@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"sync"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // userTypeInfo stores the information associated with a type the user has handed

src/pkg/encoding/json/decode.go

@@ -15,8 +15,8 @@ import (
 	"strconv"
 	"strings"
 	"unicode"
-	"utf16"
+	"unicode/utf16"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Unmarshal parses the JSON-encoded data and stores the result

src/pkg/encoding/json/encode.go

@@ -17,7 +17,7 @@ import (
 	"sort"
 	"strconv"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Marshal returns the JSON encoding of v.

src/pkg/encoding/json/scanner_test.go

@@ -7,7 +7,7 @@ package json
 import (
 	"bytes"
 	"math"
-	"rand"
+	"math/rand"
 	"reflect"
 	"testing"
 )

src/pkg/encoding/xml/read.go

@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // BUG(rsc): Mapping between XML elements and data structures is inherently flawed:

src/pkg/encoding/xml/xml.go

@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A SyntaxError represents a syntax error in the XML input stream.

src/pkg/exp/ebnf/ebnf.go

@@ -25,9 +25,9 @@ package ebnf
 import (
 	"errors"
 	"fmt"
-	"scanner"
+	"text/scanner"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // ----------------------------------------------------------------------------

src/pkg/exp/ebnf/parser.go

@@ -6,8 +6,8 @@ package ebnf
 
 import (
 	"io"
-	"scanner"
 	"strconv"
+	"text/scanner"
 )
 
 type parser struct {

src/pkg/exp/norm/composition.go

@@ -4,7 +4,7 @@
 
 package norm
 
-import "utf8"
+import "unicode/utf8"
 
 const (
 	maxCombiningChars = 30

src/pkg/exp/norm/input.go

@@ -4,7 +4,7 @@
 
 package norm
 
-import "utf8"
+import "unicode/utf8"
 
 type input interface {
 	skipASCII(p int) int

src/pkg/exp/norm/maketables.go

@@ -12,9 +12,9 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"regexp"
 	"strconv"

src/pkg/exp/norm/normalize.go

@@ -5,7 +5,7 @@
 // Package norm contains types and functions for normalizing Unicode strings.
 package norm
 
-import "utf8"
+import "unicode/utf8"
 
 // A Form denotes a canonical representation of Unicode code points.
 // The Unicode-defined normalization and equivalence forms are:

src/pkg/exp/norm/normregtest.go

@@ -10,9 +10,9 @@ import (
 	"exp/norm"
 	"flag"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"path"
 	"regexp"
@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	"utf8"
+	"unicode/utf8"
 )
 
 func main() {

src/pkg/exp/norm/trie_test.go

@@ -2,7 +2,7 @@ package norm
 
 import (
 	"testing"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Test data is located in triedata_test.go; generated by maketesttables.

src/pkg/exp/norm/triegen.go

@@ -14,7 +14,7 @@ import (
 	"fmt"
 	"hash/crc32"
 	"log"
-	"utf8"
+	"unicode/utf8"
 )
 
 const blockSize = 64

src/pkg/exp/spdy/read.go

@@ -7,8 +7,8 @@ package spdy
 import (
 	"compress/zlib"
 	"encoding/binary"
-	"http"
 	"io"
+	"net/http"
 	"strings"
 )
 

src/pkg/exp/spdy/spdy_test.go

@@ -6,8 +6,8 @@ package spdy
 
 import (
 	"bytes"
-	"http"
 	"io"
+	"net/http"
 	"reflect"
 	"testing"
 )

src/pkg/exp/spdy/types.go

@@ -7,8 +7,8 @@ package spdy
 import (
 	"bytes"
 	"compress/zlib"
-	"http"
 	"io"
+	"net/http"
 )
 
 //  Data Frame Format

src/pkg/exp/spdy/write.go

@@ -6,8 +6,8 @@ package spdy
 
 import (
 	"encoding/binary"
-	"http"
 	"io"
+	"net/http"
 	"strings"
 )
 

src/pkg/exp/ssh/client.go

@@ -5,12 +5,12 @@
 package ssh
 
 import (
-	"big"
 	"crypto"
 	"crypto/rand"
 	"errors"
 	"fmt"
 	"io"
+	"math/big"
 	"net"
 	"sync"
 )

src/pkg/exp/ssh/common.go

@@ -5,7 +5,7 @@
 package ssh
 
 import (
-	"big"
+	"math/big"
 	"strconv"
 	"sync"
 )

src/pkg/exp/ssh/messages.go

@@ -5,9 +5,9 @@
 package ssh
 
 import (
-	"big"
 	"bytes"
 	"io"
+	"math/big"
 	"reflect"
 )
 

src/pkg/exp/ssh/messages_test.go

@@ -5,8 +5,8 @@
 package ssh
 
 import (
-	"big"
+	"math/big"
-	"rand"
+	"math/rand"
 	"reflect"
 	"testing"
 	"testing/quick"

src/pkg/exp/ssh/server.go

@@ -5,7 +5,6 @@
 package ssh
 
 import (
-	"big"
 	"bytes"
 	"crypto"
 	"crypto/rand"
@@ -14,6 +13,7 @@ import (
 	"encoding/pem"
 	"errors"
 	"io"
+	"math/big"
 	"net"
 	"sync"
 )

src/pkg/exp/types/const.go

@@ -7,8 +7,8 @@
 package types
 
 import (
-	"big"
 	"go/token"
+	"math/big"
 	"strconv"
 )
 

src/pkg/exp/types/gcimporter.go

@@ -8,17 +8,17 @@
 package types
 
 import (
-	"big"
 	"errors"
 	"fmt"
 	"go/ast"
 	"go/token"
 	"io"
+	"math/big"
 	"os"
 	"path/filepath"
 	"runtime"
-	"scanner"
 	"strconv"
+	"text/scanner"
 )
 
 const trace = false // set to true for debugging

src/pkg/exp/types/gcimporter_test.go

@@ -5,9 +5,9 @@
 package types
 
 import (
-	"exec"
 	"go/ast"
 	"io/ioutil"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"

src/pkg/expvar/expvar.go

@@ -23,10 +23,10 @@ package expvar
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
-	"http"
-	"json"
 	"log"
+	"net/http"
 	"os"
 	"runtime"
 	"strconv"

src/pkg/expvar/expvar_test.go

@@ -5,7 +5,7 @@
 package expvar
 
 import (
-	"json"
+	"encoding/json"
 	"testing"
 )
 

src/pkg/fmt/format.go

@@ -8,7 +8,7 @@ import (
 	"bytes"
 	"strconv"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 const (

src/pkg/fmt/print.go

@@ -12,7 +12,7 @@ import (
 	"reflect"
 	"sync"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Some constants in the form of bytes, to avoid string overhead.

src/pkg/fmt/scan.go

@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // runeUnreader is the interface to something that can unread runes.

src/pkg/fmt/scan_test.go

@@ -15,7 +15,7 @@ import (
 	"regexp"
 	"strings"
 	"testing"
-	"utf8"
+	"unicode/utf8"
 )
 
 type ScanTest struct {

src/pkg/go/ast/ast.go

@@ -10,7 +10,7 @@ package ast
 import (
 	"go/token"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // ----------------------------------------------------------------------------

src/pkg/go/build/build.go

@@ -8,9 +8,9 @@ package build
 import (
 	"bytes"
 	"errors"
-	"exec"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"runtime"

src/pkg/go/build/build_test.go

@@ -5,7 +5,7 @@
 package build
 
 import (
-	"exec"
+	"os/exec"
 	"path/filepath"
 	"reflect"
 	"runtime"

src/pkg/go/doc/comment.go

@@ -11,7 +11,7 @@ import (
 	"io"
 	"regexp"
 	"strings"
-	"template" // for HTMLEscape
+	"text/template" // for HTMLEscape
 )
 
 func isWhitespace(ch byte) bool { return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' }

src/pkg/go/doc/example.go

@@ -10,7 +10,7 @@ import (
 	"go/ast"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 type Example struct {

src/pkg/go/printer/printer.go

@@ -13,7 +13,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"tabwriter"
+	"text/tabwriter"
 )
 
 const debug = false // enable for debugging

src/pkg/go/scanner/scanner.go

@@ -27,7 +27,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // A Scanner holds the scanner's internal state while processing

src/pkg/go/token/serialize.go

@@ -5,7 +5,7 @@
 package token
 
 import (
-	"gob"
+	"encoding/gob"
 	"io"
 )
 

src/pkg/html/entity_test.go

@@ -6,7 +6,7 @@ package html
 
 import (
 	"testing"
-	"utf8"
+	"unicode/utf8"
 )
 
 func TestEntityLength(t *testing.T) {

src/pkg/html/escape.go

@@ -7,7 +7,7 @@ package html
 import (
 	"bytes"
 	"strings"
-	"utf8"
+	"unicode/utf8"
 )
 
 // These replacements permit compatibility with old numeric entities that 

src/pkg/image/jpeg/writer_test.go

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

src/pkg/index/suffixarray/suffixarray_test.go

@@ -6,7 +6,7 @@ package suffixarray
 
 import (
 	"bytes"
-	"rand"
+	"math/rand"
 	"regexp"
 	"sort"
 	"strings"