Remove accidental x/net/websocket import

nhooyr · nhooyr · commit 9a0d2410f499 · 2019-04-10T09:54:01.000-05:00
diff --git a/json.go b/json.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 
-	"golang.org/x/net/websocket"
 	"golang.org/x/xerrors"
 )
 
@@ -15,7 +14,7 @@ func ReadJSON(ctx context.Context, c *Conn, v interface{}) error {
 		return xerrors.Errorf("failed to read json: %w", err)
 	}
 
-	if typ != websocket.TextFrame {
+	if typ != Text {
 		return xerrors.Errorf("unexpected frame type for json (expected TextFrame): %v", typ)
 	}
 
@@ -32,7 +31,7 @@ func ReadJSON(ctx context.Context, c *Conn, v interface{}) error {
 
 // WriteJSON writes the json message v into c.
 func WriteJSON(ctx context.Context, c *Conn, v interface{}) error {
-	w := c.MessageWriter(websocket.TextFrame)
+	w := c.MessageWriter(Text)
 	w.SetContext(ctx)
 
 	e := json.NewEncoder(w)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"encoding/json"`
`6`	`6`
`7`		`- "golang.org/x/net/websocket"`
`8`	`7`	`"golang.org/x/xerrors"`
`9`	`8`	`)`
`10`	`9`
`@@ -15,7 +14,7 @@ func ReadJSON(ctx context.Context, c *Conn, v interface{}) error {`
`15`	`14`	`return xerrors.Errorf("failed to read json: %w", err)`
`16`	`15`	`}`
`17`	`16`
`18`		`- if typ != websocket.TextFrame {`
	`17`	`+ if typ != Text {`
`19`	`18`	`return xerrors.Errorf("unexpected frame type for json (expected TextFrame): %v", typ)`
`20`	`19`	`}`
`21`	`20`
`@@ -32,7 +31,7 @@ func ReadJSON(ctx context.Context, c *Conn, v interface{}) error {`
`32`	`31`
`33`	`32`	`// WriteJSON writes the json message v into c.`
`34`	`33`	`func WriteJSON(ctx context.Context, c *Conn, v interface{}) error {`
`35`		`- w := c.MessageWriter(websocket.TextFrame)`
	`34`	`+ w := c.MessageWriter(Text)`
`36`	`35`	`w.SetContext(ctx)`
`37`	`36`
`38`	`37`	`e := json.NewEncoder(w)`