Merge pull request #371 from keystroke3/master

Migrate from deprecated `io/ioutil`

Author: nhooyr

autobahn_test.go

@@ -7,7 +7,7 @@ import (
 "context"
 "encoding/json"
 "fmt"
-"io/ioutil"
+"io"
 "net"
 "os"
 "os/exec"
@@ -202,7 +202,7 @@ func wstestCaseCount(ctx context.Context, url string) (cases int, err error) {
 if err != nil {
 return 0, err
 }
-b, err := ioutil.ReadAll(r)
+b, err := io.ReadAll(r)
 if err != nil {
 return 0, err
 }
@@ -217,7 +217,7 @@ func wstestCaseCount(ctx context.Context, url string) (cases int, err error) {
 }
 
 func checkWSTestIndex(t *testing.T, path string) {
-wstestOut, err := ioutil.ReadFile(path)
+wstestOut, err := os.ReadFile(path)
 assert.Success(t, err)
 
 var indexJSON map[string]map[string]struct {
@@ -262,7 +262,7 @@ func unusedListenAddr() (_ string, err error) {
 }
 
 func tempJSONFile(v interface{}) (string, error) {
-f, err := ioutil.TempFile("", "temp.json")
+f, err := os.CreateTemp("", "temp.json")
 if err != nil {
 return "", fmt.Errorf("temp file: %w", err)
 }

conn_test.go

@@ -8,7 +8,6 @@ import (
 "context"
 "fmt"
 "io"
-"io/ioutil"
 "net/http"
 "net/http/httptest"
 "os"
@@ -170,7 +169,7 @@ func TestConn(t *testing.T) {
 return n2.Close()
 })
 
-b, err := ioutil.ReadAll(n1)
+b, err := io.ReadAll(n1)
 assert.Success(t, err)
 
 _, err = n1.Read(nil)
@@ -198,7 +197,7 @@ func TestConn(t *testing.T) {
 return err
 })
 
-_, err := ioutil.ReadAll(n1)
+_, err := io.ReadAll(n1)
 assert.Contains(t, err, `unexpected frame type read (expected MessageBinary): MessageText`)
 
 select {

dial.go

@@ -11,7 +11,6 @@ import (
 "encoding/base64"
 "fmt"
 "io"
-"io/ioutil"
 "net/http"
 "net/url"
 "strings"
@@ -122,9 +121,9 @@ func dial(ctx context.Context, urls string, opts *DialOptions, rand io.Reader) (
 })
 defer timer.Stop()
 
-b, _ := ioutil.ReadAll(r)
+b, _ := io.ReadAll(r)
 respBody.Close()
-resp.Body = ioutil.NopCloser(bytes.NewReader(b))
+resp.Body = io.NopCloser(bytes.NewReader(b))
 }
 }()
 

dial_test.go

@@ -7,7 +7,6 @@ import (
 "context"
 "crypto/rand"
 "io"
-"io/ioutil"
 "net/http"
 "net/http/httptest"
 "strings"
@@ -76,7 +75,7 @@ func TestBadDials(t *testing.T) {
 _, _, err := Dial(ctx, "ws://example.com", &DialOptions{
 HTTPClient: mockHTTPClient(func(*http.Request) (*http.Response, error) {
 return &http.Response{
-Body: ioutil.NopCloser(strings.NewReader("hi")),
+Body: io.NopCloser(strings.NewReader("hi")),
 }, nil
 }),
 })
@@ -98,7 +97,7 @@ func TestBadDials(t *testing.T) {
 return &http.Response{
 StatusCode: http.StatusSwitchingProtocols,
 Header: h,
-Body: ioutil.NopCloser(strings.NewReader("hi")),
+Body: io.NopCloser(strings.NewReader("hi")),
 }, nil
 }
 

examples/chat/chat.go

@@ -3,7 +3,7 @@ package main
 import (
 "context"
 "errors"
-"io/ioutil"
+"io"
 "log"
 "net/http"
 "sync"
@@ -98,7 +98,7 @@ func (cs *chatServer) publishHandler(w http.ResponseWriter, r *http.Request) {
 return
 }
 body := http.MaxBytesReader(w, r.Body, 8192)
-msg, err := ioutil.ReadAll(body)
+msg, err := io.ReadAll(body)
 if err != nil {
 http.Error(w, http.StatusText(http.StatusRequestEntityTooLarge), http.StatusRequestEntityTooLarge)
 return

read.go

@@ -9,7 +9,6 @@ import (
 "errors"
 "fmt"
 "io"
-"io/ioutil"
 "strings"
 "time"
 
@@ -44,7 +43,7 @@ func (c *Conn) Read(ctx context.Context) (MessageType, []byte, error) {
 return 0, nil, err
 }
 
-b, err := ioutil.ReadAll(r)
+b, err := io.ReadAll(r)
 return typ, b, err
 }