update linters for go1.25 base version

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

util/confutil/config_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package confutil
 

util/confutil/config_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package confutil
 

util/dockerutil/dockerconfig/configprovider.go

@@ -133,9 +133,9 @@ func parseConfigKey(key string) alternativeConfig {
 	var out alternativeConfig
 
 	var mainPart, scopePart string
-	if i := strings.IndexByte(key, '@'); i >= 0 {
-		mainPart = key[:i]
-		scopePart = key[i+1:]
+	if before, after, ok := strings.Cut(key, "@"); ok {
+		mainPart = before
+		scopePart = after
 	} else {
 		mainPart = key
 	}
@@ -153,14 +153,14 @@ func parseConfigKey(key string) alternativeConfig {
 		return out
 	}
 
-	slash := strings.IndexByte(mainPart, '/')
-	if slash < 0 {
+	before, after, ok := strings.Cut(mainPart, "/")
+	if !ok {
 		out.host = mainPart
 		return out
 	}
 
-	out.host = mainPart[:slash]
-	out.repo = mainPart[slash+1:]
+	out.host = before
+	out.repo = after
 
 	return out
 }

util/gitutil/gittestutil/testutilserve.go

@@ -66,7 +66,8 @@ func GitServeHTTP(c *gitutil.Git, t testing.TB, opts ...GitServeOpt) (url string
 		}
 
 		mux.Handle(prefix, handler(http.StripPrefix(prefix, http.FileServer(http.Dir(dir)))))
-		l, err := net.Listen("tcp", "localhost:0")
+		lc := net.ListenConfig{}
+		l, err := lc.Listen(ctx, "tcp", "localhost:0")
 		if err != nil {
 			panic(err)
 		}

util/gitutil/path.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package gitutil
 

util/gitutil/path_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package gitutil
 

util/ioset/mux.go

@@ -36,10 +36,7 @@ func NewMuxIO(in In, outs []MuxOut, initIdx int, toggleMessage func(prev int, re
 	var wg sync.WaitGroup
 	var mu sync.Mutex
 	for i, o := range outs {
-		i, o := i, o
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			if err := copyToFunc(o.Stdout, func() (io.Writer, error) {
 				if m.cur == i {
 					return in.Stdout, nil
@@ -51,10 +48,8 @@ func NewMuxIO(in In, outs []MuxOut, initIdx int, toggleMessage func(prev int, re
 			if err := o.Stdout.Close(); err != nil {
 				logrus.WithField("output index", i).WithError(err).Warnf("failed to close stdout")
 			}
-		}()
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		})
+		wg.Go(func() {
 			if err := copyToFunc(o.Stderr, func() (io.Writer, error) {
 				if m.cur == i {
 					return in.Stderr, nil
@@ -66,7 +61,7 @@ func NewMuxIO(in In, outs []MuxOut, initIdx int, toggleMessage func(prev int, re
 			if err := o.Stderr.Close(); err != nil {
 				logrus.WithField("output index", i).WithError(err).Warnf("failed to close stderr")
 			}
-		}()
+		})
 	}
 	go func() {
 		errToggle := errors.Errorf("toggle IO")

util/ioset/mux_test.go

@@ -303,11 +303,11 @@ func writeMasked(w io.Writer, s string) io.Writer {
 				pr.CloseWithError(readErr)
 				return
 			}
-			var masked string
+			var masked strings.Builder
 			for range n {
-				masked += s
+				masked.WriteString(s)
 			}
-			if _, err := w.Write([]byte(masked)); err != nil {
+			if _, err := w.Write([]byte(masked.String())); err != nil {
 				pr.CloseWithError(err)
 				return
 			}

util/osutil/path_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package osutil