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

R=rsc
CC=golang-dev
http://codereview.appspot.com/5338043

10 files changed, 24 insertions, 24 deletions

diff --git a/test/alias.go b/test/alias.go
index 199c782d0..410a44e6c 100644
--- a/test/alias.go
+++ b/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"
-	g(x)  // ERROR "uint8"
+	f(x) // ERROR "byte"
+	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"
 }
diff --git a/test/bench/pidigits.go b/test/bench/pidigits.go
index e59312177..a0f21a91d 100644
--- a/test/bench/pidigits.go
+++ b/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")
diff --git a/test/chan/select5.go b/test/chan/select5.go
index 607182167..cc2cc7100 100644
--- a/test/chan/select5.go
+++ b/test/chan/select5.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"template"
+	"text/template"
 )
 
 func main() {
diff --git a/test/cmplxdivide.go b/test/cmplxdivide.go
index 6a67b175d..461ee9796 100644
--- a/test/cmplxdivide.go
+++ b/test/cmplxdivide.go
@@ -9,14 +9,14 @@
 package main
 
 import (
-	"cmath"
 	"fmt"
 	"math"
+	"math/cmplx"
 )
 
-type Test struct{
-	f, g	complex128
-	out	complex128
+type Test struct {
+	f, g 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")
diff --git a/test/garbage/parser.go b/test/garbage/parser.go
index 1d7257521..d0f4e09ba 100644
--- a/test/garbage/parser.go
+++ b/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")
diff --git a/test/ken/divconst.go b/test/ken/divconst.go
index c3b9092cd..5a64d16b4 100644
--- a/test/ken/divconst.go
+++ b/test/ken/divconst.go
@@ -6,7 +6,7 @@
 
 package main
 
-import "rand"
+import "math/rand"
 
 const Count = 1e5
 
diff --git a/test/ken/modconst.go b/test/ken/modconst.go
index acb8831ef..c2603a0a0 100644
--- a/test/ken/modconst.go
+++ b/test/ken/modconst.go
@@ -6,7 +6,7 @@
 
 package main
 
-import "rand"
+import "math/rand"
 
 const Count = 1e5
 
diff --git a/test/mallocrand.go b/test/mallocrand.go
index f014b441b..726e36799 100644
--- a/test/mallocrand.go
+++ b/test/mallocrand.go
@@ -10,7 +10,7 @@ package main
 
 import (
 	"flag"
-	"rand"
+	"math/rand"
 	"runtime"
 	"unsafe"
 )
diff --git a/test/stringrange.go b/test/stringrange.go
index 924022b48..6a7063e23 100644
--- a/test/stringrange.go
+++ b/test/stringrange.go
@@ -9,7 +9,7 @@ package main
 import (
 	"fmt"
 	"os"
-	"utf8"
+	"unicode/utf8"
 )
 
 func main() {
diff --git a/test/utf.go b/test/utf.go
index ed8a983d8..9fba58156 100644
--- a/test/utf.go
+++ b/test/utf.go
@@ -6,7 +6,7 @@
 
 package main
 
-import "utf8"
+import "unicode/utf8"
 
 func main() {
 	var chars [6]rune