Run make fmt

Author: nhooyr

autobahn_test.go

@@ -8,13 +8,14 @@ import (
 	"net"
 	"net/http"
 	"net/http/httptest"
-	"nhooyr.io/websocket"
 	"os"
 	"os/exec"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
+
+	"nhooyr.io/websocket"
 )
 
 func TestAutobahn(t *testing.T) {

ci/fmt.mk

@@ -22,4 +22,4 @@ prettier:
 	prettier --write --print-width=120 --no-semi --trailing-comma=all --loglevel=warn $$(git ls-files "*.yml" "*.md")
 
 gen:
-	stringer -type=Opcode,MessageType,StatusCode -output=websocket_stringer.go
+	stringer -type=opcode,MessageType,StatusCode -output=websocket_stringer.go

close.go

@@ -6,8 +6,9 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"nhooyr.io/websocket/internal/bpool"
 	"time"
+
+	"nhooyr.io/websocket/internal/bpool"
 )
 
 // StatusCode represents a WebSocket status code.

close_test.go

@@ -1,12 +1,14 @@
 package websocket
 
 import (
-	"github.com/google/go-cmp/cmp"
 	"io"
 	"math"
-	"nhooyr.io/websocket/internal/assert"
 	"strings"
 	"testing"
+
+	"github.com/google/go-cmp/cmp"
+
+	"nhooyr.io/websocket/internal/assert"
 )
 
 func TestCloseError(t *testing.T) {

conn.go

@@ -194,7 +194,7 @@ func (c *Conn) ping(ctx context.Context, p string) error {
 
 type mu struct {
 	once sync.Once
-	ch chan struct{}
+	ch   chan struct{}
 }
 
 func (m *mu) init() {

conn_test.go

@@ -8,13 +8,13 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
-	"nhooyr.io/websocket/internal/assert"
 	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
 
 	"nhooyr.io/websocket"
+	"nhooyr.io/websocket/internal/assert"
 )
 
 func TestConn(t *testing.T) {
@@ -51,7 +51,6 @@ func TestConn(t *testing.T) {
 	})
 }
 
-
 func testServer(tb testing.TB, fn func(w http.ResponseWriter, r *http.Request), tls bool) (s *httptest.Server, closeFn func()) {
 	h := http.HandlerFunc(fn)
 	if tls {

frame.go

@@ -5,6 +5,8 @@ import (
 	"encoding/binary"
 	"math"
 	"math/bits"
+
+	"nhooyr.io/websocket/internal/errd"
 )
 
 // opcode represents a WebSocket opcode.

frame_test.go

@@ -7,15 +7,16 @@ import (
 	"bytes"
 	"encoding/binary"
 	"math/bits"
-	"nhooyr.io/websocket/internal/assert"
+	"math/rand"
 	"strconv"
 	"testing"
 	"time"
 	_ "unsafe"
 
 	"github.com/gobwas/ws"
 	_ "github.com/gorilla/websocket"
-	"math/rand"
+
+	"nhooyr.io/websocket/internal/assert"
 )
 
 func init() {

internal/assert/cmp.go

@@ -1,8 +1,9 @@
 package assert
 
 import (
-	"github.com/google/go-cmp/cmp"
 	"reflect"
+
+	"github.com/google/go-cmp/cmp"
 )
 
 // https://github.com/google/go-cmp/issues/40#issuecomment-328615283

internal/errd/wrap.go

@@ -9,6 +9,6 @@ import (
 // Inspired by https://github.com/golang/go/issues/32676.
 func Wrap(err *error, f string, v ...interface{}) {
 	if *err != nil {
-		*err = fmt.Errorf(f+ ": %w", append(v, *err)...)
+		*err = fmt.Errorf(f+": %w", append(v, *err)...)
 	}
 }