Fixes from Go 1.26's go fix (#1346)

* Fixes from Go 1.26's `go fix`

* Fix CI setup for Windows

Without `shell: bash`, steps that run multiple commands will only fail
if the last command has a non-zero exit code.
See actions/runner-images#6668

* Upgrade to Go 1.25

---------

Co-authored-by: marius <marius@example.com>

Author: Acconut

.github/workflows/continuous-integration.yaml

@@ -29,6 +29,7 @@ jobs:
         name: Clean module files
         run: |
           go mod tidy
+        shell: bash
 
       -
         name: Set tusd output
@@ -58,6 +59,7 @@ jobs:
         run: |
           go vet ./pkg/...
           go vet ./internal/...
+        shell: bash
 
   pages:
     runs-on: ubuntu-latest

go.mod

@@ -2,10 +2,10 @@ module github.com/tus/tusd/v2
 
 // Specify the Go version needed for the Heroku deployment
 // See https://github.com/heroku/heroku-buildpack-go#go-module-specifics
-// +heroku goVersion go1.24
-go 1.24.0
+// +heroku goVersion go1.25
+go 1.25
 
-toolchain go1.24.1
+toolchain go1.25.0
 
 require (
 	cloud.google.com/go/storage v1.59.2

pkg/filestore/filestore_test.go

@@ -202,7 +202,7 @@ func TestConcatUploads(t *testing.T) {
 		"def",
 		"ghi",
 	}
-	for i := 0; i < 3; i++ {
+	for i := range 3 {
 		upload, err := store.NewUpload(ctx, handler.FileInfo{Size: 3})
 		a.NoError(err)
 

pkg/gcsstore/gcsservice.go

@@ -145,7 +145,7 @@ func (service *GCSService) compose(ctx context.Context, bucket string, srcs []st
 	}
 	objSrcs := make([]*storage.ObjectHandle, len(srcs))
 	var crc uint32
-	for i := 0; i < len(srcs); i++ {
+	for i := range srcs {
 		objSrcs[i] = service.Client.Bucket(bucket).Object(srcs[i])
 		srcAttrs, err := service.GetObjectAttrs(ctx, GCSObjectParams{
 			Bucket: bucket,
@@ -170,7 +170,7 @@ func (service *GCSService) compose(ctx context.Context, bucket string, srcs []st
 		return err
 	}
 
-	for i := 0; i < COMPOSE_RETRIES; i++ {
+	for range COMPOSE_RETRIES {
 		dstCRC, err := service.ComposeFrom(ctx, objSrcs, dstParams, attrs.ContentType)
 		if err != nil {
 			return err
@@ -223,7 +223,7 @@ func (service *GCSService) recursiveCompose(ctx context.Context, srcs []string,
 	tmpSrcLen := int(math.Ceil(float64(len(srcs)) / float64(MAX_OBJECT_COMPOSITION)))
 	tmpSrcs := make([]string, tmpSrcLen)
 
-	for i := 0; i < tmpSrcLen; i++ {
+	for i := range tmpSrcLen {
 		start := i * MAX_OBJECT_COMPOSITION
 		end := MAX_OBJECT_COMPOSITION * (i + 1)
 		if tmpSrcLen-i == 1 {

pkg/handler/context_test.go

@@ -20,7 +20,7 @@ type contextValueMatcher struct {
 	expectedValue any
 }
 
-func (m contextValueMatcher) Matches(a interface{}) bool {
+func (m contextValueMatcher) Matches(a any) bool {
 	ctx, ok := a.(context.Context)
 	if !ok {
 		return false
@@ -41,7 +41,7 @@ type contextCancelMatcher struct {
 	maxDelay time.Duration
 }
 
-func (m contextCancelMatcher) Matches(a interface{}) bool {
+func (m contextCancelMatcher) Matches(a any) bool {
 	ctx, ok := a.(context.Context)
 	if !ok {
 		return false

pkg/handler/hooks_test.go

@@ -37,27 +37,23 @@ func TestHookEventHeaderRace(t *testing.T) {
 
 	// Goroutine 1: Simulate async hook processing (JSON encoding)
 	// This is what happens in invokeHookAsync -> json.Marshal
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		for range iterations {
 			// This iterates over the Header map
 			_, _ = json.Marshal(event.HTTPRequest)
 		}
-	}()
+	})
 
 	// Goroutine 2: Simulate concurrent request header modification
 	// This could happen if another hook event is created for the same request
 	// or if middleware modifies headers
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		for range iterations {
 			// This writes to the Header map
 			c.req.Header.Set("X-Request-ID", "some-value")
 			c.req.Header.Del("X-Request-ID")
 		}
-	}()
+	})
 
 	wg.Wait()
 }

pkg/handler/http.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"maps"
 	"net/http"
 	"strconv"
 )
@@ -67,13 +68,9 @@ func (resp1 HTTPResponse) MergeWith(resp2 HTTPResponse) HTTPResponse {
 	// into the header map from response 1.
 	newResp.Header = make(HTTPHeader, len(resp1.Header)+len(resp2.Header))
 
-	for key, value := range resp1.Header {
-		newResp.Header[key] = value
-	}
+	maps.Copy(newResp.Header, resp1.Header)
 
-	for key, value := range resp2.Header {
-		newResp.Header[key] = value
-	}
+	maps.Copy(newResp.Header, resp2.Header)
 
 	return newResp
 }

pkg/handler/metrics.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"maps"
 	"sync"
 	"sync/atomic"
 )
@@ -123,9 +124,7 @@ func (e *ErrorsTotalMap) retrievePointerFor(err Error) *uint64 {
 func (e *ErrorsTotalMap) Load() map[ErrorsTotalMapEntry]*uint64 {
 	m := make(map[ErrorsTotalMapEntry]*uint64, len(e.counter))
 	e.lock.RLock()
-	for err, ptr := range e.counter {
-		m[err] = ptr
-	}
+	maps.Copy(m, e.counter)
 	e.lock.RUnlock()
 
 	return m

pkg/handler/unrouted_handler.go

@@ -1580,7 +1580,7 @@ func getIETFDraftUploadLength(r *http.Request) (length int64, lengthIsDeferred b
 func ParseMetadataHeader(header string) map[string]string {
 	meta := make(map[string]string)
 
-	for _, element := range strings.Split(header, ",") {
+	for element := range strings.SplitSeq(header, ",") {
 		element := strings.TrimSpace(element)
 
 		parts := strings.Split(element, " ")
@@ -1646,8 +1646,8 @@ func parseConcat(header string, basePath string) (isPartial bool, isFinal bool,
 	if strings.HasPrefix(header, "final;") && len(header) > l {
 		isFinal = true
 
-		list := strings.Split(header[l:], " ")
-		for _, value := range list {
+		list := strings.SplitSeq(header[l:], " ")
+		for value := range list {
 			value := strings.TrimSpace(value)
 			if value == "" {
 				continue

pkg/handler/utils_test.go

@@ -109,7 +109,7 @@ func NewReaderMatcher(expect string) gomock.Matcher {
 	}
 }
 
-func (m readerMatcher) Matches(x interface{}) bool {
+func (m readerMatcher) Matches(x any) bool {
 	input, ok := x.(io.Reader)
 	if !ok {
 		return false