Apply a few modernisations suggested by gopls check

Author: Jacalz

compress_test.go

@@ -18,7 +18,7 @@ func Test_slidingWindow(t *testing.T) {
 
 	const testCount = 99
 	const maxWindow = 99999
-	for i := 0; i < testCount; i++ {
+	for range testCount {
 		t.Run("", func(t *testing.T) {
 			t.Parallel()
 

conn_test.go

@@ -36,7 +36,7 @@ func TestConn(t *testing.T) {
 			return websocket.CompressionMode(xrand.Int(int(websocket.CompressionContextTakeover) + 1))
 		}
 
-		for i := 0; i < 5; i++ {
+		for range 5 {
 			t.Run("", func(t *testing.T) {
 				tt, c1, c2 := newConnTest(t, &websocket.DialOptions{
 					CompressionMode:      compressionMode(),
@@ -50,7 +50,7 @@ func TestConn(t *testing.T) {
 
 				c1.SetReadLimit(131072)
 
-				for i := 0; i < 5; i++ {
+				for range 5 {
 					err := wstest.Echo(tt.ctx, c1, 131072)
 					assert.Success(t, err)
 				}
@@ -76,7 +76,7 @@ func TestConn(t *testing.T) {
 		c1.CloseRead(tt.ctx)
 		c2.CloseRead(tt.ctx)
 
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			err := c1.Ping(tt.ctx)
 			assert.Success(t, err)
 		}
@@ -185,7 +185,7 @@ func TestConn(t *testing.T) {
 		const count = 100
 		errs := make(chan error, count)
 
-		for i := 0; i < count; i++ {
+		for range count {
 			go func() {
 				select {
 				case errs <- c1.Write(tt.ctx, websocket.MessageBinary, msg):
@@ -195,7 +195,7 @@ func TestConn(t *testing.T) {
 			}()
 		}
 
-		for i := 0; i < count; i++ {
+		for range count {
 			select {
 			case err := <-errs:
 				assert.Success(t, err)
@@ -408,7 +408,7 @@ func TestConn(t *testing.T) {
 
 		c1.SetReadLimit(131072)
 
-		for i := 0; i < 5; i++ {
+		for range 5 {
 			err := wstest.Echo(tt.ctx, c1, 131072)
 			assert.Success(t, err)
 		}
@@ -682,7 +682,7 @@ func assertClose(tb testing.TB, c *websocket.Conn) {
 
 func TestConcurrentClosePing(t *testing.T) {
 	t.Parallel()
-	for i := 0; i < 64; i++ {
+	for range 64 {
 		func() {
 			c1, c2 := wstest.Pipe(nil, nil)
 			defer c1.CloseNow()

dial_test.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"crypto/rand"
 	"io"
+	"maps"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -355,11 +356,10 @@ func (fc *forwardProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 	defer resp.Body.Close()
 
-	for k, v := range resp.Header {
-		w.Header()[k] = v
-	}
+	maps.Copy(w.Header(), resp.Header)
 	w.Header().Set("PROXIED", "true")
 	w.WriteHeader(resp.StatusCode)
+
 	if resprw, ok := resp.Body.(io.ReadWriter); ok {
 		c, brw, err := w.(http.Hijacker).Hijack()
 		if err != nil {

example_test.go

@@ -150,7 +150,7 @@ func ExampleConn_Ping() {
 	// Required to read the Pongs from the server.
 	ctx = c.CloseRead(ctx)
 
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		err = c.Ping(ctx)
 		if err != nil {
 			log.Fatal(err)

frame_test.go

@@ -53,7 +53,7 @@ func TestHeader(t *testing.T) {
 			return r.Intn(2) == 0
 		}
 
-		for i := 0; i < 10000; i++ {
+		for range 10000 {
 			h := header{
 				fin:    randBool(),
 				rsv1:   randBool(),

mask_test.go

@@ -40,7 +40,7 @@ func TestMask(t *testing.T) {
 func testMask(t *testing.T, name string, fn func(b []byte, key uint32) uint32) {
 	t.Run(name, func(t *testing.T) {
 		t.Parallel()
-		for i := 0; i < 9999; i++ {
+		for range 9999 {
 			keyb := make([]byte, 4)
 			_, err := rand.Read(keyb)
 			assert.Success(t, err)

write.go

@@ -350,10 +350,7 @@ func (c *Conn) writeFramePayload(p []byte) (n int, err error) {
 		// Start of next write in the buffer.
 		i := c.bw.Buffered()
 
-		j := len(p)
-		if j > c.bw.Available() {
-			j = c.bw.Available()
-		}
+		j := min(len(p), c.bw.Available())
 
 		_, err := c.bw.Write(p[:j])
 		if err != nil {

ws_js_test.go

@@ -28,7 +28,7 @@ func TestWasm(t *testing.T) {
 	assert.Equal(t, "response code", http.StatusSwitchingProtocols, resp.StatusCode)
 
 	c.SetReadLimit(65536)
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		err = wstest.Echo(ctx, c, 65536)
 		assert.Success(t, err)
 	}