Use Go 1.22+ int ranges (open-policy-agent#7328)

With "some" help from `golangci-lint run --fix ./...`

Signed-off-by: Anders Eknert <[email protected]>

Author: anderseknert

.golangci.yaml

@@ -151,6 +151,7 @@ linters:
     - errcheck
     - govet
     - ineffassign
+    - intrange
     - revive # replacement for golint
     - gofmt
     - goimports

cmd/bench.go

@@ -214,7 +214,7 @@ func benchMain(args []string, params benchmarkCommandParams, w io.Writer, r benc
 	}
 
 	// Run the benchmark as many times as specified, re-use the prepared objects for each
-	for i := 0; i < params.count; i++ {
+	for range params.count {
 		br, err := r.run(ctx, ectx, params, benchFunc)
 		if err != nil {
 			errRender := renderBenchmarkError(params, err, w)
@@ -252,7 +252,7 @@ func (r *goBenchRunner) run(ctx context.Context, ectx *evalContext, params bench
 		hist.Clear()
 
 		b.ResetTimer()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 
 			// Start the timer (might already be started, but that's ok)
 			b.StartTimer()
@@ -350,7 +350,7 @@ func benchE2E(ctx context.Context, args []string, params benchmarkCommandParams,
 	baseDelay := time.Duration(100) * time.Millisecond
 	maxDelay := time.Duration(60) * time.Second
 	retries := 3 // Max of around 1 minute total wait time.
-	for i := 0; i < retries; i++ {
+	for i := range retries {
 		if len(rt.Addrs()) == 0 {
 			delay := util.DefaultBackoff(float64(baseDelay), float64(maxDelay), i)
 			time.Sleep(delay)
@@ -415,7 +415,7 @@ func benchE2E(ctx context.Context, args []string, params benchmarkCommandParams,
 		url += "?metrics=true"
 	}
 
-	for i := 0; i < params.count; i++ {
+	for range params.count {
 		br, err := runE2E(params, url, body)
 		if err != nil {
 			return err
@@ -441,7 +441,7 @@ func runE2E(params benchmarkCommandParams, url string, input map[string]interfac
 		hist.Clear()
 
 		b.ResetTimer()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 
 			// Start the timer
 			b.StartTimer()

cmd/eval.go

@@ -394,7 +394,7 @@ func eval(args []string, params evalCommandParams, w io.Writer) (bool, error) {
 	profiles := make([][]profiler.ExprStats, ectx.params.count)
 	timers := make([]map[string]interface{}, ectx.params.count)
 
-	for i := 0; i < ectx.params.count; i++ {
+	for i := range ectx.params.count {
 		results[i] = evalOnce(ctx, ectx)
 		profiles[i] = results[i].Profile
 		if ts, ok := results[i].Metrics.(metrics.TimerMetrics); ok {

cmd/fmt_test.go

@@ -727,7 +727,7 @@ func TestFmtMultipleWrongArityError(t *testing.T) {
 			"plus",
 		}
 		expectedErrs := ast.Errors(make([]*ast.Error, 3))
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			loc := locations[i]
 			errExp := ast.NewError(ast.TypeErr, &loc, "%s: %s", operators[i], "arity mismatch")
 			errExp.Details = &format.ArityFormatErrDetail{

cmd/parse_test.go

@@ -247,7 +247,7 @@ p = 1
 		min = len(wantLines)
 	}
 
-	for i := 0; i < min; i++ {
+	for i := range min {
 		if gotLines[i] != wantLines[i] {
 			t.Fatalf("Expected line %d to be\n%v\n, got\n%v", i, wantLines[i], gotLines[i])
 		}
@@ -473,7 +473,7 @@ a.b.c := true
 		min = len(wantLines)
 	}
 
-	for i := 0; i < min; i++ {
+	for i := range min {
 		if gotLines[i] != wantLines[i] {
 			t.Fatalf("Expected line %d to be\n%v\n, got\n%v", i, wantLines[i], gotLines[i])
 		}
@@ -934,7 +934,7 @@ allow = true if {
 		min = len(wantLines)
 	}
 
-	for i := 0; i < min; i++ {
+	for i := range min {
 		if gotLines[i] != wantLines[i] {
 			t.Fatalf("Expected line %d to be\n%v\n, got\n%v", i, wantLines[i], gotLines[i])
 		}

cmd/test.go

@@ -148,7 +148,7 @@ func opaTest(args []string, testParams testCommandParams) (int, error) {
 	}
 
 	success := true
-	for i := 0; i < testParams.count; i++ {
+	for range testParams.count {
 		exitCode, err := runTests(ctx, txn, runner, reporter, testParams)
 		if exitCode != 0 {
 			success = false
@@ -322,7 +322,7 @@ func processWatcherUpdate(ctx context.Context, testParams testCommandParams, pat
 			return err
 		}
 
-		for i := 0; i < testParams.count; i++ {
+		for range testParams.count {
 			exitCode, err := runTests(ctx, txn, runner, reporter, testParams)
 			if exitCode != 0 {
 				return err

internal/compiler/wasm/wasm.go

@@ -1360,7 +1360,7 @@ func (c *Compiler) compileUpsert(local ir.Local, path []int, value ir.Operand, _
 	// Initialize the locals that specify the path of the upsert operation.
 	lpath := make(map[int]uint32, len(path))
 
-	for i := 0; i < len(path); i++ {
+	for i := range path {
 		lpath[i] = c.genLocal()
 		instrs = append(instrs, instruction.I32Const{Value: c.opaStringAddr(path[i])})
 		instrs = append(instrs, instruction.SetLocal{Index: lpath[i]})
@@ -1369,10 +1369,10 @@ func (c *Compiler) compileUpsert(local ir.Local, path []int, value ir.Operand, _
 	// Generate a block that traverses the path of the upsert operation,
 	// shallowing copying values at each step as needed. Stop before the final
 	// segment that will only be inserted.
-	var inner []instruction.Instruction
+	inner := make([]instruction.Instruction, 0, len(path)*21+1)
 	ltemp := c.genLocal()
 
-	for i := 0; i < len(path)-1; i++ {
+	for i := range len(path) - 1 {
 
 		// Lookup the next part of the path.
 		inner = append(inner, instruction.GetLocal{Index: lcopy})
@@ -1408,10 +1408,10 @@ func (c *Compiler) compileUpsert(local ir.Local, path []int, value ir.Operand, _
 	inner = append(inner, instruction.Br{Index: uint32(len(path) - 1)})
 
 	// Generate blocks that handle missing nodes during traversal.
-	var block []instruction.Instruction
+	block := make([]instruction.Instruction, 0, len(path)*10)
 	lval := c.genLocal()
 
-	for i := 0; i < len(path)-1; i++ {
+	for i := range len(path) - 1 {
 		block = append(block, instruction.Block{Instrs: inner})
 		block = append(block, instruction.Call{Index: c.function(opaObject)})
 		block = append(block, instruction.SetLocal{Index: lval})

internal/edittree/bitvector/bitvector_test.go

@@ -23,7 +23,7 @@ func (s *BitVectorSuite) SetUpTest(_ *check.C) {
 }
 
 func (s *BitVectorSuite) TestElement(c *check.C) {
-	for i := 0; i < 4; i++ {
+	for i := range 4 {
 		c.Assert(s.vector.Element(i), check.Equals, byte(0))
 	}
 	for i := 4; i < 12; i++ {
@@ -32,14 +32,14 @@ func (s *BitVectorSuite) TestElement(c *check.C) {
 }
 
 func (s *BitVectorSuite) TestInsert(c *check.C) {
-	for i := 0; i < 4; i++ {
+	for range 4 {
 		s.vector.Insert(0, 8)
 	}
 	c.Assert(s.vector.Bytes(), check.DeepEquals, []byte{0xF0, 0xF0})
 }
 
 func (s *BitVectorSuite) TestAppend(c *check.C) {
-	for i := 0; i < 4; i++ {
+	for i := range 4 {
 		if i%2 == 0 {
 			s.vector.Append(0)
 		} else {
@@ -68,14 +68,14 @@ func (s *BitVectorSuite) TestSetOneBit(c *check.C) {
 }
 
 func (s *BitVectorSuite) TestDelete(c *check.C) {
-	for i := 0; i < 4; i++ {
+	for range 4 {
 		s.vector.Delete(8)
 	}
 	c.Assert(s.vector.Bytes(), check.DeepEquals, []byte{0xF0})
 }
 
 func (s *BitVectorSuite) TestDeleteFirstIndex(c *check.C) {
-	for i := 0; i < 4; i++ {
+	for range 4 {
 		s.vector.Delete(0)
 	}
 	c.Assert(s.vector.Bytes(), check.DeepEquals, []byte{0xFF})

internal/edittree/edittree.go

@@ -552,14 +552,14 @@ func (e *EditTree) Delete(key *ast.Term) (*EditTree, error) {
 		}
 		// Do rewrites to clear out the newly-removed element.
 		e.deleteChildValue(idx)
-		for i := 0; i < len(rewritesScalars); i++ {
+		for i := range rewritesScalars {
 			originalIdx := rewritesScalars[i]
 			rewriteIdx := rewritesScalars[i] - 1
 			v := e.childScalarValues[originalIdx]
 			e.deleteChildValue(originalIdx)
 			e.setChildScalarValue(rewriteIdx, v)
 		}
-		for i := 0; i < len(rewritesComposites); i++ {
+		for i := range rewritesComposites {
 			originalIdx := rewritesComposites[i]
 			rewriteIdx := rewritesComposites[i] - 1
 			v := e.childCompositeValues[originalIdx]
@@ -591,7 +591,7 @@ func (e *EditTree) Delete(key *ast.Term) (*EditTree, error) {
 //gcassert:inline
 func sumZeroesBelowIndex(index int, bv *bitvector.BitVector) int {
 	zeroesSeen := 0
-	for i := 0; i < index; i++ {
+	for i := range index {
 		if bv.Element(i) == 0 {
 			zeroesSeen++
 		}
@@ -601,7 +601,7 @@ func sumZeroesBelowIndex(index int, bv *bitvector.BitVector) int {
 
 func findIndexOfNthZero(n int, bv *bitvector.BitVector) (int, bool) {
 	zeroesSeen := 0
-	for i := 0; i < bv.Length(); i++ {
+	for i := range bv.Length() {
 		if bv.Element(i) == 0 {
 			zeroesSeen++
 		}
@@ -831,7 +831,7 @@ func (e *EditTree) Render() *ast.Term {
 		// original array. We build a new Array with modified/deleted keys.
 		out := make([]*ast.Term, 0, e.insertions.Length())
 		eIdx := 0
-		for i := 0; i < e.insertions.Length(); i++ {
+		for i := range e.insertions.Length() {
 			// If the index == 0, that indicates we should look up the next
 			// surviving original element.
 			// If the index == 1, that indicates we should look up that

internal/gqlparser/ast/dumper.go

@@ -88,7 +88,7 @@ func typeName(t reflect.Type) string {
 func (d *dumper) dumpArray(v reflect.Value) {
 	d.WriteString("[" + typeName(v.Type().Elem()) + "]")
 
-	for i := 0; i < v.Len(); i++ {
+	for i := range v.Len() {
 		d.nl()
 		d.WriteString("- ")
 		d.indent++
@@ -102,7 +102,7 @@ func (d *dumper) dumpStruct(v reflect.Value) {
 	d.indent++
 
 	typ := v.Type()
-	for i := 0; i < v.NumField(); i++ {
+	for i := range v.NumField() {
 		f := v.Field(i)
 		if typ.Field(i).Tag.Get("dump") == "-" {
 			continue
@@ -132,13 +132,13 @@ func isZero(v reflect.Value) bool {
 			return true
 		}
 		z := true
-		for i := 0; i < v.Len(); i++ {
+		for i := range v.Len() {
 			z = z && isZero(v.Index(i))
 		}
 		return z
 	case reflect.Struct:
 		z := true
-		for i := 0; i < v.NumField(); i++ {
+		for i := range v.NumField() {
 			z = z && isZero(v.Field(i))
 		}
 		return z