Use any instead of interface{} given Go > 1.18

Author: Jacalz

README.md

@@ -68,7 +68,7 @@ http.HandlerFunc(func (w http.ResponseWriter, r *http.Request) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 
-	var v interface{}
+	var v any
 	err = wsjson.Read(ctx, c, &v)
 	if err != nil {
 		// ...

autobahn_test.go

@@ -130,7 +130,7 @@ func wstestServer(tb testing.TB, ctx context.Context) (url string, closeFn func(
 	url = "ws://" + serverAddr
 	const outDir = "ci/out/autobahn-report"
 
-	specFile, err := tempJSONFile(map[string]interface{}{
+	specFile, err := tempJSONFile(map[string]any{
 		"url":           url,
 		"outdir":        outDir,
 		"cases":         autobahnCases,
@@ -280,7 +280,7 @@ func unusedListenAddr() (_ string, err error) {
 	return l.Addr().String(), nil
 }
 
-func tempJSONFile(v interface{}) (string, error) {
+func tempJSONFile(v any) (string, error) {
 	f, err := os.CreateTemp("", "temp.json")
 	if err != nil {
 		return "", fmt.Errorf("temp file: %w", err)

conn_test.go

@@ -341,7 +341,7 @@ func TestConn(t *testing.T) {
 			return wsjson.Write(tt.ctx, c1, exp)
 		})
 
-		var act interface{}
+		var act any
 		err := wsjson.Read(tt.ctx, c1, &act)
 		assert.Success(t, err)
 		assert.Equal(t, "read msg", exp, act)
@@ -372,7 +372,7 @@ func TestConn(t *testing.T) {
 			return wsjson.Write(tt.ctx, c1, exp)
 		})
 
-		var act interface{}
+		var act any
 		err := wsjson.Read(tt.ctx, c1, &act)
 		assert.Success(t, err)
 		assert.Equal(t, "read msg", exp, act)
@@ -660,7 +660,7 @@ func assertEcho(tb testing.TB, ctx context.Context, c *websocket.Conn) {
 		return wsjson.Write(ctx, c, exp)
 	})
 
-	var act interface{}
+	var act any
 	c.SetReadLimit(1 << 30)
 	err := wsjson.Read(ctx, c, &act)
 	assert.Success(tb, err)

example_test.go

@@ -25,7 +25,7 @@ func ExampleAccept() {
 		ctx, cancel := context.WithTimeout(r.Context(), time.Second*10)
 		defer cancel()
 
-		var v interface{}
+		var v any
 		err = wsjson.Read(ctx, c, &v)
 		if err != nil {
 			log.Println(err)

internal/errd/wrap.go

@@ -7,7 +7,7 @@ import (
 // Wrap wraps err with fmt.Errorf if err is non nil.
 // Intended for use with defer and a named error return.
 // Inspired by https://github.com/golang/go/issues/32676.
-func Wrap(err *error, f string, v ...interface{}) {
+func Wrap(err *error, f string, v ...any) {
 	if *err != nil {
 		*err = fmt.Errorf(f+": %w", append(v, *err)...)
 	}

internal/examples/chat/chat.go

@@ -31,7 +31,7 @@ type chatServer struct {
 
 	// logf controls where logs are sent.
 	// Defaults to log.Printf.
-	logf func(f string, v ...interface{})
+	logf func(f string, v ...any)
 
 	// serveMux routes the various endpoints to the appropriate handler.
 	serveMux http.ServeMux

internal/examples/echo/server.go

@@ -17,7 +17,7 @@ import (
 // only allows one message every 100ms with a 10 message burst.
 type echoServer struct {
 	// logf controls where logs are sent.
-	logf func(f string, v ...interface{})
+	logf func(f string, v ...any)
 }
 
 func (s echoServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {

internal/test/assert/assert.go

@@ -9,7 +9,7 @@ import (
 )
 
 // Equal asserts exp == act.
-func Equal(t testing.TB, name string, exp, got interface{}) {
+func Equal(t testing.TB, name string, exp, got any) {
 	t.Helper()
 
 	if !reflect.DeepEqual(exp, got) {
@@ -36,7 +36,7 @@ func Error(t testing.TB, err error) {
 }
 
 // Contains asserts the fmt.Sprint(v) contains sub.
-func Contains(t testing.TB, v interface{}, sub string) {
+func Contains(t testing.TB, v any, sub string) {
 	t.Helper()
 
 	s := fmt.Sprint(v)

internal/thirdparty/gin_test.go

@@ -42,7 +42,7 @@ func TestGin(t *testing.T) {
 	err = wsjson.Write(ctx, c, "hello")
 	assert.Success(t, err)
 
-	var v interface{}
+	var v any
 	err = wsjson.Read(ctx, c, &v)
 	assert.Success(t, err)
 	assert.Equal(t, "read msg", "hello", v)

internal/wsjs/wsjs_js.go

@@ -33,7 +33,7 @@ func New(url string, protocols []string) (c WebSocket, err error) {
 		c = WebSocket{}
 	})
 
-	jsProtocols := make([]interface{}, len(protocols))
+	jsProtocols := make([]any, len(protocols))
 	for i, p := range protocols {
 		jsProtocols[i] = p
 	}
@@ -57,7 +57,7 @@ func (c WebSocket) setBinaryType(typ string) {
 }
 
 func (c WebSocket) addEventListener(eventType string, fn func(e js.Value)) func() {
-	f := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
+	f := js.FuncOf(func(this js.Value, args []js.Value) any {
 		fn(args[0])
 		return nil
 	})
@@ -97,7 +97,7 @@ func (c WebSocket) OnError(fn func(e js.Value)) (remove func()) {
 // MessageEvent is the type passed to a message handler.
 type MessageEvent struct {
 	// string or []byte.
-	Data interface{}
+	Data any
 
 	// There are more fields to the interface but we don't use them.
 	// See https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent
@@ -106,7 +106,7 @@ type MessageEvent struct {
 // OnMessage registers a function to be called when the WebSocket receives a message.
 func (c WebSocket) OnMessage(fn func(m MessageEvent)) (remove func()) {
 	return c.addEventListener("message", func(e js.Value) {
-		var data interface{}
+		var data any
 
 		arrayBuffer := e.Get("data")
 		if arrayBuffer.Type() == js.TypeString {