gofmt -s -w src misc

R=r, rsc
CC=golang-dev
https://golang.org/cl/2662041
diff --git a/src/pkg/math/all_test.go b/src/pkg/math/all_test.go
index 8a60bca..7a61280 100644
--- a/src/pkg/math/all_test.go
+++ b/src/pkg/math/all_test.go
@@ -287,16 +287,16 @@
 }
 
 var frexp = []fi{
-	fi{6.2237649061045918750e-01, 3},
-	fi{9.6735905932226306250e-01, 3},
-	fi{-5.5376011438400318000e-01, -1},
-	fi{-6.2632545228388436250e-01, 3},
-	fi{6.02268356699901081250e-01, 4},
-	fi{7.3159430981099115000e-01, 2},
-	fi{6.5363542893241332500e-01, 3},
-	fi{6.8198497760900255000e-01, 2},
-	fi{9.1265404584042750000e-01, 1},
-	fi{-5.4287029803597508250e-01, 4},
+	{6.2237649061045918750e-01, 3},
+	{9.6735905932226306250e-01, 3},
+	{-5.5376011438400318000e-01, -1},
+	{-6.2632545228388436250e-01, 3},
+	{6.02268356699901081250e-01, 4},
+	{7.3159430981099115000e-01, 2},
+	{6.5363542893241332500e-01, 3},
+	{6.8198497760900255000e-01, 2},
+	{9.1265404584042750000e-01, 1},
+	{-5.4287029803597508250e-01, 4},
 }
 var gamma = []float64{
 	2.3254348370739963835386613898e+01,
@@ -359,16 +359,16 @@
 	-2.3762660886100206491674503e-01,
 }
 var lgamma = []fi{
-	fi{3.146492141244545774319734e+00, 1},
-	fi{8.003414490659126375852113e+00, 1},
-	fi{1.517575735509779707488106e+00, -1},
-	fi{-2.588480028182145853558748e-01, 1},
-	fi{1.1989897050205555002007985e+01, 1},
-	fi{6.262899811091257519386906e-01, 1},
-	fi{3.5287924899091566764846037e+00, 1},
-	fi{4.5725644770161182299423372e-01, 1},
-	fi{-6.363667087767961257654854e-02, 1},
-	fi{-1.077385130910300066425564e+01, -1},
+	{3.146492141244545774319734e+00, 1},
+	{8.003414490659126375852113e+00, 1},
+	{1.517575735509779707488106e+00, -1},
+	{-2.588480028182145853558748e-01, 1},
+	{1.1989897050205555002007985e+01, 1},
+	{6.262899811091257519386906e-01, 1},
+	{3.5287924899091566764846037e+00, 1},
+	{4.5725644770161182299423372e-01, 1},
+	{-6.363667087767961257654854e-02, 1},
+	{-1.077385130910300066425564e+01, -1},
 }
 var log = []float64{
 	1.605231462693062999102599e+00,
@@ -431,16 +431,16 @@
 	3.118679457227342224364709e+00,
 }
 var modf = [][2]float64{
-	[2]float64{4.0000000000000000e+00, 9.7901192488367350108546816e-01},
-	[2]float64{7.0000000000000000e+00, 7.3887247457810456552351752e-01},
-	[2]float64{0.0000000000000000e+00, -2.7688005719200159404635997e-01},
-	[2]float64{-5.0000000000000000e+00, -1.060361827107492160848778e-02},
-	[2]float64{9.0000000000000000e+00, 6.3629370719841737980004837e-01},
-	[2]float64{2.0000000000000000e+00, 9.2637723924396464525443662e-01},
-	[2]float64{5.0000000000000000e+00, 2.2908343145930665230025625e-01},
-	[2]float64{2.0000000000000000e+00, 7.2793991043601025126008608e-01},
-	[2]float64{1.0000000000000000e+00, 8.2530809168085506044576505e-01},
-	[2]float64{-8.0000000000000000e+00, -6.8592476857560136238589621e-01},
+	{4.0000000000000000e+00, 9.7901192488367350108546816e-01},
+	{7.0000000000000000e+00, 7.3887247457810456552351752e-01},
+	{0.0000000000000000e+00, -2.7688005719200159404635997e-01},
+	{-5.0000000000000000e+00, -1.060361827107492160848778e-02},
+	{9.0000000000000000e+00, 6.3629370719841737980004837e-01},
+	{2.0000000000000000e+00, 9.2637723924396464525443662e-01},
+	{5.0000000000000000e+00, 2.2908343145930665230025625e-01},
+	{2.0000000000000000e+00, 7.2793991043601025126008608e-01},
+	{1.0000000000000000e+00, 8.2530809168085506044576505e-01},
+	{-8.0000000000000000e+00, -6.8592476857560136238589621e-01},
 }
 var nextafter = []float64{
 	4.97901192488367438926388786e+00,
@@ -708,41 +708,41 @@
 	NaN(),
 }
 var vfatan2SC = [][2]float64{
-	[2]float64{Inf(-1), Inf(-1)},
-	[2]float64{Inf(-1), -Pi},
-	[2]float64{Inf(-1), 0},
-	[2]float64{Inf(-1), +Pi},
-	[2]float64{Inf(-1), Inf(1)},
-	[2]float64{Inf(-1), NaN()},
-	[2]float64{-Pi, Inf(-1)},
-	[2]float64{-Pi, 0},
-	[2]float64{-Pi, Inf(1)},
-	[2]float64{-Pi, NaN()},
-	[2]float64{Copysign(0, -1), Inf(-1)},
-	[2]float64{Copysign(0, -1), -Pi},
-	[2]float64{Copysign(0, -1), Copysign(0, -1)},
-	[2]float64{Copysign(0, -1), 0},
-	[2]float64{Copysign(0, -1), +Pi},
-	[2]float64{Copysign(0, -1), Inf(1)},
-	[2]float64{Copysign(0, -1), NaN()},
-	[2]float64{0, Inf(-1)},
-	[2]float64{0, -Pi},
-	[2]float64{0, Copysign(0, -1)},
-	[2]float64{0, 0},
-	[2]float64{0, +Pi},
-	[2]float64{0, Inf(1)},
-	[2]float64{0, NaN()},
-	[2]float64{+Pi, Inf(-1)},
-	[2]float64{+Pi, 0},
-	[2]float64{+Pi, Inf(1)},
-	[2]float64{+Pi, NaN()},
-	[2]float64{Inf(1), Inf(-1)},
-	[2]float64{Inf(1), -Pi},
-	[2]float64{Inf(1), 0},
-	[2]float64{Inf(1), +Pi},
-	[2]float64{Inf(1), Inf(1)},
-	[2]float64{Inf(1), NaN()},
-	[2]float64{NaN(), NaN()},
+	{Inf(-1), Inf(-1)},
+	{Inf(-1), -Pi},
+	{Inf(-1), 0},
+	{Inf(-1), +Pi},
+	{Inf(-1), Inf(1)},
+	{Inf(-1), NaN()},
+	{-Pi, Inf(-1)},
+	{-Pi, 0},
+	{-Pi, Inf(1)},
+	{-Pi, NaN()},
+	{Copysign(0, -1), Inf(-1)},
+	{Copysign(0, -1), -Pi},
+	{Copysign(0, -1), Copysign(0, -1)},
+	{Copysign(0, -1), 0},
+	{Copysign(0, -1), +Pi},
+	{Copysign(0, -1), Inf(1)},
+	{Copysign(0, -1), NaN()},
+	{0, Inf(-1)},
+	{0, -Pi},
+	{0, Copysign(0, -1)},
+	{0, 0},
+	{0, +Pi},
+	{0, Inf(1)},
+	{0, NaN()},
+	{+Pi, Inf(-1)},
+	{+Pi, 0},
+	{+Pi, Inf(1)},
+	{+Pi, NaN()},
+	{Inf(1), Inf(-1)},
+	{Inf(1), -Pi},
+	{Inf(1), 0},
+	{Inf(1), +Pi},
+	{Inf(1), Inf(1)},
+	{Inf(1), NaN()},
+	{NaN(), NaN()},
 }
 var atan2SC = []float64{
 	-3 * Pi / 4,     // atan2(-Inf, -Inf)
@@ -921,40 +921,40 @@
 }
 
 var vffmodSC = [][2]float64{
-	[2]float64{Inf(-1), Inf(-1)},
-	[2]float64{Inf(-1), -Pi},
-	[2]float64{Inf(-1), 0},
-	[2]float64{Inf(-1), Pi},
-	[2]float64{Inf(-1), Inf(1)},
-	[2]float64{Inf(-1), NaN()},
-	[2]float64{-Pi, Inf(-1)},
-	[2]float64{-Pi, 0},
-	[2]float64{-Pi, Inf(1)},
-	[2]float64{-Pi, NaN()},
-	[2]float64{Copysign(0, -1), Inf(-1)},
-	[2]float64{Copysign(0, -1), 0},
-	[2]float64{Copysign(0, -1), Inf(1)},
-	[2]float64{Copysign(0, -1), NaN()},
-	[2]float64{0, Inf(-1)},
-	[2]float64{0, 0},
-	[2]float64{0, Inf(1)},
-	[2]float64{0, NaN()},
-	[2]float64{Pi, Inf(-1)},
-	[2]float64{Pi, 0},
-	[2]float64{Pi, Inf(1)},
-	[2]float64{Pi, NaN()},
-	[2]float64{Inf(1), Inf(-1)},
-	[2]float64{Inf(1), -Pi},
-	[2]float64{Inf(1), 0},
-	[2]float64{Inf(1), Pi},
-	[2]float64{Inf(1), Inf(1)},
-	[2]float64{Inf(1), NaN()},
-	[2]float64{NaN(), Inf(-1)},
-	[2]float64{NaN(), -Pi},
-	[2]float64{NaN(), 0},
-	[2]float64{NaN(), Pi},
-	[2]float64{NaN(), Inf(1)},
-	[2]float64{NaN(), NaN()},
+	{Inf(-1), Inf(-1)},
+	{Inf(-1), -Pi},
+	{Inf(-1), 0},
+	{Inf(-1), Pi},
+	{Inf(-1), Inf(1)},
+	{Inf(-1), NaN()},
+	{-Pi, Inf(-1)},
+	{-Pi, 0},
+	{-Pi, Inf(1)},
+	{-Pi, NaN()},
+	{Copysign(0, -1), Inf(-1)},
+	{Copysign(0, -1), 0},
+	{Copysign(0, -1), Inf(1)},
+	{Copysign(0, -1), NaN()},
+	{0, Inf(-1)},
+	{0, 0},
+	{0, Inf(1)},
+	{0, NaN()},
+	{Pi, Inf(-1)},
+	{Pi, 0},
+	{Pi, Inf(1)},
+	{Pi, NaN()},
+	{Inf(1), Inf(-1)},
+	{Inf(1), -Pi},
+	{Inf(1), 0},
+	{Inf(1), Pi},
+	{Inf(1), Inf(1)},
+	{Inf(1), NaN()},
+	{NaN(), Inf(-1)},
+	{NaN(), -Pi},
+	{NaN(), 0},
+	{NaN(), Pi},
+	{NaN(), Inf(1)},
+	{NaN(), NaN()},
 }
 var fmodSC = []float64{
 	NaN(),           // fmod(-Inf, -Inf)
@@ -1001,11 +1001,11 @@
 	NaN(),
 }
 var frexpSC = []fi{
-	fi{Inf(-1), 0},
-	fi{Copysign(0, -1), 0},
-	fi{0, 0},
-	fi{Inf(1), 0},
-	fi{NaN(), 0},
+	{Inf(-1), 0},
+	{Copysign(0, -1), 0},
+	{0, 0},
+	{Inf(1), 0},
+	{NaN(), 0},
 }
 
 var vfgammaSC = []float64{
@@ -1026,25 +1026,25 @@
 }
 
 var vfhypotSC = [][2]float64{
-	[2]float64{Inf(-1), Inf(-1)},
-	[2]float64{Inf(-1), 0},
-	[2]float64{Inf(-1), Inf(1)},
-	[2]float64{Inf(-1), NaN()},
-	[2]float64{Copysign(0, -1), Copysign(0, -1)},
-	[2]float64{Copysign(0, -1), 0},
-	[2]float64{0, Copysign(0, -1)},
-	[2]float64{0, 0}, // +0, +0
-	[2]float64{0, Inf(-1)},
-	[2]float64{0, Inf(1)},
-	[2]float64{0, NaN()},
-	[2]float64{Inf(1), Inf(-1)},
-	[2]float64{Inf(1), 0},
-	[2]float64{Inf(1), Inf(1)},
-	[2]float64{Inf(1), NaN()},
-	[2]float64{NaN(), Inf(-1)},
-	[2]float64{NaN(), 0},
-	[2]float64{NaN(), Inf(1)},
-	[2]float64{NaN(), NaN()},
+	{Inf(-1), Inf(-1)},
+	{Inf(-1), 0},
+	{Inf(-1), Inf(1)},
+	{Inf(-1), NaN()},
+	{Copysign(0, -1), Copysign(0, -1)},
+	{Copysign(0, -1), 0},
+	{0, Copysign(0, -1)},
+	{0, 0}, // +0, +0
+	{0, Inf(-1)},
+	{0, Inf(1)},
+	{0, NaN()},
+	{Inf(1), Inf(-1)},
+	{Inf(1), 0},
+	{Inf(1), Inf(1)},
+	{Inf(1), NaN()},
+	{NaN(), Inf(-1)},
+	{NaN(), 0},
+	{NaN(), Inf(1)},
+	{NaN(), NaN()},
 }
 var hypotSC = []float64{
 	Inf(1),
@@ -1122,13 +1122,13 @@
 	NaN(),
 }
 var lgammaSC = []fi{
-	fi{Inf(-1), 1},
-	fi{Inf(1), 1},
-	fi{Inf(1), 1},
-	fi{0, 1},
-	fi{0, 1},
-	fi{Inf(1), 1},
-	fi{NaN(), 1},
+	{Inf(-1), 1},
+	{Inf(1), 1},
+	{Inf(1), 1},
+	{0, 1},
+	{0, 1},
+	{Inf(1), 1},
+	{NaN(), 1},
 }
 
 var vflogSC = []float64{
@@ -1188,15 +1188,15 @@
 	NaN(),
 }
 var modfSC = [][2]float64{
-	[2]float64{Inf(-1), NaN()}, // [2]float64{Copysign(0, -1), Inf(-1)},
-	[2]float64{Inf(1), NaN()},  // [2]float64{0, Inf(1)},
-	[2]float64{NaN(), NaN()},
+	{Inf(-1), NaN()}, // [2]float64{Copysign(0, -1), Inf(-1)},
+	{Inf(1), NaN()},  // [2]float64{0, Inf(1)},
+	{NaN(), NaN()},
 }
 
 var vfnextafterSC = [][2]float64{
-	[2]float64{0, NaN()},
-	[2]float64{NaN(), 0},
-	[2]float64{NaN(), NaN()},
+	{0, NaN()},
+	{NaN(), 0},
+	{NaN(), NaN()},
 }
 var nextafterSC = []float64{
 	NaN(),
@@ -1205,70 +1205,70 @@
 }
 
 var vfpowSC = [][2]float64{
-	[2]float64{Inf(-1), -Pi},
-	[2]float64{Inf(-1), -3},
-	[2]float64{Inf(-1), Copysign(0, -1)},
-	[2]float64{Inf(-1), 0},
-	[2]float64{Inf(-1), 1},
-	[2]float64{Inf(-1), 3},
-	[2]float64{Inf(-1), Pi},
-	[2]float64{Inf(-1), NaN()},
+	{Inf(-1), -Pi},
+	{Inf(-1), -3},
+	{Inf(-1), Copysign(0, -1)},
+	{Inf(-1), 0},
+	{Inf(-1), 1},
+	{Inf(-1), 3},
+	{Inf(-1), Pi},
+	{Inf(-1), NaN()},
 
-	[2]float64{-Pi, Inf(-1)},
-	[2]float64{-Pi, -Pi},
-	[2]float64{-Pi, Copysign(0, -1)},
-	[2]float64{-Pi, 0},
-	[2]float64{-Pi, 1},
-	[2]float64{-Pi, Pi},
-	[2]float64{-Pi, Inf(1)},
-	[2]float64{-Pi, NaN()},
+	{-Pi, Inf(-1)},
+	{-Pi, -Pi},
+	{-Pi, Copysign(0, -1)},
+	{-Pi, 0},
+	{-Pi, 1},
+	{-Pi, Pi},
+	{-Pi, Inf(1)},
+	{-Pi, NaN()},
 
-	[2]float64{-1, Inf(-1)},
-	[2]float64{-1, Inf(1)},
-	[2]float64{-1, NaN()},
-	[2]float64{-1 / 2, Inf(-1)},
-	[2]float64{-1 / 2, Inf(1)},
-	[2]float64{Copysign(0, -1), Inf(-1)},
-	[2]float64{Copysign(0, -1), -Pi},
-	[2]float64{Copysign(0, -1), -3},
-	[2]float64{Copysign(0, -1), 3},
-	[2]float64{Copysign(0, -1), Pi},
-	[2]float64{Copysign(0, -1), Inf(1)},
+	{-1, Inf(-1)},
+	{-1, Inf(1)},
+	{-1, NaN()},
+	{-1 / 2, Inf(-1)},
+	{-1 / 2, Inf(1)},
+	{Copysign(0, -1), Inf(-1)},
+	{Copysign(0, -1), -Pi},
+	{Copysign(0, -1), -3},
+	{Copysign(0, -1), 3},
+	{Copysign(0, -1), Pi},
+	{Copysign(0, -1), Inf(1)},
 
-	[2]float64{0, Inf(-1)},
-	[2]float64{0, -Pi},
-	[2]float64{0, -3},
-	[2]float64{0, Copysign(0, -1)},
-	[2]float64{0, 0},
-	[2]float64{0, 3},
-	[2]float64{0, Pi},
-	[2]float64{0, Inf(1)},
-	[2]float64{0, NaN()},
+	{0, Inf(-1)},
+	{0, -Pi},
+	{0, -3},
+	{0, Copysign(0, -1)},
+	{0, 0},
+	{0, 3},
+	{0, Pi},
+	{0, Inf(1)},
+	{0, NaN()},
 
-	[2]float64{1 / 2, Inf(-1)},
-	[2]float64{1 / 2, Inf(1)},
-	[2]float64{1, Inf(-1)},
-	[2]float64{1, Inf(1)},
-	[2]float64{1, NaN()},
+	{1 / 2, Inf(-1)},
+	{1 / 2, Inf(1)},
+	{1, Inf(-1)},
+	{1, Inf(1)},
+	{1, NaN()},
 
-	[2]float64{Pi, Inf(-1)},
-	[2]float64{Pi, Copysign(0, -1)},
-	[2]float64{Pi, 0},
-	[2]float64{Pi, 1},
-	[2]float64{Pi, Inf(1)},
-	[2]float64{Pi, NaN()},
-	[2]float64{Inf(1), -Pi},
-	[2]float64{Inf(1), Copysign(0, -1)},
-	[2]float64{Inf(1), 0},
-	[2]float64{Inf(1), 1},
-	[2]float64{Inf(1), Pi},
-	[2]float64{Inf(1), NaN()},
-	[2]float64{NaN(), -Pi},
-	[2]float64{NaN(), Copysign(0, -1)},
-	[2]float64{NaN(), 0},
-	[2]float64{NaN(), 1},
-	[2]float64{NaN(), Pi},
-	[2]float64{NaN(), NaN()},
+	{Pi, Inf(-1)},
+	{Pi, Copysign(0, -1)},
+	{Pi, 0},
+	{Pi, 1},
+	{Pi, Inf(1)},
+	{Pi, NaN()},
+	{Inf(1), -Pi},
+	{Inf(1), Copysign(0, -1)},
+	{Inf(1), 0},
+	{Inf(1), 1},
+	{Inf(1), Pi},
+	{Inf(1), NaN()},
+	{NaN(), -Pi},
+	{NaN(), Copysign(0, -1)},
+	{NaN(), 0},
+	{NaN(), 1},
+	{NaN(), Pi},
+	{NaN(), NaN()},
 }
 var powSC = []float64{
 	0,               // pow(-Inf, -Pi)
@@ -2245,10 +2245,10 @@
 }
 
 var floatTests = []floatTest{
-	floatTest{float64(MaxFloat64), "MaxFloat64", "1.7976931348623157e+308"},
-	floatTest{float64(MinFloat64), "MinFloat64", "5e-324"},
-	floatTest{float32(MaxFloat32), "MaxFloat32", "3.4028235e+38"},
-	floatTest{float32(MinFloat32), "MinFloat32", "1e-45"},
+	{float64(MaxFloat64), "MaxFloat64", "1.7976931348623157e+308"},
+	{float64(MinFloat64), "MinFloat64", "5e-324"},
+	{float32(MaxFloat32), "MaxFloat32", "3.4028235e+38"},
+	{float32(MinFloat32), "MinFloat32", "1e-45"},
 }
 
 func TestFloatMinMax(t *testing.T) {