From 1c9d339361a41b7177bd9c648591ed1dcc6351ca Mon Sep 17 00:00:00 2001 From: Kevin Wan Date: Sun, 10 Aug 2025 23:01:08 +0800 Subject: [PATCH] chore: use uber gomock instead of golang/mock (#5075) --- core/discov/internal/etcdclient_mock.go | 52 ++++++++++++--------- core/discov/internal/registry_test.go | 2 +- core/discov/internal/statewatcher_mock.go | 24 ++++++---- core/discov/internal/statewatcher_test.go | 2 +- core/discov/internal/updatelistener_mock.go | 24 ++++++---- core/discov/publisher_test.go | 2 +- go.mod | 1 - go.sum | 9 ---- 8 files changed, 62 insertions(+), 54 deletions(-) diff --git a/core/discov/internal/etcdclient_mock.go b/core/discov/internal/etcdclient_mock.go index 7b7de816c..875ef72f8 100644 --- a/core/discov/internal/etcdclient_mock.go +++ b/core/discov/internal/etcdclient_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: etcdclient.go +// +// Generated by this command: +// +// mockgen -package internal -destination etcdclient_mock.go -source etcdclient.go EtcdClient +// // Package internal is a generated GoMock package. package internal @@ -8,35 +13,36 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" clientv3 "go.etcd.io/etcd/client/v3" + gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" ) -// MockEtcdClient is a mock of EtcdClient interface +// MockEtcdClient is a mock of EtcdClient interface. type MockEtcdClient struct { ctrl *gomock.Controller recorder *MockEtcdClientMockRecorder + isgomock struct{} } -// MockEtcdClientMockRecorder is the mock recorder for MockEtcdClient +// MockEtcdClientMockRecorder is the mock recorder for MockEtcdClient. type MockEtcdClientMockRecorder struct { mock *MockEtcdClient } -// NewMockEtcdClient creates a new mock instance +// NewMockEtcdClient creates a new mock instance. func NewMockEtcdClient(ctrl *gomock.Controller) *MockEtcdClient { mock := &MockEtcdClient{ctrl: ctrl} mock.recorder = &MockEtcdClientMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockEtcdClient) EXPECT() *MockEtcdClientMockRecorder { return m.recorder } -// ActiveConnection mocks base method +// ActiveConnection mocks base method. func (m *MockEtcdClient) ActiveConnection() *grpc.ClientConn { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ActiveConnection") @@ -44,13 +50,13 @@ func (m *MockEtcdClient) ActiveConnection() *grpc.ClientConn { return ret0 } -// ActiveConnection indicates an expected call of ActiveConnection +// ActiveConnection indicates an expected call of ActiveConnection. func (mr *MockEtcdClientMockRecorder) ActiveConnection() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ActiveConnection", reflect.TypeOf((*MockEtcdClient)(nil).ActiveConnection)) } -// Close mocks base method +// Close mocks base method. func (m *MockEtcdClient) Close() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Close") @@ -58,13 +64,13 @@ func (m *MockEtcdClient) Close() error { return ret0 } -// Close indicates an expected call of Close +// Close indicates an expected call of Close. func (mr *MockEtcdClientMockRecorder) Close() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockEtcdClient)(nil).Close)) } -// Ctx mocks base method +// Ctx mocks base method. func (m *MockEtcdClient) Ctx() context.Context { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Ctx") @@ -72,13 +78,13 @@ func (m *MockEtcdClient) Ctx() context.Context { return ret0 } -// Ctx indicates an expected call of Ctx +// Ctx indicates an expected call of Ctx. func (mr *MockEtcdClientMockRecorder) Ctx() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ctx", reflect.TypeOf((*MockEtcdClient)(nil).Ctx)) } -// Get mocks base method +// Get mocks base method. func (m *MockEtcdClient) Get(ctx context.Context, key string, opts ...clientv3.OpOption) (*clientv3.GetResponse, error) { m.ctrl.T.Helper() varargs := []any{ctx, key} @@ -91,14 +97,14 @@ func (m *MockEtcdClient) Get(ctx context.Context, key string, opts ...clientv3.O return ret0, ret1 } -// Get indicates an expected call of Get +// Get indicates an expected call of Get. func (mr *MockEtcdClientMockRecorder) Get(ctx, key any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx, key}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockEtcdClient)(nil).Get), varargs...) } -// Grant mocks base method +// Grant mocks base method. func (m *MockEtcdClient) Grant(ctx context.Context, ttl int64) (*clientv3.LeaseGrantResponse, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Grant", ctx, ttl) @@ -107,13 +113,13 @@ func (m *MockEtcdClient) Grant(ctx context.Context, ttl int64) (*clientv3.LeaseG return ret0, ret1 } -// Grant indicates an expected call of Grant +// Grant indicates an expected call of Grant. func (mr *MockEtcdClientMockRecorder) Grant(ctx, ttl any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Grant", reflect.TypeOf((*MockEtcdClient)(nil).Grant), ctx, ttl) } -// KeepAlive mocks base method +// KeepAlive mocks base method. func (m *MockEtcdClient) KeepAlive(ctx context.Context, id clientv3.LeaseID) (<-chan *clientv3.LeaseKeepAliveResponse, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "KeepAlive", ctx, id) @@ -122,13 +128,13 @@ func (m *MockEtcdClient) KeepAlive(ctx context.Context, id clientv3.LeaseID) (<- return ret0, ret1 } -// KeepAlive indicates an expected call of KeepAlive +// KeepAlive indicates an expected call of KeepAlive. func (mr *MockEtcdClientMockRecorder) KeepAlive(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KeepAlive", reflect.TypeOf((*MockEtcdClient)(nil).KeepAlive), ctx, id) } -// Put mocks base method +// Put mocks base method. func (m *MockEtcdClient) Put(ctx context.Context, key, val string, opts ...clientv3.OpOption) (*clientv3.PutResponse, error) { m.ctrl.T.Helper() varargs := []any{ctx, key, val} @@ -141,14 +147,14 @@ func (m *MockEtcdClient) Put(ctx context.Context, key, val string, opts ...clien return ret0, ret1 } -// Put indicates an expected call of Put +// Put indicates an expected call of Put. func (mr *MockEtcdClientMockRecorder) Put(ctx, key, val any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx, key, val}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Put", reflect.TypeOf((*MockEtcdClient)(nil).Put), varargs...) } -// Revoke mocks base method +// Revoke mocks base method. func (m *MockEtcdClient) Revoke(ctx context.Context, id clientv3.LeaseID) (*clientv3.LeaseRevokeResponse, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Revoke", ctx, id) @@ -157,13 +163,13 @@ func (m *MockEtcdClient) Revoke(ctx context.Context, id clientv3.LeaseID) (*clie return ret0, ret1 } -// Revoke indicates an expected call of Revoke +// Revoke indicates an expected call of Revoke. func (mr *MockEtcdClientMockRecorder) Revoke(ctx, id any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Revoke", reflect.TypeOf((*MockEtcdClient)(nil).Revoke), ctx, id) } -// Watch mocks base method +// Watch mocks base method. func (m *MockEtcdClient) Watch(ctx context.Context, key string, opts ...clientv3.OpOption) clientv3.WatchChan { m.ctrl.T.Helper() varargs := []any{ctx, key} @@ -175,7 +181,7 @@ func (m *MockEtcdClient) Watch(ctx context.Context, key string, opts ...clientv3 return ret0 } -// Watch indicates an expected call of Watch +// Watch indicates an expected call of Watch. func (mr *MockEtcdClientMockRecorder) Watch(ctx, key any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx, key}, opts...) diff --git a/core/discov/internal/registry_test.go b/core/discov/internal/registry_test.go index 24962f075..eaee49a99 100644 --- a/core/discov/internal/registry_test.go +++ b/core/discov/internal/registry_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/zeromicro/go-zero/core/contextx" "github.com/zeromicro/go-zero/core/lang" @@ -18,6 +17,7 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/mock/mockserver" + "go.uber.org/mock/gomock" ) var mockLock sync.Mutex diff --git a/core/discov/internal/statewatcher_mock.go b/core/discov/internal/statewatcher_mock.go index 2d1bd3a36..e8c25338c 100644 --- a/core/discov/internal/statewatcher_mock.go +++ b/core/discov/internal/statewatcher_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: statewatcher.go +// +// Generated by this command: +// +// mockgen -package internal -destination statewatcher_mock.go -source statewatcher.go etcdConn +// // Package internal is a generated GoMock package. package internal @@ -8,34 +13,35 @@ import ( context "context" reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" connectivity "google.golang.org/grpc/connectivity" ) -// MocketcdConn is a mock of etcdConn interface +// MocketcdConn is a mock of etcdConn interface. type MocketcdConn struct { ctrl *gomock.Controller recorder *MocketcdConnMockRecorder + isgomock struct{} } -// MocketcdConnMockRecorder is the mock recorder for MocketcdConn +// MocketcdConnMockRecorder is the mock recorder for MocketcdConn. type MocketcdConnMockRecorder struct { mock *MocketcdConn } -// NewMocketcdConn creates a new mock instance +// NewMocketcdConn creates a new mock instance. func NewMocketcdConn(ctrl *gomock.Controller) *MocketcdConn { mock := &MocketcdConn{ctrl: ctrl} mock.recorder = &MocketcdConnMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MocketcdConn) EXPECT() *MocketcdConnMockRecorder { return m.recorder } -// GetState mocks base method +// GetState mocks base method. func (m *MocketcdConn) GetState() connectivity.State { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetState") @@ -43,13 +49,13 @@ func (m *MocketcdConn) GetState() connectivity.State { return ret0 } -// GetState indicates an expected call of GetState +// GetState indicates an expected call of GetState. func (mr *MocketcdConnMockRecorder) GetState() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetState", reflect.TypeOf((*MocketcdConn)(nil).GetState)) } -// WaitForStateChange mocks base method +// WaitForStateChange mocks base method. func (m *MocketcdConn) WaitForStateChange(ctx context.Context, sourceState connectivity.State) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "WaitForStateChange", ctx, sourceState) @@ -57,7 +63,7 @@ func (m *MocketcdConn) WaitForStateChange(ctx context.Context, sourceState conne return ret0 } -// WaitForStateChange indicates an expected call of WaitForStateChange +// WaitForStateChange indicates an expected call of WaitForStateChange. func (mr *MocketcdConnMockRecorder) WaitForStateChange(ctx, sourceState any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WaitForStateChange", reflect.TypeOf((*MocketcdConn)(nil).WaitForStateChange), ctx, sourceState) diff --git a/core/discov/internal/statewatcher_test.go b/core/discov/internal/statewatcher_test.go index 64761dbf7..ac616188e 100644 --- a/core/discov/internal/statewatcher_test.go +++ b/core/discov/internal/statewatcher_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "google.golang.org/grpc/connectivity" ) diff --git a/core/discov/internal/updatelistener_mock.go b/core/discov/internal/updatelistener_mock.go index 577cd7034..72ef1bba7 100644 --- a/core/discov/internal/updatelistener_mock.go +++ b/core/discov/internal/updatelistener_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: updatelistener.go +// +// Generated by this command: +// +// mockgen -package internal -destination updatelistener_mock.go -source updatelistener.go UpdateListener +// // Package internal is a generated GoMock package. package internal @@ -7,51 +12,52 @@ package internal import ( reflect "reflect" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) -// MockUpdateListener is a mock of UpdateListener interface +// MockUpdateListener is a mock of UpdateListener interface. type MockUpdateListener struct { ctrl *gomock.Controller recorder *MockUpdateListenerMockRecorder + isgomock struct{} } -// MockUpdateListenerMockRecorder is the mock recorder for MockUpdateListener +// MockUpdateListenerMockRecorder is the mock recorder for MockUpdateListener. type MockUpdateListenerMockRecorder struct { mock *MockUpdateListener } -// NewMockUpdateListener creates a new mock instance +// NewMockUpdateListener creates a new mock instance. func NewMockUpdateListener(ctrl *gomock.Controller) *MockUpdateListener { mock := &MockUpdateListener{ctrl: ctrl} mock.recorder = &MockUpdateListenerMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockUpdateListener) EXPECT() *MockUpdateListenerMockRecorder { return m.recorder } -// OnAdd mocks base method +// OnAdd mocks base method. func (m *MockUpdateListener) OnAdd(kv KV) { m.ctrl.T.Helper() m.ctrl.Call(m, "OnAdd", kv) } -// OnAdd indicates an expected call of OnAdd +// OnAdd indicates an expected call of OnAdd. func (mr *MockUpdateListenerMockRecorder) OnAdd(kv any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnAdd", reflect.TypeOf((*MockUpdateListener)(nil).OnAdd), kv) } -// OnDelete mocks base method +// OnDelete mocks base method. func (m *MockUpdateListener) OnDelete(kv KV) { m.ctrl.T.Helper() m.ctrl.Call(m, "OnDelete", kv) } -// OnDelete indicates an expected call of OnDelete +// OnDelete indicates an expected call of OnDelete. func (mr *MockUpdateListenerMockRecorder) OnDelete(kv any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnDelete", reflect.TypeOf((*MockUpdateListener)(nil).OnDelete), kv) diff --git a/core/discov/publisher_test.go b/core/discov/publisher_test.go index 2021d6023..831e44a2d 100644 --- a/core/discov/publisher_test.go +++ b/core/discov/publisher_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/zeromicro/go-zero/core/discov/internal" "github.com/zeromicro/go-zero/core/lang" @@ -17,6 +16,7 @@ import ( "github.com/zeromicro/go-zero/core/stringx" "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" + "go.uber.org/mock/gomock" "golang.org/x/net/http2" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/go.mod b/go.mod index de7a64162..b01d1727b 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/fullstorydev/grpcurl v1.9.3 github.com/go-sql-driver/mysql v1.9.0 github.com/golang-jwt/jwt/v4 v4.5.2 - github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/grafana/pyroscope-go v1.2.4 diff --git a/go.sum b/go.sum index 398b1c9a7..4ab760a83 100644 --- a/go.sum +++ b/go.sum @@ -62,8 +62,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= @@ -190,7 +188,6 @@ github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zU github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= @@ -244,14 +241,12 @@ golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= @@ -260,7 +255,6 @@ golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= @@ -268,8 +262,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -293,7 +285,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=