Go modernize + upgrade Go

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x, 1.23.x, 1.24.x]
+        go-version: [1.23.x, 1.24.x, 1.25.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10

.github/workflows/validate.yml

@@ -21,7 +21,7 @@ jobs:
   linters:
     strategy:
       matrix:
-        go-version: [1.24.x]
+        go-version: [1.25.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
@@ -35,5 +35,5 @@ jobs:
       - name: lint
         uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.1.6
+          version: v2.5.0
           args: --print-resources-usage --timeout=10m --verbose

Makefile

@@ -55,8 +55,8 @@ ci: prepare
 	if [ `arch` == 'x86_64' ]; then \
 		sudo apt-get -y -q update; \
 		sudo apt-get -y -q install build-essential; \
-		wget -q https://github.com/tinygo-org/tinygo/releases/download/v0.38.0/tinygo_0.38.0_amd64.deb; \
-		sudo dpkg -i tinygo_0.38.0_amd64.deb; \
+		wget -q https://github.com/tinygo-org/tinygo/releases/download/v0.39.0/tinygo_0.39.0_amd64.deb; \
+		sudo dpkg -i tinygo_0.39.0_amd64.deb; \
 		export PATH=$$PATH:/usr/local/tinygo/bin; \
 	fi
 	go test -v ./... ./_generated

gen/elem.go

@@ -2,6 +2,7 @@ package gen
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 )
 
@@ -601,12 +602,7 @@ func (sf *StructField) HasTagPart(pname string) bool {
 	if len(sf.FieldTagParts) < 2 {
 		return false
 	}
-	for _, p := range sf.FieldTagParts[1:] {
-		if p == pname {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(sf.FieldTagParts[1:], pname)
 }
 
 type ShimMode int

gen/encode.go

@@ -27,7 +27,7 @@ func (e *encodeGen) Apply(dirs []string) error {
 	return nil
 }
 
-func (e *encodeGen) writeAndCheck(typ string, argfmt string, arg interface{}) {
+func (e *encodeGen) writeAndCheck(typ string, argfmt string, arg any) {
 	if e.ctx.compFloats && typ == "Float64" {
 		typ = "Float"
 	}

gen/marshal.go

@@ -62,7 +62,7 @@ func (m *marshalGen) Execute(p Elem, ctx Context) error {
 	return m.p.err
 }
 
-func (m *marshalGen) rawAppend(typ string, argfmt string, arg interface{}) {
+func (m *marshalGen) rawAppend(typ string, argfmt string, arg any) {
 	if m.ctx.compFloats && typ == "Float64" {
 		typ = "Float"
 	}

gen/spec.go

@@ -462,7 +462,7 @@ func (p *printer) comment(s string) {
 	p.print("\n// " + s)
 }
 
-func (p *printer) printf(format string, args ...interface{}) {
+func (p *printer) printf(format string, args ...any) {
 	if p.err == nil {
 		_, p.err = fmt.Fprintf(p.w, format, args...)
 	}

go.mod

@@ -1,6 +1,6 @@
 module github.com/tinylib/msgp
 
-go 1.22
+go 1.23
 
 require (
 	github.com/philhofer/fwd v1.2.0

issue185_test.go

@@ -133,7 +133,7 @@ func TestIssue185Overlap(t *testing.T) {
 	}
 }
 
-func loadVars(t *testing.T, tpl *template.Template, tplData interface{}) (vars extractedVars, err error) {
+func loadVars(t *testing.T, tpl *template.Template, tplData any) (vars extractedVars, err error) {
 	tempDir := t.TempDir()
 
 	if !debugTemp {
@@ -218,7 +218,7 @@ func extractVars(file string) (extractedVars, error) {
 	return vars, nil
 }
 
-func goGenerateTpl(cwd, tfile string, tpl *template.Template, tplData interface{}) error {
+func goGenerateTpl(cwd, tfile string, tpl *template.Template, tplData any) error {
 	outf, err := os.OpenFile(tfile, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o600)
 	if err != nil {
 		return err

main.go

@@ -44,7 +44,7 @@ var (
 	directives = stringArrFlags{}
 )
 
-func diagf(f string, args ...interface{}) {
+func diagf(f string, args ...any) {
 	if !*verbose {
 		return
 	}

msgp/edit.go

@@ -58,7 +58,7 @@ func HasKey(key string, raw []byte) bool {
 		return false
 	}
 	var field []byte
-	for i := uint32(0); i < sz; i++ {
+	for range sz {
 		field, bts, err = ReadStringZC(bts)
 		if err != nil {
 			return false

msgp/edit_test.go

@@ -113,7 +113,7 @@ func TestReplace(t *testing.T) {
 		t.Fatal("field not found")
 	}
 	var err error
-	m := make(map[string]interface{})
+	m := make(map[string]any)
 	m, _, err = ReadMapStrIntfBytes(raw, m)
 	if err != nil {
 		t.Logf("%q", raw)

msgp/elsize_default.go

@@ -10,7 +10,7 @@ package msgp
 var sizes [256]bytespec
 
 func init() {
-	for i := 0; i < 256; i++ {
+	for i := range 256 {
 		sizes[i] = calcBytespec(byte(i))
 	}
 }

msgp/elsize_test.go

@@ -49,7 +49,7 @@ func TestBytespec(t *testing.T) {
 	// set up fixed fields
 
 	// fixint
-	for i := mfixint; i < 0x80; i++ {
+	for i := range uint8(0x80) {
 		sizes[i] = bytespec{size: 1, extra: constsize, typ: IntType}
 	}
 
@@ -75,7 +75,7 @@ func TestBytespec(t *testing.T) {
 	}
 
 	// compare all values to calcBytespec
-	for i := 0; i < 256; i++ {
+	for i := range 256 {
 		sizeb := sizes[byte(i)]
 		cb := calcBytespec(byte(i))
 		if sizeb != cb {

msgp/errors.go

@@ -77,7 +77,7 @@ func Resumable(e error) bool {
 //
 // ErrShortBytes is not wrapped with any context due to backward compatibility
 // issues with the public API.
-func WrapError(err error, ctx ...interface{}) error {
+func WrapError(err error, ctx ...any) error {
 	switch e := err.(type) {
 	case errShort:
 		return e

msgp/errors_default.go

@@ -9,7 +9,7 @@ import (
 )
 
 // ctxString converts the incoming interface{} slice into a single string.
-func ctxString(ctx []interface{}) string {
+func ctxString(ctx []any) string {
 	out := ""
 	for idx, cv := range ctx {
 		if idx > 0 {

msgp/errors_test.go

@@ -169,7 +169,6 @@ func TestSimpleQuoteStr(t *testing.T) {
 	}
 
 	for i, tc := range tcaseList {
-		tc := tc
 		t.Run(fmt.Sprint(i), func(t *testing.T) {
 			out := simpleQuoteStr(tc.in)
 			if out != tc.out {

msgp/extension_test.go

@@ -21,7 +21,7 @@ func TestReadWriteExtension(t *testing.T) {
 	dc := NewReader(&buf)
 
 	t.Run("interface", func(t *testing.T) {
-		for i := 0; i < 25; i++ {
+		for range 25 {
 			buf.Reset()
 			e := randomExt()
 			en.WriteExtension(&e)
@@ -34,7 +34,7 @@ func TestReadWriteExtension(t *testing.T) {
 	})
 
 	t.Run("raw", func(t *testing.T) {
-		for i := 0; i < 25; i++ {
+		for range 25 {
 			buf.Reset()
 			e := randomExt()
 			en.WriteExtensionRaw(e.Type, e.Data)
@@ -119,7 +119,7 @@ func TestExtensionRawStackBuffer(t *testing.T) {
 func TestReadWriteExtensionBytes(t *testing.T) {
 	var bts []byte
 
-	for i := 0; i < 24; i++ {
+	for range 24 {
 		e := randomExt()
 		bts, _ = AppendExtension(bts[0:0], &e)
 		_, err := ReadExtensionBytes(bts, &e)
@@ -134,7 +134,7 @@ func TestAppendAndWriteCompatibility(t *testing.T) {
 	var buf bytes.Buffer
 	en := NewWriter(&buf)
 
-	for i := 0; i < 24; i++ {
+	for range 24 {
 		buf.Reset()
 		e := randomExt()
 		bts, _ = AppendExtension(bts[0:0], &e)

msgp/fuzz_test.go

@@ -91,7 +91,7 @@ func FuzzReader(f *testing.F) {
 		runtime.GC()
 		r.ReadMapKeyPtr()
 		reset()
-		r.ReadMapStrIntf(map[string]interface{}{})
+		r.ReadMapStrIntf(map[string]any{})
 		reset()
 		r.ReadNil()
 		reset()
@@ -156,7 +156,7 @@ func FuzzReadBytes(f *testing.F) {
 		ReadJSONNumberBytes(data)
 		ReadMapHeaderBytes(data)
 		ReadMapKeyZC(data)
-		ReadMapStrIntfBytes(data, map[string]interface{}{})
+		ReadMapStrIntfBytes(data, map[string]any{})
 		ReadNilBytes(data)
 		ReadStringBytes(data)
 		ReadStringAsBytes(data, tmp5[:])

msgp/iter.go

@@ -1,5 +1,3 @@
-//go:build go1.23
-
 package msgp
 
 import (