From 4bfc3a9d14c0b3bfcfe4ce987e47cda6720785a2 Mon Sep 17 00:00:00 2001 From: Alan Donovan Date: Tue, 11 Nov 2025 14:48:22 -0500 Subject: 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 Reviewed-by: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov Auto-Submit: Alan Donovan --- src/cmd/link/internal/ld/dwarf.go | 14 +++++++------- src/cmd/link/internal/ld/link.go | 2 +- src/cmd/link/internal/ld/macho_combine_dwarf.go | 2 +- src/cmd/link/internal/ld/util.go | 6 +++--- src/cmd/link/internal/ld/xcoff.go | 3 +-- src/cmd/link/internal/loadelf/ldelf.go | 2 +- src/cmd/link/internal/loader/loader.go | 4 ++-- src/cmd/link/internal/loadmacho/ldmacho.go | 2 +- src/cmd/link/internal/loadxcoff/ldxcoff.go | 2 +- src/cmd/link/internal/sym/segment.go | 2 +- 10 files changed, 19 insertions(+), 20 deletions(-) (limited to 'src/cmd/link') diff --git a/src/cmd/link/internal/ld/dwarf.go b/src/cmd/link/internal/ld/dwarf.go index 222e712ede..31de34aff4 100644 --- a/src/cmd/link/internal/ld/dwarf.go +++ b/src/cmd/link/internal/ld/dwarf.go @@ -100,7 +100,7 @@ func (c dwctxt) AddString(s dwarf.Sym, v string) { dsu.Addstring(v) } -func (c dwctxt) AddAddress(s dwarf.Sym, data interface{}, value int64) { +func (c dwctxt) AddAddress(s dwarf.Sym, data any, value int64) { ds := loader.Sym(s.(dwSym)) dsu := c.ldr.MakeSymbolUpdater(ds) if value != 0 { @@ -110,7 +110,7 @@ func (c dwctxt) AddAddress(s dwarf.Sym, data interface{}, value int64) { dsu.AddAddrPlus(c.arch, tgtds, value) } -func (c dwctxt) AddCURelativeAddress(s dwarf.Sym, data interface{}, value int64) { +func (c dwctxt) AddCURelativeAddress(s dwarf.Sym, data any, value int64) { ds := loader.Sym(s.(dwSym)) dsu := c.ldr.MakeSymbolUpdater(ds) if value != 0 { @@ -120,7 +120,7 @@ func (c dwctxt) AddCURelativeAddress(s dwarf.Sym, data interface{}, value int64) dsu.AddCURelativeAddrPlus(c.arch, tgtds, value) } -func (c dwctxt) AddSectionOffset(s dwarf.Sym, size int, t interface{}, ofs int64) { +func (c dwctxt) AddSectionOffset(s dwarf.Sym, size int, t any, ofs int64) { ds := loader.Sym(s.(dwSym)) dsu := c.ldr.MakeSymbolUpdater(ds) tds := loader.Sym(t.(dwSym)) @@ -132,7 +132,7 @@ func (c dwctxt) AddSectionOffset(s dwarf.Sym, size int, t interface{}, ofs int64 dsu.AddSymRef(c.arch, tds, ofs, objabi.R_ADDROFF, size) } -func (c dwctxt) AddDWARFAddrSectionOffset(s dwarf.Sym, t interface{}, ofs int64) { +func (c dwctxt) AddDWARFAddrSectionOffset(s dwarf.Sym, t any, ofs int64) { size := 4 if isDwarf64(c.linkctxt) { size = 8 @@ -148,14 +148,14 @@ func (c dwctxt) AddDWARFAddrSectionOffset(s dwarf.Sym, t interface{}, ofs int64) dsu.AddSymRef(c.arch, tds, ofs, objabi.R_DWARFSECREF, size) } -func (c dwctxt) AddIndirectTextRef(s dwarf.Sym, t interface{}) { +func (c dwctxt) AddIndirectTextRef(s dwarf.Sym, t any) { ds := loader.Sym(s.(dwSym)) dsu := c.ldr.MakeSymbolUpdater(ds) tds := loader.Sym(t.(dwSym)) dsu.AddSymRef(c.arch, tds, 0, objabi.R_DWTXTADDR_U4, 4) } -func (c dwctxt) Logf(format string, args ...interface{}) { +func (c dwctxt) Logf(format string, args ...any) { c.linkctxt.Logf(format, args...) } @@ -239,7 +239,7 @@ var dwtypes dwarf.DWDie // up all attrs in a single large table, then store indices into the // table in the DIE. This would allow us to common up storage for // attributes that are shared by many DIEs (ex: byte size of N). -func newattr(die *dwarf.DWDie, attr uint16, cls int, value int64, data interface{}) { +func newattr(die *dwarf.DWDie, attr uint16, cls int, value int64, data any) { a := new(dwarf.DWAttr) a.Link = die.Attr die.Attr = a diff --git a/src/cmd/link/internal/ld/link.go b/src/cmd/link/internal/ld/link.go index df1fc7feab..2276d39d88 100644 --- a/src/cmd/link/internal/ld/link.go +++ b/src/cmd/link/internal/ld/link.go @@ -126,7 +126,7 @@ type cgodata struct { directives [][]string } -func (ctxt *Link) Logf(format string, args ...interface{}) { +func (ctxt *Link) Logf(format string, args ...any) { fmt.Fprintf(ctxt.Bso, format, args...) ctxt.Bso.Flush() } diff --git a/src/cmd/link/internal/ld/macho_combine_dwarf.go b/src/cmd/link/internal/ld/macho_combine_dwarf.go index d60755f147..2b303cbdae 100644 --- a/src/cmd/link/internal/ld/macho_combine_dwarf.go +++ b/src/cmd/link/internal/ld/macho_combine_dwarf.go @@ -392,7 +392,7 @@ func machoUpdateDwarfHeader(r *imacho.LoadCmdUpdater, compressedSects []*macho.S return machoUpdateSections(*r, &seg, uint64(dwarfstart)-realdwarf.Offset, compressedSects) } -func machoUpdateLoadCommand(r imacho.LoadCmdUpdater, linkseg *macho.Segment, linkoffset uint64, cmd interface{}, fields ...string) error { +func machoUpdateLoadCommand(r imacho.LoadCmdUpdater, linkseg *macho.Segment, linkoffset uint64, cmd any, fields ...string) error { if err := r.ReadAt(0, cmd); err != nil { return err } diff --git a/src/cmd/link/internal/ld/util.go b/src/cmd/link/internal/ld/util.go index 556c77d732..f3787ff50b 100644 --- a/src/cmd/link/internal/ld/util.go +++ b/src/cmd/link/internal/ld/util.go @@ -32,7 +32,7 @@ func Exit(code int) { } // Exitf logs an error message then calls Exit(2). -func Exitf(format string, a ...interface{}) { +func Exitf(format string, a ...any) { fmt.Fprintf(os.Stderr, os.Args[0]+": "+format+"\n", a...) nerrors++ if *flagH { @@ -60,7 +60,7 @@ func afterErrorAction() { // // Logging an error means that on exit cmd/link will delete any // output file and return a non-zero error code. -func Errorf(format string, args ...interface{}) { +func Errorf(format string, args ...any) { format += "\n" fmt.Fprintf(os.Stderr, format, args...) afterErrorAction() @@ -72,7 +72,7 @@ func Errorf(format string, args ...interface{}) { // // Logging an error means that on exit cmd/link will delete any // output file and return a non-zero error code. -func (ctxt *Link) Errorf(s loader.Sym, format string, args ...interface{}) { +func (ctxt *Link) Errorf(s loader.Sym, format string, args ...any) { if ctxt.loader != nil { ctxt.loader.Errorf(s, format, args...) return diff --git a/src/cmd/link/internal/ld/xcoff.go b/src/cmd/link/internal/ld/xcoff.go index fc98fcba2b..4500a7cb0c 100644 --- a/src/cmd/link/internal/ld/xcoff.go +++ b/src/cmd/link/internal/ld/xcoff.go @@ -167,8 +167,7 @@ const ( ) // Type representing all XCOFF symbols. -type xcoffSym interface { -} +type xcoffSym any // Symbol Table Entry type XcoffSymEnt64 struct { diff --git a/src/cmd/link/internal/loadelf/ldelf.go b/src/cmd/link/internal/loadelf/ldelf.go index 9434704be4..1c83f03a5d 100644 --- a/src/cmd/link/internal/loadelf/ldelf.go +++ b/src/cmd/link/internal/loadelf/ldelf.go @@ -242,7 +242,7 @@ func parseArmAttributes(e binary.ByteOrder, data []byte) (found bool, ehdrFlags // object, and the returned ehdrFlags contains what this Load function computes. // TODO: find a better place for this logic. func Load(l *loader.Loader, arch *sys.Arch, localSymVersion int, f *bio.Reader, pkg string, length int64, pn string, initEhdrFlags uint32) (textp []loader.Sym, ehdrFlags uint32, err error) { - errorf := func(str string, args ...interface{}) ([]loader.Sym, uint32, error) { + errorf := func(str string, args ...any) ([]loader.Sym, uint32, error) { return nil, 0, fmt.Errorf("loadelf: %s: %v", pn, fmt.Sprintf(str, args...)) } diff --git a/src/cmd/link/internal/loader/loader.go b/src/cmd/link/internal/loader/loader.go index a612a1ac81..2d386c0c65 100644 --- a/src/cmd/link/internal/loader/loader.go +++ b/src/cmd/link/internal/loader/loader.go @@ -2821,7 +2821,7 @@ type ErrorReporter struct { // // Logging an error means that on exit cmd/link will delete any // output file and return a non-zero error code. -func (reporter *ErrorReporter) Errorf(s Sym, format string, args ...interface{}) { +func (reporter *ErrorReporter) Errorf(s Sym, format string, args ...any) { if s != 0 && reporter.ldr.SymName(s) != "" { // Note: Replace is needed here because symbol names might have % in them, // due to the use of LinkString for names of instantiating types. @@ -2840,7 +2840,7 @@ func (l *Loader) GetErrorReporter() *ErrorReporter { } // Errorf method logs an error message. See ErrorReporter.Errorf for details. -func (l *Loader) Errorf(s Sym, format string, args ...interface{}) { +func (l *Loader) Errorf(s Sym, format string, args ...any) { l.errorReporter.Errorf(s, format, args...) } diff --git a/src/cmd/link/internal/loadmacho/ldmacho.go b/src/cmd/link/internal/loadmacho/ldmacho.go index dcb0fd92c1..ecd0150943 100644 --- a/src/cmd/link/internal/loadmacho/ldmacho.go +++ b/src/cmd/link/internal/loadmacho/ldmacho.go @@ -424,7 +424,7 @@ func macholoadsym(m *ldMachoObj, symtab *ldMachoSymtab) int { // Load the Mach-O file pn from f. // Symbols are written into syms, and a slice of the text symbols is returned. func Load(l *loader.Loader, arch *sys.Arch, localSymVersion int, f *bio.Reader, pkg string, length int64, pn string) (textp []loader.Sym, err error) { - errorf := func(str string, args ...interface{}) ([]loader.Sym, error) { + errorf := func(str string, args ...any) ([]loader.Sym, error) { return nil, fmt.Errorf("loadmacho: %v: %v", pn, fmt.Sprintf(str, args...)) } diff --git a/src/cmd/link/internal/loadxcoff/ldxcoff.go b/src/cmd/link/internal/loadxcoff/ldxcoff.go index fd116d5420..8c0949ec70 100644 --- a/src/cmd/link/internal/loadxcoff/ldxcoff.go +++ b/src/cmd/link/internal/loadxcoff/ldxcoff.go @@ -42,7 +42,7 @@ func (f *xcoffBiobuf) ReadAt(p []byte, off int64) (int, error) { // loads the Xcoff file pn from f. // Symbols are written into loader, and a slice of the text symbols is returned. func Load(l *loader.Loader, arch *sys.Arch, localSymVersion int, input *bio.Reader, pkg string, length int64, pn string) (textp []loader.Sym, err error) { - errorf := func(str string, args ...interface{}) ([]loader.Sym, error) { + errorf := func(str string, args ...any) ([]loader.Sym, error) { return nil, fmt.Errorf("loadxcoff: %v: %v", pn, fmt.Sprintf(str, args...)) } diff --git a/src/cmd/link/internal/sym/segment.go b/src/cmd/link/internal/sym/segment.go index c889e71ad6..d397b84570 100644 --- a/src/cmd/link/internal/sym/segment.go +++ b/src/cmd/link/internal/sym/segment.go @@ -52,7 +52,7 @@ type Section struct { Vaddr uint64 Length uint64 Seg *Segment - Elfsect interface{} // an *ld.ElfShdr + Elfsect any // an *ld.ElfShdr Reloff uint64 Rellen uint64 // Relcount is the number of *host* relocations applied to this section -- cgit v1.3