From f460a3754bbf572ce3b2ca49ccb1a268ef2e9505 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 02:17:28 +0200 Subject: [PATCH 1/9] Improve example test --- internal/common/debug/example_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go index bb3627737..93a463ebd 100644 --- a/internal/common/debug/example_test.go +++ b/internal/common/debug/example_test.go @@ -21,8 +21,11 @@ package debug import ( + "cmp" "encoding/json" "fmt" + "slices" + "strings" "sync" "go.uber.org/atomic" @@ -75,6 +78,14 @@ func (ati *activityTrackerImpl) Stats() Activities { }{Info: a, Count: count}) } } + slices.SortFunc( + activities, + func(a, b struct { + Info ActivityInfo + Count int64 + }) int { + return cmp.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) + }) return activities } From 7ad6c06a567afcf91d024b1eaf4e58b4e418c558 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 11:25:14 +0200 Subject: [PATCH 2/9] delete example file --- internal/common/debug/example_test.go | 197 -------------------------- 1 file changed, 197 deletions(-) delete mode 100644 internal/common/debug/example_test.go diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go deleted file mode 100644 index 93a463ebd..000000000 --- a/internal/common/debug/example_test.go +++ /dev/null @@ -1,197 +0,0 @@ -// Copyright (c) 2017-2021 Uber Technologies Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -package debug - -import ( - "cmp" - "encoding/json" - "fmt" - "slices" - "strings" - "sync" - - "go.uber.org/atomic" -) - -type ( - // pollerTrackerImpl implements the PollerTracker interface - pollerTrackerImpl struct { - pollerCount atomic.Int32 - } - - // stopperImpl implements the Stopper interface - stopperImpl struct { - pollerTracker *pollerTrackerImpl - } - - // activityTrackerImpl implements the ActivityTracker interface - activityTrackerImpl struct { - sync.RWMutex - activityCount map[ActivityInfo]int64 - } - - // activityStopperImpl implements the Stopper interface - activityStopperImpl struct { - sync.Once - info ActivityInfo - tracker *activityTrackerImpl - } -) - -var _ ActivityTracker = &activityTrackerImpl{} -var _ Stopper = &activityStopperImpl{} - -func (ati *activityTrackerImpl) Start(info ActivityInfo) Stopper { - ati.Lock() - defer ati.Unlock() - ati.activityCount[info]++ - return &activityStopperImpl{info: info, tracker: ati} -} - -func (ati *activityTrackerImpl) Stats() Activities { - var activities Activities - ati.RLock() - defer ati.RUnlock() - for a, count := range ati.activityCount { - if count > 0 { - activities = append(activities, struct { - Info ActivityInfo - Count int64 - }{Info: a, Count: count}) - } - } - slices.SortFunc( - activities, - func(a, b struct { - Info ActivityInfo - Count int64 - }) int { - return cmp.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) - }) - return activities -} - -func (asi *activityStopperImpl) Stop() { - asi.Do(func() { - asi.tracker.Lock() - defer asi.tracker.Unlock() - asi.tracker.activityCount[asi.info]-- - if asi.tracker.activityCount[asi.info] == 0 { - delete(asi.tracker.activityCount, asi.info) - } - }) -} - -func (p *pollerTrackerImpl) Start() Stopper { - p.pollerCount.Inc() - return &stopperImpl{ - pollerTracker: p, - } -} - -func (p *pollerTrackerImpl) Stats() int32 { - return p.pollerCount.Load() -} - -func (s *stopperImpl) Stop() { - s.pollerTracker.pollerCount.Dec() -} - -func Example() { - var pollerTracker PollerTracker - pollerTracker = &pollerTrackerImpl{} - - // Initially, poller count should be 0 - fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats())) - - // Start a poller and verify that the count increments - stopper1 := pollerTracker.Start() - fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats())) - - // Start another poller and verify that the count increments again - stopper2 := pollerTracker.Start() - fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats())) - - // Stop the pollers and verify the counter - stopper1.Stop() - stopper2.Stop() - fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats())) - - var activityTracker ActivityTracker - activityTracker = &activityTrackerImpl{activityCount: make(map[ActivityInfo]int64)} - - info1 := ActivityInfo{ - TaskList: "task-list", - ActivityType: "activity1", - } - - info2 := ActivityInfo{ - TaskList: "task-list", - ActivityType: "activity2", - } - - stopper1 = activityTracker.Start(info1) - stopper2 = activityTracker.Start(info2) - jsonActivities, _ := json.MarshalIndent(activityTracker.Stats(), "", " ") - fmt.Println(string(jsonActivities)) - - stopper1.Stop() - stopper1.Stop() - jsonActivities, _ = json.MarshalIndent(activityTracker.Stats(), "", " ") - - fmt.Println(string(jsonActivities)) - stopper2.Stop() - - jsonActivities, _ = json.MarshalIndent(activityTracker.Stats(), "", " ") - fmt.Println(string(jsonActivities)) - - // Output: - // poller stats: 0 - // poller stats: 1 - // poller stats: 2 - // poller stats: 0 - // [ - // { - // "Info": { - // "TaskList": "task-list", - // "ActivityType": "activity1" - // }, - // "Count": 1 - // }, - // { - // "Info": { - // "TaskList": "task-list", - // "ActivityType": "activity2" - // }, - // "Count": 1 - // } - // ] - // [ - // { - // "Info": { - // "TaskList": "task-list", - // "ActivityType": "activity2" - // }, - // "Count": 1 - // } - // ] - // null -} From 0c7f584d6351d9415d98f150b28c333e28f11fc5 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 11:28:53 +0200 Subject: [PATCH 3/9] Revert "delete example file" This reverts commit 7ad6c06a567afcf91d024b1eaf4e58b4e418c558. --- internal/common/debug/example_test.go | 197 ++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 internal/common/debug/example_test.go diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go new file mode 100644 index 000000000..93a463ebd --- /dev/null +++ b/internal/common/debug/example_test.go @@ -0,0 +1,197 @@ +// Copyright (c) 2017-2021 Uber Technologies Inc. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +package debug + +import ( + "cmp" + "encoding/json" + "fmt" + "slices" + "strings" + "sync" + + "go.uber.org/atomic" +) + +type ( + // pollerTrackerImpl implements the PollerTracker interface + pollerTrackerImpl struct { + pollerCount atomic.Int32 + } + + // stopperImpl implements the Stopper interface + stopperImpl struct { + pollerTracker *pollerTrackerImpl + } + + // activityTrackerImpl implements the ActivityTracker interface + activityTrackerImpl struct { + sync.RWMutex + activityCount map[ActivityInfo]int64 + } + + // activityStopperImpl implements the Stopper interface + activityStopperImpl struct { + sync.Once + info ActivityInfo + tracker *activityTrackerImpl + } +) + +var _ ActivityTracker = &activityTrackerImpl{} +var _ Stopper = &activityStopperImpl{} + +func (ati *activityTrackerImpl) Start(info ActivityInfo) Stopper { + ati.Lock() + defer ati.Unlock() + ati.activityCount[info]++ + return &activityStopperImpl{info: info, tracker: ati} +} + +func (ati *activityTrackerImpl) Stats() Activities { + var activities Activities + ati.RLock() + defer ati.RUnlock() + for a, count := range ati.activityCount { + if count > 0 { + activities = append(activities, struct { + Info ActivityInfo + Count int64 + }{Info: a, Count: count}) + } + } + slices.SortFunc( + activities, + func(a, b struct { + Info ActivityInfo + Count int64 + }) int { + return cmp.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) + }) + return activities +} + +func (asi *activityStopperImpl) Stop() { + asi.Do(func() { + asi.tracker.Lock() + defer asi.tracker.Unlock() + asi.tracker.activityCount[asi.info]-- + if asi.tracker.activityCount[asi.info] == 0 { + delete(asi.tracker.activityCount, asi.info) + } + }) +} + +func (p *pollerTrackerImpl) Start() Stopper { + p.pollerCount.Inc() + return &stopperImpl{ + pollerTracker: p, + } +} + +func (p *pollerTrackerImpl) Stats() int32 { + return p.pollerCount.Load() +} + +func (s *stopperImpl) Stop() { + s.pollerTracker.pollerCount.Dec() +} + +func Example() { + var pollerTracker PollerTracker + pollerTracker = &pollerTrackerImpl{} + + // Initially, poller count should be 0 + fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats())) + + // Start a poller and verify that the count increments + stopper1 := pollerTracker.Start() + fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats())) + + // Start another poller and verify that the count increments again + stopper2 := pollerTracker.Start() + fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats())) + + // Stop the pollers and verify the counter + stopper1.Stop() + stopper2.Stop() + fmt.Println(fmt.Sprintf("poller stats: %d", pollerTracker.Stats())) + + var activityTracker ActivityTracker + activityTracker = &activityTrackerImpl{activityCount: make(map[ActivityInfo]int64)} + + info1 := ActivityInfo{ + TaskList: "task-list", + ActivityType: "activity1", + } + + info2 := ActivityInfo{ + TaskList: "task-list", + ActivityType: "activity2", + } + + stopper1 = activityTracker.Start(info1) + stopper2 = activityTracker.Start(info2) + jsonActivities, _ := json.MarshalIndent(activityTracker.Stats(), "", " ") + fmt.Println(string(jsonActivities)) + + stopper1.Stop() + stopper1.Stop() + jsonActivities, _ = json.MarshalIndent(activityTracker.Stats(), "", " ") + + fmt.Println(string(jsonActivities)) + stopper2.Stop() + + jsonActivities, _ = json.MarshalIndent(activityTracker.Stats(), "", " ") + fmt.Println(string(jsonActivities)) + + // Output: + // poller stats: 0 + // poller stats: 1 + // poller stats: 2 + // poller stats: 0 + // [ + // { + // "Info": { + // "TaskList": "task-list", + // "ActivityType": "activity1" + // }, + // "Count": 1 + // }, + // { + // "Info": { + // "TaskList": "task-list", + // "ActivityType": "activity2" + // }, + // "Count": 1 + // } + // ] + // [ + // { + // "Info": { + // "TaskList": "task-list", + // "ActivityType": "activity2" + // }, + // "Count": 1 + // } + // ] + // null +} From 00c22bd0f86289949aa6905088e82c5a1f36d057 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 11:34:09 +0200 Subject: [PATCH 4/9] edit example test --- internal/common/debug/example_test.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go index 93a463ebd..ad332ce80 100644 --- a/internal/common/debug/example_test.go +++ b/internal/common/debug/example_test.go @@ -78,14 +78,6 @@ func (ati *activityTrackerImpl) Stats() Activities { }{Info: a, Count: count}) } } - slices.SortFunc( - activities, - func(a, b struct { - Info ActivityInfo - Count int64 - }) int { - return cmp.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) - }) return activities } @@ -150,12 +142,22 @@ func Example() { stopper1 = activityTracker.Start(info1) stopper2 = activityTracker.Start(info2) - jsonActivities, _ := json.MarshalIndent(activityTracker.Stats(), "", " ") + sortFn := func(a, b struct { + Info ActivityInfo + Count int64 + }) int { + return cmp.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) + } + activities := activityTracker.Stats() + slices.SortFunc(activities, sortFn) + jsonActivities, _ := json.MarshalIndent(activities, "", " ") fmt.Println(string(jsonActivities)) stopper1.Stop() stopper1.Stop() - jsonActivities, _ = json.MarshalIndent(activityTracker.Stats(), "", " ") + activities = activityTracker.Stats() + slices.SortFunc(activities, sortFn) + jsonActivities, _ = json.MarshalIndent(activities, "", " ") fmt.Println(string(jsonActivities)) stopper2.Stop() From 273aa4b80680eb8f9429bb8216d8949520dfd4a5 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 14:39:47 +0200 Subject: [PATCH 5/9] Revert "edit example test" This reverts commit 00c22bd0f86289949aa6905088e82c5a1f36d057. --- internal/common/debug/example_test.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go index ad332ce80..93a463ebd 100644 --- a/internal/common/debug/example_test.go +++ b/internal/common/debug/example_test.go @@ -78,6 +78,14 @@ func (ati *activityTrackerImpl) Stats() Activities { }{Info: a, Count: count}) } } + slices.SortFunc( + activities, + func(a, b struct { + Info ActivityInfo + Count int64 + }) int { + return cmp.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) + }) return activities } @@ -142,22 +150,12 @@ func Example() { stopper1 = activityTracker.Start(info1) stopper2 = activityTracker.Start(info2) - sortFn := func(a, b struct { - Info ActivityInfo - Count int64 - }) int { - return cmp.Compare(strings.ToLower(a.Info.ActivityType), strings.ToLower(b.Info.ActivityType)) - } - activities := activityTracker.Stats() - slices.SortFunc(activities, sortFn) - jsonActivities, _ := json.MarshalIndent(activities, "", " ") + jsonActivities, _ := json.MarshalIndent(activityTracker.Stats(), "", " ") fmt.Println(string(jsonActivities)) stopper1.Stop() stopper1.Stop() - activities = activityTracker.Stats() - slices.SortFunc(activities, sortFn) - jsonActivities, _ = json.MarshalIndent(activities, "", " ") + jsonActivities, _ = json.MarshalIndent(activityTracker.Stats(), "", " ") fmt.Println(string(jsonActivities)) stopper2.Stop() From ea435fa6a9f36274b2b87d6162d50f3162a26de8 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 15:58:23 +0200 Subject: [PATCH 6/9] use exp slices --- go.mod | 11 ++++++----- go.sum | 7 +++++++ internal/common/debug/example_test.go | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8f458b49e..bed35ae63 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,8 @@ require ( go.uber.org/thriftrw v1.25.0 go.uber.org/yarpc v1.55.0 go.uber.org/zap v1.13.0 - golang.org/x/net v0.19.0 + golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e + golang.org/x/net v0.28.0 golang.org/x/oauth2 v0.1.0 golang.org/x/time v0.0.0-20170927054726-6dc17368e09b ) @@ -56,10 +57,10 @@ require ( go.uber.org/net/metrics v1.3.0 // indirect golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.6.0 // indirect + golang.org/x/mod v0.20.0 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + golang.org/x/tools v0.24.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce // indirect google.golang.org/grpc v1.28.0 // indirect diff --git a/go.sum b/go.sum index 5c97a432e..fcf705a2a 100644 --- a/go.sum +++ b/go.sum @@ -257,6 +257,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e h1:qyrTQ++p1afMkO4DPEeLGq/3oTsdlvdH4vqZUBWzUKM= golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -273,6 +275,7 @@ 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.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -290,6 +293,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= @@ -328,6 +332,7 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -335,6 +340,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20170927054726-6dc17368e09b h1:3X+R0qq1+64izd8es+EttB6qcY+JDlVmAhpRXl7gpzU= golang.org/x/time v0.0.0-20170927054726-6dc17368e09b/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -361,6 +367,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go index 93a463ebd..77f9cd2f2 100644 --- a/internal/common/debug/example_test.go +++ b/internal/common/debug/example_test.go @@ -24,7 +24,7 @@ import ( "cmp" "encoding/json" "fmt" - "slices" + "golang.org/x/exp/slices" "strings" "sync" From 3a575b1e1ab19663249c1958ef54ad031678441f Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 16:02:48 +0200 Subject: [PATCH 7/9] go mod tidy --- go.mod | 1 + go.sum | 20 ++++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index bed35ae63..9839c1e7c 100644 --- a/go.mod +++ b/go.mod @@ -58,6 +58,7 @@ require ( golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect golang.org/x/mod v0.20.0 // indirect + golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.24.0 // indirect diff --git a/go.sum b/go.sum index fcf705a2a..6d3b3e31b 100644 --- a/go.sum +++ b/go.sum @@ -91,7 +91,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= @@ -273,8 +273,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB 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.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -291,8 +290,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -307,7 +305,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/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.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -330,16 +329,14 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20170927054726-6dc17368e09b h1:3X+R0qq1+64izd8es+EttB6qcY+JDlVmAhpRXl7gpzU= golang.org/x/time v0.0.0-20170927054726-6dc17368e09b/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -365,8 +362,7 @@ golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2/go.mod h1:TB2adYChydJhpapK 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.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From b3dda6bdb59a8ac550cdcb933e1f242b54e64df7 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 16:09:24 +0200 Subject: [PATCH 8/9] Remove go files This reverts commit 3a575b1e1ab19663249c1958ef54ad031678441f. --- go.mod | 1 - go.sum | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 9839c1e7c..bed35ae63 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,6 @@ require ( golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect golang.org/x/mod v0.20.0 // indirect - golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.24.0 // indirect diff --git a/go.sum b/go.sum index 6d3b3e31b..fcf705a2a 100644 --- a/go.sum +++ b/go.sum @@ -91,7 +91,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= @@ -273,7 +273,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB 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.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -290,7 +291,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -305,8 +307,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/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.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -329,14 +330,16 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20170927054726-6dc17368e09b h1:3X+R0qq1+64izd8es+EttB6qcY+JDlVmAhpRXl7gpzU= golang.org/x/time v0.0.0-20170927054726-6dc17368e09b/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -362,7 +365,8 @@ golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2/go.mod h1:TB2adYChydJhpapK 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.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 23c3a20ad9c5f429c2a1570e263a71b7faea6c62 Mon Sep 17 00:00:00 2001 From: Ketsia Date: Mon, 9 Sep 2024 16:12:04 +0200 Subject: [PATCH 9/9] Revert "use golang/x/exp/slices" This reverts commit ea435fa6a9f36274b2b87d6162d50f3162a26de8. --- go.mod | 11 +++++------ go.sum | 7 ------- internal/common/debug/example_test.go | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index bed35ae63..8f458b49e 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,7 @@ require ( go.uber.org/thriftrw v1.25.0 go.uber.org/yarpc v1.55.0 go.uber.org/zap v1.13.0 - golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e - golang.org/x/net v0.28.0 + golang.org/x/net v0.19.0 golang.org/x/oauth2 v0.1.0 golang.org/x/time v0.0.0-20170927054726-6dc17368e09b ) @@ -57,10 +56,10 @@ require ( go.uber.org/net/metrics v1.3.0 // indirect golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/mod v0.8.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.6.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce // indirect google.golang.org/grpc v1.28.0 // indirect diff --git a/go.sum b/go.sum index fcf705a2a..5c97a432e 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= -golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e h1:qyrTQ++p1afMkO4DPEeLGq/3oTsdlvdH4vqZUBWzUKM= golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -275,7 +273,6 @@ 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.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -293,7 +290,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= @@ -332,7 +328,6 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -340,7 +335,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20170927054726-6dc17368e09b h1:3X+R0qq1+64izd8es+EttB6qcY+JDlVmAhpRXl7gpzU= golang.org/x/time v0.0.0-20170927054726-6dc17368e09b/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -367,7 +361,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/common/debug/example_test.go b/internal/common/debug/example_test.go index 77f9cd2f2..93a463ebd 100644 --- a/internal/common/debug/example_test.go +++ b/internal/common/debug/example_test.go @@ -24,7 +24,7 @@ import ( "cmp" "encoding/json" "fmt" - "golang.org/x/exp/slices" + "slices" "strings" "sync"