renaming_4: gofix -r everything/but/src/pkg

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

doc/codelab/wiki/final-noclosure.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"errors"
-	"http"
 	"io/ioutil"
+	"net/http"
 	"regexp"
-	"template"
+	"text/template"
 )
 
 type Page struct {

doc/codelab/wiki/final-noerror.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"http"
 	"io/ioutil"
-	"template"
+	"net/http"
+	"text/template"
 )
 
 type Page struct {

doc/codelab/wiki/final-parsetemplate.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"http"
 	"io/ioutil"
+	"net/http"
 	"regexp"
-	"template"
+	"text/template"
 )
 
 type Page struct {

doc/codelab/wiki/final-template.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"http"
 	"io/ioutil"
-	"template"
+	"net/http"
+	"text/template"
 )
 
 type Page struct {

doc/codelab/wiki/final.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"http"
 	"io/ioutil"
+	"net/http"
 	"regexp"
-	"template"
+	"text/template"
 )
 
 type Page struct {

doc/codelab/wiki/get.go

@@ -1,12 +1,12 @@
 package main
 
 import (
-	"http"
 	"flag"
 	"fmt"
 	"io"
 	"log"
 	"net"
+	"net/http"
 	"os"
 	"strings"
 )

doc/codelab/wiki/htmlify.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"template"
-	"os"
 	"io/ioutil"
+	"os"
+	"text/template"
 )
 
 func main() {

doc/codelab/wiki/http-sample.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {

doc/codelab/wiki/index.html

@@ -237,7 +237,7 @@ package main
 
 import (
 	"fmt"
-	"http"
+	"net/http"
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {

doc/codelab/wiki/notemplate.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"http"
 	"io/ioutil"
+	"net/http"
 )
 
 type Page struct {

doc/codelab/wiki/part2.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"http"
 	"io/ioutil"
+	"net/http"
 )
 
 type Page struct {

doc/codelab/wiki/srcextract.go

@@ -3,13 +3,13 @@ package main
 import (
 	"bytes"
 	"flag"
+	"go/ast"
 	"go/parser"
 	"go/printer"
-	"go/ast"
 	"go/token"
 	"log"
-	"template"
 	"os"
+	"text/template"
 )
 
 var (

doc/codewalk/markov.go

@@ -50,8 +50,8 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"math/rand"
 	"os"
-	"rand"
 	"strings"
 	"time"
 )

doc/codewalk/pig.go

@@ -6,7 +6,7 @@ package main
 
 import (
 	"fmt"
-	"rand"
+	"math/rand"
 )
 
 const (

doc/codewalk/urlpoll.go

@@ -5,8 +5,8 @@
 package main
 
 import (
-	"http"
 	"log"
+	"net/http"
 	"time"
 )
 

doc/progs/eff_qr.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"flag"
-	"http"
 	"log"
-	"template"
+	"net/http"
+	"text/template"
 )
 
 var addr = flag.String("addr", ":1718", "http service address") // Q=17, R=18

doc/talks/io2010/balance.go

@@ -8,7 +8,7 @@ import (
 	"container/heap"
 	"flag"
 	"fmt"
-	"rand"
+	"math/rand"
 	"time"
 )
 

doc/tmpltohtml.go

@@ -27,7 +27,7 @@ import (
 	"os"
 	"regexp"
 	"strings"
-	"template"
+	"text/template"
 )
 
 func Usage() {

misc/dashboard/builder/exec.go

@@ -6,10 +6,10 @@ package main
 
 import (
 	"bytes"
-	"exec"
 	"io"
 	"log"
 	"os"
+	"os/exec"
 	"strings"
 )
 

misc/dashboard/builder/http.go

@@ -6,13 +6,13 @@ package main
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
-	"http"
-	"json"
 	"log"
+	"net/http"
+	"net/url"
 	"strconv"
-	"url"
 )
 
 type param map[string]string

misc/dashboard/builder/main.go

@@ -5,6 +5,7 @@
 package main
 
 import (
+	"encoding/xml"
 	"errors"
 	"flag"
 	"fmt"
@@ -17,7 +18,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-	"xml"
 )
 
 const (

misc/goplay/goplay.go

@@ -5,16 +5,16 @@
 package main
 
 import (
-	"exec"
 	"flag"
-	"http"
 	"io"
 	"io/ioutil"
 	"log"
+	"net/http"
 	"os"
+	"os/exec"
 	"runtime"
 	"strconv"
-	"template"
+	"text/template"
 )
 
 var (

src/cmd/cgo/util.go

@@ -5,11 +5,11 @@
 package main
 
 import (
-	"exec"
 	"fmt"
 	"go/token"
 	"io/ioutil"
 	"os"
+	"os/exec"
 )
 
 // run runs the command argv, feeding in stdin on standard input.

src/cmd/go/main.go

@@ -10,7 +10,7 @@ import (
 	"io"
 	"os"
 	"strings"
-	"template"
+	"text/template"
 )
 
 // A Command is an implementation of a go command

src/cmd/godoc/appinit.go

@@ -9,8 +9,8 @@ package main
 
 import (
 	"archive/zip"
-	"http"
 	"log"
+	"net/http"
 	"path"
 )
 

src/cmd/godoc/codewalk.go

@@ -13,19 +13,19 @@
 package main
 
 import (
+	"encoding/xml"
 	"errors"
 	"fmt"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"regexp"
 	"sort"
 	"strconv"
 	"strings"
-	"template"
+	"text/template"
-	"utf8"
+	"unicode/utf8"
-	"xml"
 )
 
 // Handler for /doc/codewalk/ and below.

src/cmd/godoc/format.go

@@ -17,7 +17,7 @@ import (
 	"io"
 	"regexp"
 	"strconv"
-	"template"
+	"text/template"
 )
 
 // ----------------------------------------------------------------------------

src/cmd/godoc/godoc.go

@@ -13,9 +13,9 @@ import (
 	"go/doc"
 	"go/printer"
 	"go/token"
-	"http"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"path"
 	"path/filepath"
@@ -23,7 +23,7 @@ import (
 	"runtime"
 	"sort"
 	"strings"
-	"template"
+	"text/template"
 	"time"
 )
 

src/cmd/godoc/httpzip.go

@@ -26,8 +26,8 @@ package main
 import (
 	"archive/zip"
 	"fmt"
-	"http"
 	"io"
+	"net/http"
 	"os"
 	"path"
 	"sort"

src/cmd/godoc/index.go

@@ -40,12 +40,12 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"encoding/gob"
 	"errors"
 	"go/ast"
 	"go/parser"
 	"go/scanner"
 	"go/token"
-	"gob"
 	"index/suffixarray"
 	"io"
 	"path/filepath"

src/cmd/godoc/main.go

@@ -34,10 +34,11 @@ import (
 	"fmt"
 	"go/ast"
 	"go/build"
-	"http"
-	_ "http/pprof" // to serve /debug/pprof/*
 	"io"
 	"log"
+	"net/http"
+	_ "net/http/pprof" // to serve /debug/pprof/*
+	"net/url"
 	"os"
 	"path"
 	"path/filepath"
@@ -45,7 +46,6 @@ import (
 	"runtime"
 	"strings"
 	"time"
-	"url"
 )
 
 const defaultAddr = ":6060" // default webserver address

src/cmd/godoc/spec.go

@@ -14,7 +14,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"scanner"
+	"text/scanner"
 )
 
 type ebnfParser struct {

src/cmd/godoc/utils.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"sync"
 	"time"
-	"utf8"
+	"unicode/utf8"
 )
 
 // An RWValue wraps a value and permits mutually exclusive

src/cmd/gofix/main.go

@@ -6,7 +6,6 @@ package main
 
 import (
 	"bytes"
-	"exec"
 	"flag"
 	"fmt"
 	"go/ast"
@@ -16,6 +15,7 @@ import (
 	"go/token"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"sort"
 	"strings"

src/cmd/gofmt/gofmt.go

@@ -6,7 +6,6 @@ package main
 
 import (
 	"bytes"
-	"exec"
 	"flag"
 	"fmt"
 	"go/ast"
@@ -17,6 +16,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime/pprof"
 	"strings"

src/cmd/gofmt/rewrite.go

@@ -13,7 +13,7 @@ import (
 	"reflect"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 func initRewrite() {

src/cmd/goinstall/download.go

@@ -8,12 +8,12 @@ package main
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
-	"exec"
 	"fmt"
-	"http"
+	"net/http"
-	"json"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"runtime"

src/cmd/goinstall/main.go

@@ -7,13 +7,13 @@ package main
 import (
 	"bytes"
 	"errors"
-	"exec"
 	"flag"
 	"fmt"
 	"go/build"
 	"go/token"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath" // use for file system paths
 	"regexp"
 	"runtime"

src/cmd/goinstall/make.go

@@ -12,7 +12,7 @@ import (
 	"go/build"
 	"path" // use for import paths
 	"strings"
-	"template"
+	"text/template"
 )
 
 // domake builds the package in dir.

src/cmd/gotest/gotest.go

@@ -6,7 +6,6 @@ package main
 
 import (
 	"bufio"
-	"exec"
 	"fmt"
 	"go/ast"
 	"go/build"
@@ -15,12 +14,13 @@ import (
 	"go/token"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"runtime"
 	"sort"
 	"strings"
 	"time"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // Environment for commands.

src/cmd/govet/govet.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"utf8"
+	"unicode/utf8"
 )
 
 var verbose = flag.Bool("v", false, "verbose")

src/cmd/hgpatch/main.go

@@ -6,11 +6,11 @@ package main
 
 import (
 	"bytes"
-	"exec"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"patch"
 	"path/filepath"
 	"sort"

test/alias.go

@@ -11,25 +11,25 @@ package main
 
 import (
 	"fmt"
-	"utf8"
+	"unicode/utf8"
 )
 
-func f(byte) {}
+func f(byte)  {}
 func g(uint8) {}
 
 func main() {
 	var x float64
-	f(x)  // ERROR "byte"
+	f(x) // ERROR "byte"
-	g(x)  // ERROR "uint8"
+	g(x) // ERROR "uint8"
 
 	// Test across imports.
 
 	var ff fmt.Formatter
 	var fs fmt.State
-	ff.Format(fs, x)  // ERROR "rune"
+	ff.Format(fs, x) // ERROR "rune"
 
-	utf8.RuneStart(x)  // ERROR "byte"
+	utf8.RuneStart(x) // ERROR "byte"
 
 	var s utf8.String
-	s.At(x)  // ERROR "int"
+	s.At(x) // ERROR "int"
 }

test/bench/pidigits.go

@@ -38,9 +38,9 @@ POSSIBILITY OF SUCH DAMAGE.
 package main
 
 import (
-	"big"
 	"flag"
 	"fmt"
+	"math/big"
 )
 
 var n = flag.Int("n", 27, "number of digits")

test/chan/select5.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"template"
+	"text/template"
 )
 
 func main() {

test/cmplxdivide.go

@@ -9,14 +9,14 @@
 package main
 
 import (
-	"cmath"
 	"fmt"
 	"math"
+	"math/cmplx"
 )
 
-type Test struct{
+type Test struct {
-	f, g	complex128
+	f, g complex128
-	out	complex128
+	out  complex128
 }
 
 var nan = math.NaN()
@@ -25,9 +25,9 @@ var negzero = math.Copysign(0, -1)
 
 func calike(a, b complex128) bool {
 	switch {
-	case cmath.IsInf(a) && cmath.IsInf(b):
+	case cmplx.IsInf(a) && cmplx.IsInf(b):
 		return true
-	case cmath.IsNaN(a) && cmath.IsNaN(b):
+	case cmplx.IsNaN(a) && cmplx.IsNaN(b):
 		return true
 	}
 	return a == b
@@ -36,7 +36,7 @@ func calike(a, b complex128) bool {
 func main() {
 	bad := false
 	for _, t := range tests {
-		x := t.f/t.g
+		x := t.f / t.g
 		if !calike(x, t.out) {
 			if !bad {
 				fmt.Printf("BUG\n")

test/garbage/parser.go

@@ -12,14 +12,14 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
+	"log"
+	"net/http"
+	_ "net/http/pprof"
 	"os"
 	"path"
 	"runtime"
 	"strings"
 	"time"
-	"http"
-	_ "http/pprof"
-	"log"
 )
 
 var serve = flag.String("serve", "", "serve http on this address at end")

test/ken/divconst.go

@@ -6,7 +6,7 @@
 
 package main
 
-import "rand"
+import "math/rand"
 
 const Count = 1e5
 

test/ken/modconst.go

@@ -6,7 +6,7 @@
 
 package main
 
-import "rand"
+import "math/rand"
 
 const Count = 1e5
 

test/mallocrand.go

@@ -10,7 +10,7 @@ package main
 
 import (
 	"flag"
-	"rand"
+	"math/rand"
 	"runtime"
 	"unsafe"
 )

test/stringrange.go

@@ -9,7 +9,7 @@ package main
 import (
 	"fmt"
 	"os"
-	"utf8"
+	"unicode/utf8"
 )
 
 func main() {

test/utf.go

@@ -6,7 +6,7 @@
 
 package main
 
-import "utf8"
+import "unicode/utf8"
 
 func main() {
 	var chars [6]rune