Skip to content

Commit f6ef374

Browse files
committed
Clean up examples
1 parent 34822e0 commit f6ef374

File tree

2 files changed

+11
-27
lines changed

2 files changed

+11
-27
lines changed

README.md

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ go get nhooyr.io/ws@master
3232
```go
3333
func main() {
3434
fn := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
35-
c, err := ws.Accept(w, r,
36-
ws.AcceptSubprotocols("echo"),
37-
)
35+
c, err := ws.Accept(w, r)
3836
if err != nil {
3937
log.Printf("server handshake failed: %v", err)
4038
return
@@ -44,11 +42,8 @@ func main() {
4442
ctx, cancel := context.WithTimeout(r.Context(), time.Second*10)
4543
defer cancel()
4644

47-
type myJsonStruct struct {
48-
MyField string `json:"my_field"`
49-
}
50-
err = wsjson.Write(ctx, c, myJsonStruct{
51-
MyField: "foo",
45+
err = wsjson.Write(ctx, c, map[string]interface{}{
46+
"my_field": "foo",
5247
})
5348
if err != nil {
5449
log.Printf("failed to write json struct: %v", err)
@@ -63,7 +58,7 @@ func main() {
6358
if err != nil {
6459
log.Fatalf("failed to listen and serve: %v", err)
6560
}
66-
}
61+
}
6762
```
6863

6964
### Client
@@ -80,11 +75,8 @@ func main() {
8075
}
8176
defer c.Close(ws.StatusInternalError, "")
8277

83-
type myJsonStruct struct {
84-
MyField string `json:"my_field"`
85-
}
86-
err = wsjson.Write(ctx, c, myJsonStruct{
87-
MyField: "foo",
78+
err = wsjson.Write(ctx, c, map[string]interface{}{
79+
"my_field": "foo",
8880
})
8981
if err != nil {
9082
log.Fatalf("failed to write json struct: %v", err)

example_test.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ func ExampleAccept_echo() {
7575

7676
func ExampleAccept() {
7777
fn := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
78-
c, err := ws.Accept(w, r,
79-
ws.AcceptSubprotocols("echo"),
80-
)
78+
c, err := ws.Accept(w, r)
8179
if err != nil {
8280
log.Printf("server handshake failed: %v", err)
8381
return
@@ -87,11 +85,8 @@ func ExampleAccept() {
8785
ctx, cancel := context.WithTimeout(r.Context(), time.Second*10)
8886
defer cancel()
8987

90-
type myJsonStruct struct {
91-
MyField string `json:"my_field"`
92-
}
93-
err = wsjson.Write(ctx, c, myJsonStruct{
94-
MyField: "foo",
88+
err = wsjson.Write(ctx, c, map[string]interface{}{
89+
"my_field": "foo",
9590
})
9691
if err != nil {
9792
log.Printf("failed to write json struct: %v", err)
@@ -119,11 +114,8 @@ func ExampleDial() {
119114
}
120115
defer c.Close(ws.StatusInternalError, "")
121116

122-
type myJsonStruct struct {
123-
MyField string `json:"my_field"`
124-
}
125-
err = wsjson.Write(ctx, c, myJsonStruct{
126-
MyField: "foo",
117+
err = wsjson.Write(ctx, c, map[string]interface{}{
118+
"my_field": "foo",
127119
})
128120
if err != nil {
129121
log.Fatalf("failed to write json struct: %v", err)

0 commit comments

Comments
 (0)