gofmt-ify template, time, unsafe, flag, fmt

(replacement for CLs 1017039, 1017041, 1017040, 1018054)

R=r
http://go/go-review/1018060

diff --git a/src/pkg/flag/flag.go b/src/pkg/flag/flag.go
index 02f8187d66563e62d556c780bd1d8b7f249ae6a9..5dc698ce205c94b692f132793b8919f61bd3afcd 100644 (file)
--- a/src/pkg/flag/flag.go
+++ b/src/pkg/flag/flag.go
@@ -39,7 +39,7 @@
 
        Integer flags accept 1234, 0664, 0x1234 and may be negative.
        Boolean flags may be 1, 0, t, f, true, false, TRUE, FALSE, True, False.
- */
+*/
 package flag
 
 import (

diff --git a/src/pkg/flag/flag_test.go b/src/pkg/flag/flag_test.go
index bb013b780b2f8198efbe9fd3f2953a8bd722f053..59014dcd387f38b596617ed044c6bfea4880619b 100644 (file)
--- a/src/pkg/flag/flag_test.go
+++ b/src/pkg/flag/flag_test.go
@@ -5,8 +5,8 @@
 package flag_test
 
 import (
-       .       "flag";
-               "testing";
+       . "flag";
+       "testing";
 )
 
 var (

diff --git a/src/pkg/fmt/fmt_test.go b/src/pkg/fmt/fmt_test.go
index 43bdb82993f02343e9169b0c2d44642b13923549..07b1b221a9074d03f28c88b080b595d7b31ef4c1 100644 (file)
--- a/src/pkg/fmt/fmt_test.go
+++ b/src/pkg/fmt/fmt_test.go
@@ -5,11 +5,11 @@
 package fmt_test
 
 import (
-       .       "fmt";
-               "io";
-               "math";
-               "strings";
-               "testing";
+       . "fmt";
+       "io";
+       "math";
+       "strings";
+       "testing";
 )
 
 func TestFmtInterface(t *testing.T) {

diff --git a/src/pkg/fmt/print.go b/src/pkg/fmt/print.go
index cfd2849b80ae36a91f574c3789f3f2c9c647050a..58163124c4828778fd9c30a020eda291d63a2627 100644 (file)
--- a/src/pkg/fmt/print.go
+++ b/src/pkg/fmt/print.go
@@ -422,8 +422,8 @@ func (p *pp) printField(field reflect.Value, plus, sharp bool, depth int) (was_s
                                return false;   // this value is not a string
                        }
                }
-               }
-               s := "";
+       }
+       s := "";
 BigSwitch:
        switch f := field.(type) {
        case *reflect.BoolValue:

diff --git a/src/pkg/template/format.go b/src/pkg/template/format.go
index bcffc66ac557d0ab87cc7c4a9d03481648bbfe44..c5174e294341181469a3d01b36f9c4fcd0e7d237 100644 (file)
--- a/src/pkg/template/format.go
+++ b/src/pkg/template/format.go
@@ -22,11 +22,11 @@ func StringFormatter(w io.Writer, value interface{}, format string) {
 }
 
 var (
-       esc_quot = strings.Bytes(""");  // shorter than """
-       esc_apos = strings.Bytes("'");  // shorter than "'"
-       esc_amp = strings.Bytes("&");
-       esc_lt = strings.Bytes("<");
-       esc_gt = strings.Bytes(">");
+       esc_quot        = strings.Bytes(""");       // shorter than """
+       esc_apos        = strings.Bytes("'");       // shorter than "'"
+       esc_amp         = strings.Bytes("&");
+       esc_lt          = strings.Bytes("<");
+       esc_gt          = strings.Bytes(">");
 )
 
 // HtmlEscape writes to w the properly escaped HTML equivalent

diff --git a/src/pkg/time/tick_test.go b/src/pkg/time/tick_test.go
index a672ee4693553fbfb15e6251af3d73014bd2a6e1..5694a760905c386004f222d9a2a45557e26dde02 100644 (file)
--- a/src/pkg/time/tick_test.go
+++ b/src/pkg/time/tick_test.go
@@ -5,8 +5,8 @@
 package time_test
 
 import (
-               "testing";
-       .       "time";
+       "testing";
+       . "time";
 )
 
 func TestTicker(t *testing.T) {

diff --git a/src/pkg/unsafe/unsafe.go b/src/pkg/unsafe/unsafe.go
index c9b8c9a073154611cfe72374a868d85e43d400ed..a766e546a4c74042a6f2f56fcb2ac5ed1e81cba5 100644 (file)
--- a/src/pkg/unsafe/unsafe.go
+++ b/src/pkg/unsafe/unsafe.go
@@ -4,7 +4,7 @@
 
 /*
        The unsafe package contains operations that step around the type safety of Go programs.
- */
+*/
 package unsafe
 
 // ArbitraryType is here for the purposes of documentation only and is not actually