Run modernize (#21546)

`go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...` executed.

`go generate ./...` ran afterwards to keep generated.
This commit is contained in:
Klaus Post
2025-08-29 04:39:48 +02:00
committed by GitHub
parent 3b7cb6512c
commit f0b91e5504
238 changed files with 913 additions and 1257 deletions

View File

@@ -152,18 +152,18 @@ func doTestParallelReaders(numReaders, gomaxprocs int) {
clocked := make(chan bool)
cunlock := make(chan bool)
cdone := make(chan bool)
for i := 0; i < numReaders; i++ {
for range numReaders {
go parallelReader(context.Background(), m, clocked, cunlock, cdone)
}
// Wait for all parallel RLock()s to succeed.
for i := 0; i < numReaders; i++ {
for range numReaders {
<-clocked
}
for i := 0; i < numReaders; i++ {
for range numReaders {
cunlock <- true
}
// Wait for the goroutines to finish.
for i := 0; i < numReaders; i++ {
for range numReaders {
<-cdone
}
}
@@ -178,13 +178,13 @@ func TestParallelReaders(t *testing.T) {
// Borrowed from rwmutex_test.go
func reader(rwm *LRWMutex, numIterations int, activity *int32, cdone chan bool) {
for i := 0; i < numIterations; i++ {
for range numIterations {
if rwm.GetRLock(context.Background(), "", "", time.Second) {
n := atomic.AddInt32(activity, 1)
if n < 1 || n >= 10000 {
panic(fmt.Sprintf("wlock(%d)\n", n))
}
for i := 0; i < 100; i++ {
for range 100 {
}
atomic.AddInt32(activity, -1)
rwm.RUnlock()
@@ -195,13 +195,13 @@ func reader(rwm *LRWMutex, numIterations int, activity *int32, cdone chan bool)
// Borrowed from rwmutex_test.go
func writer(rwm *LRWMutex, numIterations int, activity *int32, cdone chan bool) {
for i := 0; i < numIterations; i++ {
for range numIterations {
if rwm.GetLock(context.Background(), "", "", time.Second) {
n := atomic.AddInt32(activity, 10000)
if n != 10000 {
panic(fmt.Sprintf("wlock(%d)\n", n))
}
for i := 0; i < 100; i++ {
for range 100 {
}
atomic.AddInt32(activity, -10000)
rwm.Unlock()
@@ -260,7 +260,7 @@ func TestDRLocker(t *testing.T) {
rl = wl.DRLocker()
n := 10
go func() {
for i := 0; i < n; i++ {
for range n {
rl.Lock()
rl.Lock()
rlocked <- true
@@ -268,7 +268,7 @@ func TestDRLocker(t *testing.T) {
wlocked <- true
}
}()
for i := 0; i < n; i++ {
for range n {
<-rlocked
rl.Unlock()
select {