Skip to content

Commit 3264bf1

Browse files
alexandearalexandear
authored
refactor: modernize code (#7850)
Enable the [`modernize`](https://golangci-lint.run/docs/linters/configuration/#modernize) linter in the golangci-lint configuration and fix the reported issues by running `golangci-lint run --enable-only modernize --fix`. The `modernize` linter is internally the same as [gopls modernize](https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/modernize). Similar to #7089.
1 parent fd5d030 commit 3264bf1

25 files changed

Lines changed: 101 additions & 138 deletions

File tree

‎.golangci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ linters:
1616
- govet
1717
- ineffassign
1818
- misspell
19+
- modernize
1920
- perfsprint
2021
- revive
2122
- staticcheck
@@ -111,6 +112,9 @@ linters:
111112
locale: US
112113
ignore-rules:
113114
- cancelled
115+
modernize:
116+
disable:
117+
- omitzero
114118
perfsprint:
115119
int-conversion: true
116120
err-error: true

‎attribute/hash_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ func TestHashKVsEquality(t *testing.T) {
5353
result = append(result, testcase{hashKVs(nil), nil})
5454

5555
for _, key := range keys {
56-
for i := 0; i < len(keyVals); i++ {
56+
for i := range keyVals {
5757
kvs := []KeyValue{keyVals[i](key)}
5858
hash := hashKVs(kvs)
5959
result = append(result, testcase{hash, kvs})
6060

61-
for j := 0; j < len(keyVals); j++ {
61+
for j := range keyVals {
6262
kvs := []KeyValue{
6363
keyVals[i](key),
6464
keyVals[j](key),
6565
}
6666
hash := hashKVs(kvs)
6767
result = append(result, testcase{hash, kvs})
6868

69-
for k := 0; k < len(keyVals); k++ {
69+
for k := range keyVals {
7070
kvs := []KeyValue{
7171
keyVals[i](key),
7272
keyVals[j](key),

‎attribute/internal/attribute.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,28 @@ import (
1313

1414
// BoolSliceValue converts a bool slice into an array with same elements as slice.
1515
func BoolSliceValue(v []bool) any {
16-
var zero bool
17-
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeOf(zero))).Elem()
16+
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeFor[bool]())).Elem()
1817
reflect.Copy(cp, reflect.ValueOf(v))
1918
return cp.Interface()
2019
}
2120

2221
// Int64SliceValue converts an int64 slice into an array with same elements as slice.
2322
func Int64SliceValue(v []int64) any {
24-
var zero int64
25-
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeOf(zero))).Elem()
23+
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeFor[int64]())).Elem()
2624
reflect.Copy(cp, reflect.ValueOf(v))
2725
return cp.Interface()
2826
}
2927

3028
// Float64SliceValue converts a float64 slice into an array with same elements as slice.
3129
func Float64SliceValue(v []float64) any {
32-
var zero float64
33-
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeOf(zero))).Elem()
30+
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeFor[float64]())).Elem()
3431
reflect.Copy(cp, reflect.ValueOf(v))
3532
return cp.Interface()
3633
}
3734

3835
// StringSliceValue converts a string slice into an array with same elements as slice.
3936
func StringSliceValue(v []string) any {
40-
var zero string
41-
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeOf(zero))).Elem()
37+
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeFor[string]())).Elem()
4238
reflect.Copy(cp, reflect.ValueOf(v))
4339
return cp.Interface()
4440
}

‎attribute/internal/attribute_test.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,45 +101,44 @@ var sync any
101101
func BenchmarkBoolSliceValue(b *testing.B) {
102102
b.ReportAllocs()
103103
s := []bool{true, false, true, false}
104-
b.ResetTimer()
105-
for n := 0; n < b.N; n++ {
104+
105+
for b.Loop() {
106106
sync = BoolSliceValue(s)
107107
}
108108
}
109109

110110
func BenchmarkInt64SliceValue(b *testing.B) {
111111
b.ReportAllocs()
112112
s := []int64{1, 2, 3, 4}
113-
b.ResetTimer()
114-
for n := 0; n < b.N; n++ {
113+
114+
for b.Loop() {
115115
sync = Int64SliceValue(s)
116116
}
117117
}
118118

119119
func BenchmarkFloat64SliceValue(b *testing.B) {
120120
b.ReportAllocs()
121121
s := []float64{1.2, 3.4, 5.6, 7.8}
122-
b.ResetTimer()
123-
for n := 0; n < b.N; n++ {
122+
123+
for b.Loop() {
124124
sync = Float64SliceValue(s)
125125
}
126126
}
127127

128128
func BenchmarkStringSliceValue(b *testing.B) {
129129
b.ReportAllocs()
130130
s := []string{"a", "b", "c", "d"}
131-
b.ResetTimer()
132-
for n := 0; n < b.N; n++ {
131+
132+
for b.Loop() {
133133
sync = StringSliceValue(s)
134134
}
135135
}
136136

137137
func BenchmarkAsFloat64Slice(b *testing.B) {
138138
b.ReportAllocs()
139139
var in any = [2]float64{1, 2.3}
140-
b.ResetTimer()
141140

142-
for i := 0; i < b.N; i++ {
141+
for b.Loop() {
143142
sync = AsFloat64Slice(in)
144143
}
145144
}

‎attribute/internal/xxhash/xxhash_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,55 +143,55 @@ func BenchmarkUint64KB(b *testing.B) {
143143

144144
func BenchmarkUint64(b *testing.B) {
145145
h := New()
146-
b.ResetTimer()
146+
147147
b.ReportAllocs()
148-
for i := 0; i < b.N; i++ {
148+
for i := 0; b.Loop(); i++ {
149149
h = h.Uint64(uint64(i))
150150
}
151151
}
152152

153153
func BenchmarkString(b *testing.B) {
154154
h := New()
155155
str := "benchmark_string_value"
156-
b.ResetTimer()
156+
157157
b.ReportAllocs()
158-
for i := 0; i < b.N; i++ {
158+
for b.Loop() {
159159
h = h.String(str)
160160
}
161161
}
162162

163163
func BenchmarkBool(b *testing.B) {
164164
h := New()
165-
b.ResetTimer()
165+
166166
b.ReportAllocs()
167-
for i := 0; i < b.N; i++ {
167+
for i := 0; b.Loop(); i++ {
168168
h = h.Bool(i%2 == 0)
169169
}
170170
}
171171

172172
func BenchmarkFloat64(b *testing.B) {
173173
h := New()
174-
b.ResetTimer()
174+
175175
b.ReportAllocs()
176-
for i := 0; i < b.N; i++ {
176+
for i := 0; b.Loop(); i++ {
177177
h = h.Float64(float64(i) * 3.14159)
178178
}
179179
}
180180

181181
func BenchmarkInt64(b *testing.B) {
182182
h := New()
183-
b.ResetTimer()
183+
184184
b.ReportAllocs()
185-
for i := 0; i < b.N; i++ {
185+
for i := 0; b.Loop(); i++ {
186186
h = h.Int64(int64(i))
187187
}
188188
}
189189

190190
func BenchmarkSum64(b *testing.B) {
191191
h := New().String("key").Uint64(42).Bool(true)
192-
b.ResetTimer()
192+
193193
b.ReportAllocs()
194-
for i := 0; i < b.N; i++ {
194+
for b.Loop() {
195195
_ = h.Sum64()
196196
}
197197
}

‎attribute/set.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func isComparable[T comparable](t T) T { return t }
5858

5959
var (
6060
// keyValueType is used in computeDistinctReflect.
61-
keyValueType = reflect.TypeOf(KeyValue{})
61+
keyValueType = reflect.TypeFor[KeyValue]()
6262

6363
// emptyHash is the hash of an empty set.
6464
emptyHash = xxhash.New().Sum64()

‎attribute/set_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ func TestLookup(t *testing.T) {
314314
}
315315

316316
func TestZeroSetExportedMethodsNoPanic(t *testing.T) {
317-
rType := reflect.TypeOf((*attribute.Set)(nil))
317+
rType := reflect.TypeFor[*attribute.Set]()
318318
rVal := reflect.ValueOf(&attribute.Set{})
319319
for n := 0; n < rType.NumMethod(); n++ {
320320
mType := rType.Method(n)
@@ -552,12 +552,12 @@ func generateStringAttrsWithSize(keyLen, valueLen int) []attribute.KeyValue {
552552
valueBase := ""
553553

554554
// Build key base string
555-
for i := 0; i < keyLen; i++ {
555+
for i := range keyLen {
556556
keyBase += string(rune('a' + i%26))
557557
}
558558

559559
// Build value base string
560-
for i := 0; i < valueLen; i++ {
560+
for i := range valueLen {
561561
valueBase += string(rune('0' + i%10))
562562
}
563563

‎attribute/value.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ func IntValue(v int) Value {
6666

6767
// IntSliceValue creates an INTSLICE Value.
6868
func IntSliceValue(v []int) Value {
69-
var int64Val int64
70-
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeOf(int64Val)))
69+
cp := reflect.New(reflect.ArrayOf(len(v), reflect.TypeFor[int64]()))
7170
for i, val := range v {
7271
cp.Elem().Index(i).SetInt(int64(val))
7372
}

‎baggage/baggage.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ func parseMember(member string) (Member, error) {
317317
keyValue, properties, found := strings.Cut(member, propertyDelimiter)
318318
if found {
319319
// Parse the member properties.
320-
for _, pStr := range strings.Split(properties, propertyDelimiter) {
320+
for pStr := range strings.SplitSeq(properties, propertyDelimiter) {
321321
p, err := parseProperty(pStr)
322322
if err != nil {
323323
return newInvalidMember(), err
@@ -480,7 +480,7 @@ func Parse(bStr string) (Baggage, error) {
480480
}
481481

482482
b := make(baggage.List)
483-
for _, memberStr := range strings.Split(bStr, listDelimiter) {
483+
for memberStr := range strings.SplitSeq(bStr, listDelimiter) {
484484
m, err := parseMember(memberStr)
485485
if err != nil {
486486
return Baggage{}, err

‎baggage/baggage_test.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,9 +1148,8 @@ func BenchmarkNew(b *testing.B) {
11481148
mem4, _ := NewMemberRaw("key4", "val4")
11491149

11501150
b.ReportAllocs()
1151-
b.ResetTimer()
11521151

1153-
for i := 0; i < b.N; i++ {
1152+
for b.Loop() {
11541153
benchBaggage, _ = New(mem1, mem2, mem3, mem4)
11551154
}
11561155
}
@@ -1160,15 +1159,15 @@ var benchMember Member
11601159
func BenchmarkNewMemberRaw(b *testing.B) {
11611160
b.ReportAllocs()
11621161

1163-
for i := 0; i < b.N; i++ {
1162+
for b.Loop() {
11641163
benchMember, _ = NewMemberRaw("key", "value")
11651164
}
11661165
}
11671166

11681167
func BenchmarkParse(b *testing.B) {
11691168
b.ReportAllocs()
11701169

1171-
for i := 0; i < b.N; i++ {
1170+
for b.Loop() {
11721171
benchBaggage, _ = Parse(
11731172
"userId=alice,serverNode = DF28 , isProduction = false,hasProp=stuff;propKey;propWValue=value, invalidUtf8=pr%ffo%ffp%fcValue",
11741173
)
@@ -1192,9 +1191,8 @@ func BenchmarkString(b *testing.B) {
11921191
require.NoError(b, err)
11931192

11941193
b.ReportAllocs()
1195-
b.ResetTimer()
11961194

1197-
for i := 0; i < b.N; i++ {
1195+
for b.Loop() {
11981196
_ = bg.String()
11991197
}
12001198
}
@@ -1229,8 +1227,8 @@ func BenchmarkMemberString(b *testing.B) {
12291227
member, err := NewMember(alphabet, alphabet, props...)
12301228
require.NoError(b, err)
12311229
b.ReportAllocs()
1232-
b.ResetTimer()
1233-
for i := 0; i < b.N; i++ {
1230+
1231+
for b.Loop() {
12341232
_ = member.String()
12351233
}
12361234
}

0 commit comments

Comments
 (0)