upgrade github.com/go-json-experiment/json

inteon · inteon · commit 835f2c613e34 · 2025-11-18T19:51:13.000+01:00
Signed-off-by: Tim Ramlot &lt;42113979+inteon@users.noreply.github.com&gt;
diff --git a/fieldpath/serialize.go b/fieldpath/serialize.go
@@ -59,6 +59,9 @@ func writePathKey(enc *jsontext.Encoder, pe PathElement) error {
 
 type setContentsV1 Set
 
+var _ json.MarshalerTo = (*setContentsV1)(nil)
+var _ json.UnmarshalerFrom = (*setContentsV1)(nil)
+
 func (s *setContentsV1) MarshalJSONTo(enc *jsontext.Encoder) error {
 	return s.emitContentsV1(false, enc)
 }
diff --git a/go.mod b/go.mod
@@ -1,9 +1,9 @@
 module sigs.k8s.io/structured-merge-diff/v6
 
-go 1.24
+go 1.25
 
 require (
-	github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b
+	github.com/go-json-experiment/json v0.0.0-20251027170946-4849db3c2f7e
 	github.com/google/go-cmp v0.5.9
 	go.yaml.in/yaml/v2 v2.4.2
 	sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU=
-github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
+github.com/go-json-experiment/json v0.0.0-20251027170946-4849db3c2f7e h1:Lf/gRkoycfOBPa42vU2bbgPurFong6zXeFtPoxholzU=
+github.com/go-json-experiment/json v0.0.0-20251027170946-4849db3c2f7e/go.mod h1:uNVvRXArCGbZ508SxYYTC5v1JWoz2voff5pm25jU1Ok=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
diff --git a/value/fields.go b/value/fields.go
@@ -37,6 +37,8 @@ type FastMarshalValue struct {
 	Value *Value
 }
 
+var _ json.MarshalerTo = FastMarshalValue{}
+
 func (mv FastMarshalValue) MarshalJSONTo(enc *jsontext.Encoder) error {
 	return valueMarshalJSONTo(enc, *mv.Value)
 }
@@ -93,6 +95,9 @@ func valueMarshalJSONTo(enc *jsontext.Encoder, v Value) error {
 // have a different name.
 type FieldList []Field
 
+var _ json.MarshalerTo = (*FieldList)(nil)
+var _ json.UnmarshalerFrom = (*FieldList)(nil)
+
 func (fl *FieldList) MarshalJSONTo(enc *jsontext.Encoder) error {
 	enc.WriteToken(jsontext.BeginObject)
 	for _, f := range *fl {

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ func writePathKey(enc *jsontext.Encoder, pe PathElement) error {`
`59`	`59`
`60`	`60`	`type setContentsV1 Set`
`61`	`61`
	`62`	`+var _ json.MarshalerTo = (*setContentsV1)(nil)`
	`63`	`+var _ json.UnmarshalerFrom = (*setContentsV1)(nil)`
	`64`	`+`
`62`	`65`	`func (s setContentsV1) MarshalJSONTo(enc jsontext.Encoder) error {`
`63`	`66`	`return s.emitContentsV1(false, enc)`
`64`	`67`	`}`