File tree Expand file tree Collapse file tree 5 files changed +11
-10
lines changed
Expand file tree Collapse file tree 5 files changed +11
-10
lines changed Original file line number Diff line number Diff line change @@ -157,7 +157,7 @@ func (v *Object) UnmarshalJSONFrom(d *jsontext.Decoder) error {
157157func (v * Object ) UnmarshalJSON (b []byte ) error {
158158 o := & Object {}
159159
160- if err := o .UnmarshalJSONFrom (jsontext .NewDecoder (bytes .NewReader (b ), jsonv1 .OmitEmptyWithLegacyDefinition (true ))); err != nil {
160+ if err := o .UnmarshalJSONFrom (jsontext .NewDecoder (bytes .NewReader (b ), jsonv1 .OmitEmptyWithLegacySemantics (true ))); err != nil {
161161 return err
162162 }
163163
Original file line number Diff line number Diff line change @@ -102,14 +102,14 @@ func FromValue(value any) (Valuer, error) {
102102
103103 eg .Go (func () error {
104104 defer w .Close ()
105- return json .MarshalWrite (w , value , jsonv1 .OmitEmptyWithLegacyDefinition (true ))
105+ return json .MarshalWrite (w , value , jsonv1 .OmitEmptyWithLegacySemantics (true ))
106106 })
107107
108108 p := & payload {}
109109
110110 eg .Go (func () error {
111111 defer r .Close ()
112- return json .UnmarshalRead (r , p , jsonv1 .OmitEmptyWithLegacyDefinition (true ))
112+ return json .UnmarshalRead (r , p , jsonv1 .OmitEmptyWithLegacySemantics (true ))
113113 })
114114
115115 if err := eg .Wait (); err != nil {
Original file line number Diff line number Diff line change @@ -5,11 +5,11 @@ go 1.24.5
55tool mvdan.cc/gofumpt
66
77require (
8- github.com/go-json-experiment/json v0.0.0-20250709061156-d2cd4771eb1b
8+ github.com/go-json-experiment/json v0.0.0-20250714165856-be8212f5270d
99 github.com/onsi/gomega v1.37.0
1010 golang.org/x/sync v0.16.0
1111 golang.org/x/text v0.27.0
12- golang.org/x/tools v0.34 .0
12+ golang.org/x/tools v0.35 .0
1313)
1414
1515require (
Original file line number Diff line number Diff line change 1- github.com/go-json-experiment/json v0.0.0-20250709061156-d2cd4771eb1b h1:LzDYmjwGnnbVLXEuoe/Lw7hwbEXvi1A3BcUNkTxuCGU =
2- github.com/go-json-experiment/json v0.0.0-20250709061156-d2cd4771eb1b /go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M =
1+ github.com/go-json-experiment/json v0.0.0-20250714165856-be8212f5270d h1:+d6m5Bjvv0/RJct1VcOw2P5bvBOGjENmxORJYnSYDow =
2+ github.com/go-json-experiment/json v0.0.0-20250714165856-be8212f5270d /go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M =
33github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY =
44github.com/go-logr/logr v1.4.2 /go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY =
55github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI =
@@ -30,8 +30,8 @@ golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
3030golang.org/x/sys v0.34.0 /go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k =
3131golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4 =
3232golang.org/x/text v0.27.0 /go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU =
33- golang.org/x/tools v0.34 .0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo =
34- golang.org/x/tools v0.34 .0 /go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg =
33+ golang.org/x/tools v0.35 .0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0 =
34+ golang.org/x/tools v0.35 .0 /go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw =
3535gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM =
3636gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 /go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0 =
3737gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA =
Original file line number Diff line number Diff line change 44 "bytes"
55 "fmt"
66 "os"
7+ "path"
78 "path/filepath"
89 "strings"
910
@@ -115,7 +116,7 @@ func (s *snapshotMatcher) Match(a *Snapshot) bool {
115116func (s * snapshotMatcher ) commitSnapshots (data []byte ) error {
116117 filename := s .filename
117118 if s .wd != "" {
118- filename = filepath .Join (s .wd , filename )
119+ filename = path .Join (s .wd , filename )
119120 }
120121 if err := os .MkdirAll (filepath .Dir (filename ), os .ModePerm ); err != nil {
121122 return err
You can’t perform that action at this time.
0 commit comments