aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThan McIntosh <thanm@google.com>2023-06-29 11:44:04 -0400
committerThan McIntosh <thanm@google.com>2023-06-29 16:02:11 +0000
commitfe73c186eba2c849a2f2aeaca091ddb5bac3aef1 (patch)
tree6bc9de2453379b8bfc200288a427956de42bfd77
parentda5d8fdd0c8963ca8f355088bf810c030eb7da27 (diff)
downloadgo-fe73c186eba2c849a2f2aeaca091ddb5bac3aef1.tar.gz
go-fe73c186eba2c849a2f2aeaca091ddb5bac3aef1.zip
cmd/{go,compile}: run gofmt
Ran gofmt on a couple of Go source files that needed it. Change-Id: I0e9f78831f531a728b892a63c6e0c517d92b11a8 Reviewed-on: https://go-review.googlesource.com/c/go/+/507156 Run-TryBot: Than McIntosh <thanm@google.com> Reviewed-by: Austin Clements <austin@google.com> Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com> TryBot-Result: Gopher Robot <gobot@golang.org>
-rw-r--r--src/cmd/compile/internal/devirtualize/devirtualize.go10
-rw-r--r--src/cmd/compile/internal/typecheck/stmt.go2
-rw-r--r--src/cmd/compile/internal/typecheck/subr.go4
-rw-r--r--src/cmd/go/internal/gover/gover.go1
-rw-r--r--src/cmd/go/main.go6
5 files changed, 11 insertions, 12 deletions
diff --git a/src/cmd/compile/internal/devirtualize/devirtualize.go b/src/cmd/compile/internal/devirtualize/devirtualize.go
index cfeb8d8ee9..b156b66312 100644
--- a/src/cmd/compile/internal/devirtualize/devirtualize.go
+++ b/src/cmd/compile/internal/devirtualize/devirtualize.go
@@ -4,11 +4,11 @@
// Package devirtualize implements two "devirtualization" optimization passes:
//
-// - "Static" devirtualization which replaces interface method calls with
-// direct concrete-type method calls where possible.
-// - "Profile-guided" devirtualization which replaces indirect calls with a
-// conditional direct call to the hottest concrete callee from a profile, as
-// well as a fallback using the original indirect call.
+// - "Static" devirtualization which replaces interface method calls with
+// direct concrete-type method calls where possible.
+// - "Profile-guided" devirtualization which replaces indirect calls with a
+// conditional direct call to the hottest concrete callee from a profile, as
+// well as a fallback using the original indirect call.
package devirtualize
import (
diff --git a/src/cmd/compile/internal/typecheck/stmt.go b/src/cmd/compile/internal/typecheck/stmt.go
index c434ff9118..9dea261bb9 100644
--- a/src/cmd/compile/internal/typecheck/stmt.go
+++ b/src/cmd/compile/internal/typecheck/stmt.go
@@ -607,7 +607,7 @@ func tcSwitchType(n *ir.SwitchStmt) {
if !n1.Type().IsInterface() {
why := ImplementsExplain(n1.Type(), t)
if why != "" {
- base.ErrorfAt(ncase.Pos(), errors.ImpossibleAssert, "impossible type switch case: %L cannot have dynamic type %v (%s)" , guard.X, n1.Type(), why)
+ base.ErrorfAt(ncase.Pos(), errors.ImpossibleAssert, "impossible type switch case: %L cannot have dynamic type %v (%s)", guard.X, n1.Type(), why)
}
continue
}
diff --git a/src/cmd/compile/internal/typecheck/subr.go b/src/cmd/compile/internal/typecheck/subr.go
index 8554805fa6..2bb978a0fa 100644
--- a/src/cmd/compile/internal/typecheck/subr.go
+++ b/src/cmd/compile/internal/typecheck/subr.go
@@ -713,12 +713,12 @@ func ImplementsExplain(t, iface *types.Type) string {
return fmt.Sprintf("%v does not implement %v (%v method is marked 'nointerface')", t, iface, missing.Sym)
} else if have != nil && have.Sym == missing.Sym {
return fmt.Sprintf("%v does not implement %v (wrong type for %v method)\n"+
- "\t\thave %v%S\n\t\twant %v%S", t, iface, missing.Sym, have.Sym, have.Type, missing.Sym, missing.Type)
+ "\t\thave %v%S\n\t\twant %v%S", t, iface, missing.Sym, have.Sym, have.Type, missing.Sym, missing.Type)
} else if ptr != 0 {
return fmt.Sprintf("%v does not implement %v (%v method has pointer receiver)", t, iface, missing.Sym)
} else if have != nil {
return fmt.Sprintf("%v does not implement %v (missing %v method)\n"+
- "\t\thave %v%S\n\t\twant %v%S", t, iface, missing.Sym, have.Sym, have.Type, missing.Sym, missing.Type)
+ "\t\thave %v%S\n\t\twant %v%S", t, iface, missing.Sym, have.Sym, have.Type, missing.Sym, missing.Type)
}
return fmt.Sprintf("%v does not implement %v (missing %v method)", t, iface, missing.Sym)
}
diff --git a/src/cmd/go/internal/gover/gover.go b/src/cmd/go/internal/gover/gover.go
index 247717125b..ce2242d522 100644
--- a/src/cmd/go/internal/gover/gover.go
+++ b/src/cmd/go/internal/gover/gover.go
@@ -111,7 +111,6 @@ func IsPrerelease(x string) bool {
//
// Prev("1.2") = "1.1"
// Prev("1.3rc4") = "1.2"
-//
func Prev(x string) string {
v := parse(x)
if cmpInt(v.minor, "1") <= 0 {
diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index 00b0a2b78b..2898c68049 100644
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -300,10 +300,10 @@ func maybeStartTrace(pctx context.Context) context.Context {
//
// We have to handle the -C flag this way for two reasons:
//
-// 1. Toolchain selection needs to be in the right directory to look for go.mod and go.work.
+// 1. Toolchain selection needs to be in the right directory to look for go.mod and go.work.
//
-// 2. A toolchain switch later on reinvokes the new go command with the same arguments.
-// The parent toolchain has already done the chdir; the child must not try to do it again.
+// 2. A toolchain switch later on reinvokes the new go command with the same arguments.
+// The parent toolchain has already done the chdir; the child must not try to do it again.
func handleChdirFlag() {
_, used := lookupCmd(os.Args[1:])
used++ // because of [1:]