cmd: gofmt

Change-Id: I243b6521cb91ba5312c0857ca81cf422a7c7b21a
Reviewed-on: https://go-review.googlesource.com/c/go/+/203881
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/compile/fmtmap_test.go b/src/cmd/compile/fmtmap_test.go
index ebbaf01b176857b56dd577573deb9ce76a9335ee..51b79c6a8929cb56137fffa6ca50429654b4c289 100644 (file)
--- a/src/cmd/compile/fmtmap_test.go
+++ b/src/cmd/compile/fmtmap_test.go
@@ -171,37 +171,37 @@ var knownFormats = map[string]string{
        "map[*cmd/compile/internal/gc.Node]*cmd/compile/internal/ssa.Value %v": "",
        "map[*cmd/compile/internal/gc.Node][]*cmd/compile/internal/gc.Node %v": "",
        "map[cmd/compile/internal/ssa.ID]uint32 %v":                            "",
-       "map[int64]uint32 %v":                                                  "",
-       "math/big.Accuracy %s":                                                 "",
-       "reflect.Type %s":                                                      "",
-       "rune %#U":                                                             "",
-       "rune %c":                                                              "",
-       "rune %q":                                                              "",
-       "string %-*s":                                                          "",
-       "string %-16s":                                                         "",
-       "string %-6s":                                                          "",
-       "string %q":                                                            "",
-       "string %s":                                                            "",
-       "string %v":                                                            "",
-       "time.Duration %d":                                                     "",
-       "time.Duration %v":                                                     "",
-       "uint %04x":                                                            "",
-       "uint %5d":                                                             "",
-       "uint %d":                                                              "",
-       "uint %x":                                                              "",
-       "uint16 %d":                                                            "",
-       "uint16 %x":                                                            "",
-       "uint32 %#U":                                                           "",
-       "uint32 %#x":                                                           "",
-       "uint32 %d":                                                            "",
-       "uint32 %v":                                                            "",
-       "uint32 %x":                                                            "",
-       "uint64 %08x":                                                          "",
-       "uint64 %b":                                                            "",
-       "uint64 %d":                                                            "",
-       "uint64 %x":                                                            "",
-       "uint8 %d":                                                             "",
-       "uint8 %v":                                                             "",
-       "uint8 %x":                                                             "",
-       "uintptr %d":                                                           "",
+       "map[int64]uint32 %v":  "",
+       "math/big.Accuracy %s": "",
+       "reflect.Type %s":      "",
+       "rune %#U":             "",
+       "rune %c":              "",
+       "rune %q":              "",
+       "string %-*s":          "",
+       "string %-16s":         "",
+       "string %-6s":          "",
+       "string %q":            "",
+       "string %s":            "",
+       "string %v":            "",
+       "time.Duration %d":     "",
+       "time.Duration %v":     "",
+       "uint %04x":            "",
+       "uint %5d":             "",
+       "uint %d":              "",
+       "uint %x":              "",
+       "uint16 %d":            "",
+       "uint16 %x":            "",
+       "uint32 %#U":           "",
+       "uint32 %#x":           "",
+       "uint32 %d":            "",
+       "uint32 %v":            "",
+       "uint32 %x":            "",
+       "uint64 %08x":          "",
+       "uint64 %b":            "",
+       "uint64 %d":            "",
+       "uint64 %x":            "",
+       "uint8 %d":             "",
+       "uint8 %v":             "",
+       "uint8 %x":             "",
+       "uintptr %d":           "",
 }

diff --git a/src/cmd/compile/internal/ssa/branchelim.go b/src/cmd/compile/internal/ssa/branchelim.go
index 298eed362ac66cc1c6aff35b626d7a884d980102..c7c3f8c15f1c7d87c36aea22370b2c737f825ead 100644 (file)
--- a/src/cmd/compile/internal/ssa/branchelim.go
+++ b/src/cmd/compile/internal/ssa/branchelim.go
@@ -220,7 +220,7 @@ func elimIf(f *Func, loadAddr *sparseSet, dom *Block) bool {
        // that has the same line number as the Pos for b itself, and
        // puts a statement mark on it, and returns whether it succeeded
        // in this operation.
-       setBlockPos := func (b *Block) bool {
+       setBlockPos := func(b *Block) bool {
                pos := b.Pos
                for _, v := range b.Values {
                        if pos.SameFileAndLine(v.Pos) && !isPoorStatementOp(v.Op) {

diff --git a/src/cmd/internal/src/pos.go b/src/cmd/internal/src/pos.go
index 8c0b6d277ba9fe85b2c3de4124dc0c0e5d7f8863..60c7c91cde41f7b4e234f067b4166a7f9572edbf 100644 (file)
--- a/src/cmd/internal/src/pos.go
+++ b/src/cmd/internal/src/pos.go
@@ -382,7 +382,7 @@ func makeLico(line, col uint) lico {
 }
 
 func (x lico) Line() uint           { return uint(x) >> lineShift }
-func (x lico) SameLine(y lico) bool { return 0 == (x^y)&^lico(1 << lineShift-1) }
+func (x lico) SameLine(y lico) bool { return 0 == (x^y)&^lico(1<<lineShift-1) }
 func (x lico) Col() uint            { return uint(x) >> colShift & colMax }
 func (x lico) IsStmt() uint {
        if x == 0 {