fmt: trivial cleanup

R=golang-dev, bradfitzgo
CC=golang-dev
https://golang.org/cl/4235052

diff --git a/src/pkg/fmt/format.go b/src/pkg/fmt/format.go
index 86057bf693cda2d49cd8ce44fd41407ac357045a..caaa7ac1a8af36ed2fb0ac13ef69911f33971954 100644 (file)
--- a/src/pkg/fmt/format.go
+++ b/src/pkg/fmt/format.go
@@ -107,7 +107,7 @@ func (f *fmt) writePadding(n int, padding []byte) {
 }
 
 // Append b to f.buf, padded on left (w > 0) or right (w < 0 or f.minus)
-// clear flags aftewards.
+// clear flags afterwards.
 func (f *fmt) pad(b []byte) {
        var padding []byte
        var left, right int
@@ -124,7 +124,7 @@ func (f *fmt) pad(b []byte) {
 }
 
 // append s to buf, padded on left (w > 0) or right (w < 0 or f.minus).
-// clear flags aftewards.
+// clear flags afterwards.
 func (f *fmt) padString(s string) {
        var padding []byte
        var left, right int

diff --git a/src/pkg/fmt/scan_test.go b/src/pkg/fmt/scan_test.go
index 65adb023686e8323a46e2612966b0633b59c5b4a..cab86dd9869700531e474f9d21dff0bfc25236b7 100644 (file)
--- a/src/pkg/fmt/scan_test.go
+++ b/src/pkg/fmt/scan_test.go
@@ -476,22 +476,12 @@ func verifyInf(str string, t *testing.T) {
        }
 }
 
-
 func TestInf(t *testing.T) {
        for _, s := range []string{"inf", "+inf", "-inf", "INF", "-INF", "+INF", "Inf", "-Inf", "+Inf"} {
                verifyInf(s, t)
        }
 }
 
-// TODO: there's no conversion from []T to ...T, but we can fake it.  These
-// functions do the faking.  We index the table by the length of the param list.
-var fscanf = []func(io.Reader, string, []interface{}) (int, os.Error){
-       0: func(r io.Reader, f string, i []interface{}) (int, os.Error) { return Fscanf(r, f) },
-       1: func(r io.Reader, f string, i []interface{}) (int, os.Error) { return Fscanf(r, f, i[0]) },
-       2: func(r io.Reader, f string, i []interface{}) (int, os.Error) { return Fscanf(r, f, i[0], i[1]) },
-       3: func(r io.Reader, f string, i []interface{}) (int, os.Error) { return Fscanf(r, f, i[0], i[1], i[2]) },
-}
-
 func testScanfMulti(name string, t *testing.T) {
        sliceType := reflect.Typeof(make([]interface{}, 1)).(*reflect.SliceType)
        for _, test := range multiTests {
@@ -501,7 +491,7 @@ func testScanfMulti(name string, t *testing.T) {
                } else {
                        r = newReader(test.text)
                }
-               n, err := fscanf[len(test.in)](r, test.format, test.in)
+               n, err := Fscanf(r, test.format, test.in...)
                if err != nil {
                        if test.err == "" {
                                t.Errorf("got error scanning (%q, %q): %q", test.format, test.text, err)