diff options
| author | Alan Donovan <adonovan@google.com> | 2025-11-11 14:48:22 -0500 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2025-11-11 19:59:40 -0800 |
| commit | 4bfc3a9d14c0b3bfcfe4ce987e47cda6720785a2 (patch) | |
| tree | 0cbf1ec55d3a61af8bf45ac4a00af7e7bcc426db /src/cmd/asm | |
| parent | 2263d4aabdde8a4a466009ecc356501f87c7efb7 (diff) | |
| download | go-4bfc3a9d14c0b3bfcfe4ce987e47cda6720785a2.tar.xz | |
std,cmd: go fix -any std cmd
This change mechanically replaces all occurrences of interface{}
by 'any' (where deemed safe by the 'any' modernizer) throughout
std and cmd, minus their vendor trees.
Since this fix is relatively numerous, it gets its own CL.
Also, 'go generate go/types'.
Change-Id: I14a6b52856c3291c1d27935409bca8d5fd4242a2
Reviewed-on: https://go-review.googlesource.com/c/go/+/719702
Commit-Queue: Alan Donovan <adonovan@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Auto-Submit: Alan Donovan <adonovan@google.com>
Diffstat (limited to 'src/cmd/asm')
| -rw-r--r-- | src/cmd/asm/internal/asm/endtoend_test.go | 6 | ||||
| -rw-r--r-- | src/cmd/asm/internal/asm/parse.go | 4 | ||||
| -rw-r--r-- | src/cmd/asm/internal/lex/input.go | 4 | ||||
| -rw-r--r-- | src/cmd/asm/main.go | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/cmd/asm/internal/asm/endtoend_test.go b/src/cmd/asm/internal/asm/endtoend_test.go index 9571afc326..e53263356d 100644 --- a/src/cmd/asm/internal/asm/endtoend_test.go +++ b/src/cmd/asm/internal/asm/endtoend_test.go @@ -38,7 +38,7 @@ func testEndToEnd(t *testing.T, goarch, file string) { ctxt.IsAsm = true defer ctxt.Bso.Flush() failed := false - ctxt.DiagFunc = func(format string, args ...interface{}) { + ctxt.DiagFunc = func(format string, args ...any) { failed = true t.Errorf(format, args...) } @@ -193,7 +193,7 @@ Diff: top := pList.Firstpc var text *obj.LSym ok = true - ctxt.DiagFunc = func(format string, args ...interface{}) { + ctxt.DiagFunc = func(format string, args ...any) { t.Errorf(format, args...) ok = false } @@ -294,7 +294,7 @@ func testErrors(t *testing.T, goarch, file string, flags ...string) { failed := false var errBuf bytes.Buffer parser.errorWriter = &errBuf - ctxt.DiagFunc = func(format string, args ...interface{}) { + ctxt.DiagFunc = func(format string, args ...any) { failed = true s := fmt.Sprintf(format, args...) if !strings.HasSuffix(s, "\n") { diff --git a/src/cmd/asm/internal/asm/parse.go b/src/cmd/asm/internal/asm/parse.go index 545f6c7553..25d596f4d6 100644 --- a/src/cmd/asm/internal/asm/parse.go +++ b/src/cmd/asm/internal/asm/parse.go @@ -78,7 +78,7 @@ func NewParser(ctxt *obj.Link, ar *arch.Arch, lexer lex.TokenReader) *Parser { // and turn it into a recoverable panic. var panicOnError bool -func (p *Parser) errorf(format string, args ...interface{}) { +func (p *Parser) errorf(format string, args ...any) { if panicOnError { panic(fmt.Errorf(format, args...)) } @@ -90,7 +90,7 @@ func (p *Parser) errorf(format string, args ...interface{}) { if p.lex != nil { // Put file and line information on head of message. format = "%s:%d: " + format + "\n" - args = append([]interface{}{p.lex.File(), p.lineNum}, args...) + args = append([]any{p.lex.File(), p.lineNum}, args...) } fmt.Fprintf(p.errorWriter, format, args...) p.errorCount++ diff --git a/src/cmd/asm/internal/lex/input.go b/src/cmd/asm/internal/lex/input.go index 789e229a77..342ac5ac48 100644 --- a/src/cmd/asm/internal/lex/input.go +++ b/src/cmd/asm/internal/lex/input.go @@ -68,7 +68,7 @@ func predefine(defines flags.MultiFlag) map[string]*Macro { var panicOnError bool // For testing. -func (in *Input) Error(args ...interface{}) { +func (in *Input) Error(args ...any) { if panicOnError { panic(fmt.Errorf("%s:%d: %s", in.File(), in.Line(), fmt.Sprintln(args...))) } @@ -77,7 +77,7 @@ func (in *Input) Error(args ...interface{}) { } // expectText is like Error but adds "got XXX" where XXX is a quoted representation of the most recent token. -func (in *Input) expectText(args ...interface{}) { +func (in *Input) expectText(args ...any) { in.Error(append(args, "; got", strconv.Quote(in.Stack.Text()))...) } diff --git a/src/cmd/asm/main.go b/src/cmd/asm/main.go index 9db1fec8be..f2697db516 100644 --- a/src/cmd/asm/main.go +++ b/src/cmd/asm/main.go @@ -93,7 +93,7 @@ func main() { for _, f := range flag.Args() { lexer := lex.NewLexer(f) parser := asm.NewParser(ctxt, architecture, lexer) - ctxt.DiagFunc = func(format string, args ...interface{}) { + ctxt.DiagFunc = func(format string, args ...any) { diag = true log.Printf(format, args...) } |
