refactor: run Go modernize (#5002)
This commit is contained in:
Vendored
+1
-1
@@ -70,7 +70,7 @@ var _ = Describe("FileHaunter", func() {
|
||||
|
||||
func createTestFiles(c *fscache.FSCache) error {
|
||||
// Create 5 normal files and 1 empty
|
||||
for i := 0; i < 6; i++ {
|
||||
for i := range 6 {
|
||||
name := fmt.Sprintf("stream-%v", i)
|
||||
var r fscache.ReadAtCloser
|
||||
if i < 5 {
|
||||
|
||||
@@ -57,7 +57,7 @@ var _ = Describe("HashFunc", func() {
|
||||
})
|
||||
|
||||
It("does not cause race conditions", func() {
|
||||
for i := 0; i < 1000; i++ {
|
||||
for i := range 1000 {
|
||||
go func() {
|
||||
hashFunc := hasher.HashFunc()
|
||||
sum := hashFunc(strconv.Itoa(i), input)
|
||||
|
||||
@@ -23,8 +23,8 @@ var indexGroupsRx = regexp.MustCompile(`(.+)\((.+)\)`)
|
||||
|
||||
func ParseIndexGroups(spec string) IndexGroups {
|
||||
parsed := make(IndexGroups)
|
||||
split := strings.Split(spec, " ")
|
||||
for _, g := range split {
|
||||
split := strings.SplitSeq(spec, " ")
|
||||
for g := range split {
|
||||
sub := indexGroupsRx.FindStringSubmatch(g)
|
||||
if len(sub) > 0 {
|
||||
for _, c := range sub[2] {
|
||||
|
||||
@@ -152,7 +152,7 @@ func Tee[T any](ctx context.Context, in <-chan T) (<-chan T, <-chan T) {
|
||||
defer close(out2)
|
||||
for val := range ReadOrDone(ctx, in) {
|
||||
var out1, out2 = out1, out2
|
||||
for i := 0; i < 2; i++ {
|
||||
for range 2 {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
case out1 <- val:
|
||||
|
||||
@@ -22,7 +22,7 @@ var _ = Describe("Pipeline", func() {
|
||||
Context("happy path", func() {
|
||||
It("calls the 'transform' function and returns values and errors", func() {
|
||||
inC := make(chan int, 4)
|
||||
for i := 0; i < 4; i++ {
|
||||
for i := range 4 {
|
||||
inC <- i
|
||||
}
|
||||
close(inC)
|
||||
@@ -48,7 +48,7 @@ var _ = Describe("Pipeline", func() {
|
||||
const numJobs = 100
|
||||
It("starts multiple workers, respecting the limit", func() {
|
||||
inC := make(chan int, numJobs)
|
||||
for i := 0; i < numJobs; i++ {
|
||||
for i := range numJobs {
|
||||
inC <- i
|
||||
}
|
||||
close(inC)
|
||||
@@ -94,7 +94,7 @@ var _ = Describe("Pipeline", func() {
|
||||
BeforeEach(func() {
|
||||
in1 = make(chan int, 4)
|
||||
in2 = make(chan int, 4)
|
||||
for i := 0; i < 4; i++ {
|
||||
for i := range 4 {
|
||||
in1 <- i
|
||||
in2 <- i + 4
|
||||
}
|
||||
@@ -126,7 +126,7 @@ var _ = Describe("Pipeline", func() {
|
||||
It("copies them to its output channel", func() {
|
||||
in := make(chan int)
|
||||
out := pl.ReadOrDone(context.Background(), in)
|
||||
for i := 0; i < 4; i++ {
|
||||
for i := range 4 {
|
||||
in <- i
|
||||
j := <-out
|
||||
Expect(i).To(Equal(j))
|
||||
|
||||
@@ -16,7 +16,7 @@ func TestRandom(t *testing.T) {
|
||||
var _ = Describe("number package", func() {
|
||||
Describe("Int64N", func() {
|
||||
It("should return a random int64", func() {
|
||||
for i := 0; i < 10000; i++ {
|
||||
for range 10000 {
|
||||
Expect(random.Int64N(100)).To(BeNumerically("<", 100))
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@ var _ = Describe("WeightedChooser", func() {
|
||||
var w *WeightedChooser[int]
|
||||
BeforeEach(func() {
|
||||
w = NewWeightedChooser[int]()
|
||||
for i := 0; i < 10; i++ {
|
||||
for i := range 10 {
|
||||
w.Add(i, i+1)
|
||||
}
|
||||
})
|
||||
@@ -23,7 +23,7 @@ var _ = Describe("WeightedChooser", func() {
|
||||
|
||||
It("removes items", func() {
|
||||
Expect(w.Size()).To(Equal(10))
|
||||
for i := 0; i < 10; i++ {
|
||||
for range 10 {
|
||||
Expect(w.Remove(0)).To(Succeed())
|
||||
}
|
||||
Expect(w.Size()).To(Equal(0))
|
||||
@@ -43,7 +43,7 @@ var _ = Describe("WeightedChooser", func() {
|
||||
})
|
||||
|
||||
It("returns all items from the list", func() {
|
||||
for i := 0; i < 10; i++ {
|
||||
for range 10 {
|
||||
Expect(w.Pick()).To(BeElementOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9))
|
||||
}
|
||||
Expect(w.Size()).To(Equal(0))
|
||||
@@ -61,11 +61,11 @@ var _ = Describe("WeightedChooser", func() {
|
||||
|
||||
It("chooses based on weights", func() {
|
||||
counts := [10]int{}
|
||||
for i := 0; i < 200000; i++ {
|
||||
for range 200000 {
|
||||
c, _ := w.weightedChoice()
|
||||
counts[c] = counts[c] + 1
|
||||
}
|
||||
for i := 0; i < 9; i++ {
|
||||
for i := range 9 {
|
||||
Expect(counts[i]).To(BeNumerically("<", counts[i+1]))
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
instances = map[string]interface{}{}
|
||||
instances = map[string]any{}
|
||||
pending = map[string]chan struct{}{}
|
||||
lock sync.RWMutex
|
||||
)
|
||||
|
||||
@@ -69,7 +69,7 @@ var _ = Describe("GetInstance", func() {
|
||||
done.Add(numCallsToDo)
|
||||
|
||||
numInstancesCreated = 0
|
||||
for i := 0; i < numCallsToDo; i++ {
|
||||
for range numCallsToDo {
|
||||
go func() {
|
||||
// This is needed to make sure the test does not hang if it fails
|
||||
defer GinkgoRecover()
|
||||
|
||||
@@ -54,8 +54,8 @@ func SanitizeFieldForSortingNoArticle(originalValue string) string {
|
||||
}
|
||||
|
||||
func RemoveArticle(name string) string {
|
||||
articles := strings.Split(conf.Server.IgnoredArticles, " ")
|
||||
for _, a := range articles {
|
||||
articles := strings.SplitSeq(conf.Server.IgnoredArticles, " ")
|
||||
for a := range articles {
|
||||
n := strings.TrimPrefix(name, a+" ")
|
||||
if n != name {
|
||||
return n
|
||||
|
||||
+1
-4
@@ -50,10 +50,7 @@ func TruncateRunes(s string, maxRunes int, suffix string) string {
|
||||
}
|
||||
|
||||
suffixRunes := utf8.RuneCountInString(suffix)
|
||||
truncateAt := maxRunes - suffixRunes
|
||||
if truncateAt < 0 {
|
||||
truncateAt = 0
|
||||
}
|
||||
truncateAt := max(maxRunes-suffixRunes, 0)
|
||||
|
||||
runes := []rune(s)
|
||||
if truncateAt >= len(runes) {
|
||||
|
||||
Reference in New Issue
Block a user