Skip to content

Commit e7ef715

Browse files
committed
jsoniter: replace github.com/modern-go/concurrent with sync
1 parent 621dd68 commit e7ef715

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

Diff for: go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module sigs.k8s.io/structured-merge-diff/v6
33
require (
44
github.com/davecgh/go-spew v1.1.1
55
github.com/google/go-cmp v0.5.9
6-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
76
github.com/modern-go/reflect2 v1.0.2
87
github.com/stretchr/testify v1.3.0
98
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016

Diff for: go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
44
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
55
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
6-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
7-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
86
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
97
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
108
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

Diff for: internal/third_party/jsoniter/config.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"sync"
88
"unsafe"
99

10-
"github.com/modern-go/concurrent"
1110
"github.com/modern-go/reflect2"
1211
)
1312

@@ -72,8 +71,8 @@ type frozenConfig struct {
7271
objectFieldMustBeSimpleString bool
7372
onlyTaggedField bool
7473
disallowUnknownFields bool
75-
decoderCache *concurrent.Map
76-
encoderCache *concurrent.Map
74+
decoderCache sync.Map
75+
encoderCache sync.Map
7776
encoderExtension Extension
7877
decoderExtension Extension
7978
extraExtensions []Extension
@@ -83,8 +82,8 @@ type frozenConfig struct {
8382
}
8483

8584
func (cfg *frozenConfig) initCache() {
86-
cfg.decoderCache = concurrent.NewMap()
87-
cfg.encoderCache = concurrent.NewMap()
85+
cfg.decoderCache = sync.Map{}
86+
cfg.encoderCache = sync.Map{}
8887
}
8988

9089
func (cfg *frozenConfig) addDecoderToCache(cacheKey uintptr, decoder ValDecoder) {
@@ -111,7 +110,7 @@ func (cfg *frozenConfig) getEncoderFromCache(cacheKey uintptr) ValEncoder {
111110
return nil
112111
}
113112

114-
var cfgCache = concurrent.NewMap()
113+
var cfgCache = sync.Map{}
115114

116115
func getFrozenConfigFromCache(cfg Config) *frozenConfig {
117116
obj, found := cfgCache.Load(cfg)

0 commit comments

Comments
 (0)