run "go fix" from go-1.26

Author: dropwhile

pkg/camo/encoding/url.go

@@ -44,7 +44,7 @@ func b64encode(data []byte) string {
 
 func b64decode(str string) ([]byte, error) {
 	padChars := (4 - (len(str) % 4)) % 4
-	for i := 0; i < padChars; i++ {
+	for range padChars {
 		str = str + "="
 	}
 	decBytes, ok := base64.URLEncoding.DecodeString(str)

pkg/camo/helpers_test.go

@@ -14,9 +14,9 @@ import (
 	"reflect"
 	"testing"
 
+	"codeberg.org/dropwhile/assert"
 	"github.com/cactus/go-camo/v2/pkg/camo/encoding"
 	"github.com/cactus/go-camo/v2/pkg/router"
-	"codeberg.org/dropwhile/assert"
 )
 
 func makeReq(config Config, testURL string) (*http.Request, error) {
@@ -119,7 +119,7 @@ func (r *Tuple[A, B]) UnmarshalJSON(p []byte) error {
 		return err
 	}
 
-	if reflect.TypeOf(&r.b) == reflect.TypeFor[*B]() {
+	if reflect.TypeFor[*B]() == reflect.TypeFor[*B]() {
 		var s string
 		if err := json.Unmarshal(tmp[1], &s); err != nil {
 			return err

pkg/camo/proxy_filter_test.go

@@ -67,7 +67,7 @@ func TestFilterListMatrixMultiples(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			filters = append(
 				filters, func(x int) FilterFunc {
 					return func(*url.URL) (bool, error) {

pkg/camo/upstream_proxy.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"net"
 	"net/url"
+	"slices"
 
 	"golang.org/x/net/http/httpproxy"
 )
@@ -34,12 +35,7 @@ func (ic *innerUpstreamProxyConfig) matchesIP(ip net.IP, port string) bool {
 		return false
 	}
 
-	for i := range ic.addresses {
-		if ip.Equal(ic.addresses[i]) {
-			return true
-		}
-	}
-	return false
+	return slices.ContainsFunc(ic.addresses, ip.Equal)
 }
 
 func (ic *innerUpstreamProxyConfig) matchesHost(host string, port string) bool {

pkg/htrie/glob_path_chk_test.go

@@ -157,7 +157,7 @@ func BenchmarkGlobPathChecker(b *testing.B) {
 	for _, u := range testMatch {
 		u, _ := url.Parse(u)
 		z := u.EscapedPath()
-		for i := 0; i < testIters; i++ {
+		for range testIters {
 			x = gpc.CheckPath(z)
 		}
 	}

pkg/htrie/glob_path_node.go

@@ -71,7 +71,7 @@ func (gpn *globPathNode) addPath(s string) error {
 	curnode := gpn
 	prevnode := curnode
 	mlen := len(s)
-	for i := 0; i < mlen; i++ {
+	for i := range mlen {
 		part := uint32(s[i])
 
 		// if icase, use lowercase letters for comparisons

pkg/htrie/htrie.go

@@ -52,7 +52,7 @@ func putURLMatcherSlice(s *[]*URLMatcher) {
 
 func reverse(s []string) []string {
 	c := len(s) / 2
-	for i := 0; i < c; i++ {
+	for i := range c {
 		j := len(s) - i - 1
 		s[i], s[j] = s[j], s[i]
 	}

pkg/htrie/htrie_test.go

@@ -212,7 +212,7 @@ func BenchmarkHTrieMatch(b *testing.B) {
 	b.ResetTimer()
 
 	for _, u := range parsed {
-		for i := 0; i < testIters; i++ {
+		for range testIters {
 			x, _ = dt.CheckURL(u)
 		}
 	}
@@ -249,7 +249,7 @@ func BenchmarkRegexMatch(b *testing.B) {
 	b.ResetTimer()
 
 	for _, u := range testUrls {
-		for i := 0; i < testIters; i++ {
+		for range testIters {
 			// walk regexes in order. first match wins
 			for _, rx := range rexes {
 				if rx.MatchString(u) {
@@ -292,15 +292,15 @@ func BenchmarkHTrieMatchHostname(b *testing.B) {
 
 	b.Run("CheckHostname", func(b *testing.B) {
 		for _, u := range parsed {
-			for i := 0; i < testIters; i++ {
+			for range testIters {
 				x, _ = dt.CheckHostname(u)
 			}
 		}
 	})
 
 	b.Run("CheckCleanHostname", func(b *testing.B) {
 		for _, u := range parsed {
-			for i := 0; i < testIters; i++ {
+			for range testIters {
 				x = dt.CheckCleanHostname(u)
 			}
 		}