Bump minimum Go and use new features (#1017)

Go 1.21 brings us the builtin min func and slices.Contains.

Go 1.22 brings us range over int and fixed for loop scoping.

We were also able to drop the build tags from the path value code and
inline the three-line function directly. This should still work on
tinygo as they claim to support Go 1.24.

Author: JRaspass

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.20.x, 1.21.x, 1.22.x, 1.23.x, 1.24.x]
+        go-version: [1.22.x, 1.23.x, 1.24.x, 1.25.x]
         os: [ubuntu-latest, windows-latest]
 
     runs-on: ${{ matrix.os }}

go.mod

@@ -2,4 +2,4 @@ module github.com/go-chi/chi/v5
 
 // Chi supports the four most recent major versions of Go.
 // See https://github.com/go-chi/chi/issues/963.
-go 1.20
+go 1.22

middleware/compress_test.go

@@ -96,7 +96,6 @@ func TestCompressor(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			resp, respString := testRequestWithAcceptedEncodings(t, ts, "GET", tc.path, tc.acceptedEncodings...)
 			if respString != "textstring" {

middleware/content_charset.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"net/http"
+	"slices"
 	"strings"
 )
 
@@ -29,13 +30,7 @@ func contentEncoding(ce string, charsets ...string) bool {
 	_, ce = split(strings.ToLower(ce), ";")
 	_, ce = split(ce, "charset=")
 	ce, _ = split(ce, ";")
-	for _, c := range charsets {
-		if ce == c {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(charsets, ce)
 }
 
 // Split a string in two parts, cleaning any whitespace.

middleware/throttle_test.go

@@ -37,7 +37,7 @@ func TestThrottleBacklog(t *testing.T) {
 	// The throttler processes 10 consecutive requests, each one of those
 	// requests lasts 1s. The maximum number of requests this can possible serve
 	// before the clients time out (5s) is 40.
-	for i := 0; i < 40; i++ {
+	for i := range 40 {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
@@ -75,7 +75,7 @@ func TestThrottleClientTimeout(t *testing.T) {
 
 	var wg sync.WaitGroup
 
-	for i := 0; i < 10; i++ {
+	for i := range 10 {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
@@ -108,7 +108,7 @@ func TestThrottleTriggerGatewayTimeout(t *testing.T) {
 	var wg sync.WaitGroup
 
 	// These requests will be processed normally until they finish.
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
@@ -123,7 +123,7 @@ func TestThrottleTriggerGatewayTimeout(t *testing.T) {
 
 	// These requests will wait for the first batch to complete but it will take
 	// too much time, so they will eventually receive a timeout error.
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
@@ -161,7 +161,7 @@ func TestThrottleMaximum(t *testing.T) {
 
 	var wg sync.WaitGroup
 
-	for i := 0; i < 20; i++ {
+	for i := range 20 {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
@@ -181,7 +181,7 @@ func TestThrottleMaximum(t *testing.T) {
 
 	// At this point the server is still processing, all the following request
 	// will be beyond the server capacity.
-	for i := 0; i < 20; i++ {
+	for i := range 20 {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
@@ -283,7 +283,7 @@ func TestThrottleCustomStatusCode(t *testing.T) {
 	codes := make(chan int, totalRequestCount)
 	errs := make(chan error, totalRequestCount)
 	client := &http.Client{Timeout: timeout}
-	for i := 0; i < totalRequestCount; i++ {
+	for range totalRequestCount {
 		go func() {
 			resp, err := client.Get(server.URL)
 			if err != nil {
@@ -305,7 +305,7 @@ func TestThrottleCustomStatusCode(t *testing.T) {
 		}
 	}
 
-	for i := 0; i < totalRequestCount-1; i++ {
+	for range totalRequestCount - 1 {
 		waitResponse(http.StatusServiceUnavailable)
 	}
 	close(wait) // Allow the last request to proceed.

mux.go

@@ -467,8 +467,10 @@ func (mx *Mux) routeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	// Find the route
 	if _, _, h := mx.tree.FindRoute(rctx, method, routePath); h != nil {
-		if supportsPathValue {
-			setPathValue(rctx, r)
+		// Set http.Request path values from our request context
+		for i, key := range rctx.URLParams.Keys {
+			value := rctx.URLParams.Values[i]
+			r.SetPathValue(key, value)
 		}
 		if supportsPattern {
 			setPattern(rctx, r)

mux_test.go

@@ -1693,11 +1693,11 @@ func TestMuxContextIsThreadSafe(t *testing.T) {
 
 	wg := sync.WaitGroup{}
 
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			for j := 0; j < 10000; j++ {
+			for range 10000 {
 				w := httptest.NewRecorder()
 				r, err := http.NewRequest("GET", "/ok", nil)
 				if err != nil {

path_value.go

@@ -1,6 +1,3 @@
-//go:build go1.22 && !tinygo
-// +build go1.22,!tinygo
-
 package chi
 
 import (