Upgrade to v5.0.0-rc3

go-goyave · Jan 25, 2024 · ddccb00 · ddccb00
1 parent 62c6e98
commit ddccb00
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -4,16 +4,16 @@ go 1.21
 
 require (
  github.com/gorilla/websocket v1.5.1
- goyave.dev/goyave/v5 v5.0.0-rc2
+ goyave.dev/goyave/v5 v5.0.0-rc3
 )
 
 require (
  github.com/Code-Hex/uniseg v0.2.0 // indirect
- github.com/google/uuid v1.5.0 // indirect
+ github.com/google/uuid v1.6.0 // indirect
  github.com/jinzhu/inflection v1.0.0 // indirect
  github.com/jinzhu/now v1.1.5 // indirect
  github.com/samber/lo v1.39.0 // indirect
- golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e // indirect
+ golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
  golang.org/x/net v0.20.0 // indirect
  gorm.io/gorm v1.25.5 // indirect
  goyave.dev/copier v0.4.3 // indirect

diff --git a/go.sum b/go.sum
@@ -4,6 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
 github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -20,6 +22,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e h1:723BNChdd0c2Wk6WOE320qGBiPtYx0F0Bbm1kriShfE=
 golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
+golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
@@ -32,3 +36,5 @@ goyave.dev/copier v0.4.3 h1:MxX2wBnhQUbv0mHPXEgw/zS4TZMtTVpzj/aYS3h4amk=
 goyave.dev/copier v0.4.3/go.mod h1:WJu0Ex81v29f5U0eMWzSNsMTGmuGY6lQ/q5yGlyLDsU=
 goyave.dev/goyave/v5 v5.0.0-rc2 h1:LkpJmcXI+ianjocIZVidU5dMKLAxOrKGr0e4bg6mNU4=
 goyave.dev/goyave/v5 v5.0.0-rc2/go.mod h1:BMWwAkDnb63JVCssMkseLn65RQW3qnpd0ogI/4XvPBg=
+goyave.dev/goyave/v5 v5.0.0-rc3 h1:gerRYKFyxXnYd1gCVptc24FJSoEexwbUFa96b51hFZo=
+goyave.dev/goyave/v5 v5.0.0-rc3/go.mod h1:U2bVdfdNOdNQGHzz0P05NzXHRQCzgBw92WoVQc1AoJM=
diff --git a/http/controller/chat/client.go b/http/controller/chat/client.go
@@ -83,7 +83,7 @@ func (c *Client) readPump() {
  c.readErr <- err
  return
  }
- c.readErr <- errors.New(fmt.Errorf("read: %w", err))
+ c.readErr <- errors.Errorf("read: %w", err)
  return
  }
  message = bytes.TrimSpace(bytes.Replace(message, newline, space, -1))
@@ -108,7 +108,7 @@ func (c *Client) writePump() {
 
  w, err := c.conn.NextWriter(ws.TextMessage)
  if err != nil {
- c.writeErr <- errors.New(fmt.Errorf("next writer: %w", err))
+ c.writeErr <- errors.Errorf("next writer: %w", err)
  return
  }
  if !c.write(w, message) {
@@ -127,13 +127,13 @@ func (c *Client) writePump() {
  }
 
  if err := w.Close(); err != nil {
- c.writeErr <- errors.New(fmt.Errorf("writer close: %w", err))
+ c.writeErr <- errors.Errorf("writer close: %w", err)
  return
  }
  case <-ticker.C:
  _ = c.conn.SetWriteDeadline(time.Now().Add(writeWait))
  if err := c.conn.WriteMessage(ws.PingMessage, nil); err != nil {
- c.writeErr <- errors.New(fmt.Errorf("ping: %w", err))
+ c.writeErr <- errors.Errorf("ping: %w", err)
  return
  }
  }
@@ -143,7 +143,7 @@ func (c *Client) writePump() {
 func (c *Client) write(w io.Writer, p []byte) bool {
  _, err := w.Write(p)
  if err != nil {
- c.writeErr <- errors.New(fmt.Errorf("write: %w", err))
+ c.writeErr <- errors.Errorf("write: %w", err)
  return false
  }
  return true