Skip to content

Commit af4b489

Browse files
committed
*: use Go 1.22+ ranging over integers
Signed-off-by: Roman Khimov <[email protected]>
1 parent 180b9a5 commit af4b489

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Diff for: bench_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func BenchmarkDecoderStream(b *testing.B) {
144144
}
145145
ones := strings.Repeat(" 1\n", 300000) + "\n\n\n"
146146
b.StartTimer()
147-
for i := 0; i < b.N; i++ {
147+
for i := range b.N {
148148
if i%300000 == 0 {
149149
buf.WriteString(ones)
150150
}

Diff for: encode.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ type arrayEncoder struct {
783783
func (ae *arrayEncoder) encode(e *encodeState, v reflect.Value, opts encOpts) {
784784
e.WriteByte('[')
785785
n := v.Len()
786-
for i := 0; i < n; i++ {
786+
for i := range n {
787787
if i > 0 {
788788
e.WriteByte(',')
789789
}
@@ -1152,7 +1152,7 @@ func typeFields(t reflect.Type) []field {
11521152
visited[f.typ] = true
11531153

11541154
// Scan f.typ for fields to include.
1155-
for i := 0; i < f.typ.NumField(); i++ {
1155+
for i := range f.typ.NumField() {
11561156
sf := f.typ.Field(i)
11571157
if sf.PkgPath != "" && (!sf.Anonymous || sf.Type.Kind() != reflect.Struct) { // unexported
11581158
continue

Diff for: indent.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func compact(dst *bytes.Buffer, src []byte, escape bool) error {
6060
func newline(dst *bytes.Buffer, prefix, indent string, depth int) {
6161
dst.WriteByte('\n')
6262
dst.WriteString(prefix)
63-
for i := 0; i < depth; i++ {
63+
for range depth {
6464
dst.WriteString(indent)
6565
}
6666
}

Diff for: number_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,15 @@ func TestNumberIsValid(t *testing.T) {
119119

120120
func BenchmarkNumberIsValid(b *testing.B) {
121121
s := "-61657.61667E+61673"
122-
for i := 0; i < b.N; i++ {
122+
for range b.N {
123123
isValidNumber(s)
124124
}
125125
}
126126

127127
func BenchmarkNumberIsValidRegexp(b *testing.B) {
128128
var jsonNumberRegexp = regexp.MustCompile(`^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$`)
129129
s := "-61657.61667E+61673"
130-
for i := 0; i < b.N; i++ {
130+
for range b.N {
131131
jsonNumberRegexp.MatchString(s)
132132
}
133133
}

Diff for: scanner_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ var benchScan scanner
231231
func BenchmarkSkipValue(b *testing.B) {
232232
initBig()
233233
b.ResetTimer()
234-
for i := 0; i < b.N; i++ {
234+
for range b.N {
235235
_, _, _ = nextValue(jsonBig, &benchScan)
236236
}
237237
b.SetBytes(int64(len(jsonBig)))
@@ -330,7 +330,7 @@ func genMap(n int) map[string]any {
330330
f = 1
331331
}
332332
x := make(map[string]any)
333-
for i := 0; i < f; i++ {
333+
for i := range f {
334334
x[genString(10)] = genValue(((i+1)*n)/f - (i*n)/f)
335335
}
336336
return x

0 commit comments

Comments
 (0)