Skip to content

Commit 2d5c20d

Browse files
committed
all: run gopls's modernize -fix
except on internal/govendor.
1 parent 1d79904 commit 2d5c20d

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

format/format.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ func setPos(v reflect.Value, pos token.Pos) {
10551055
v.Set(reflect.ValueOf(pos))
10561056
}
10571057
if v.Kind() == reflect.Struct {
1058-
for i := 0; i < v.NumField(); i++ {
1058+
for i := range v.NumField() {
10591059
setPos(v.Field(i), pos)
10601060
}
10611061
}

format/rewrite.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
8989
if p.Len() != v.Len() {
9090
return false
9191
}
92-
for i := 0; i < p.Len(); i++ {
92+
for i := range p.Len() {
9393
if !match(m, p.Index(i), v.Index(i)) {
9494
return false
9595
}
9696
}
9797
return true
9898

9999
case reflect.Struct:
100-
for i := 0; i < p.NumField(); i++ {
100+
for i := range p.NumField() {
101101
if !match(m, p.Field(i), v.Field(i)) {
102102
return false
103103
}

internal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func format(
138138
if indent == 0 && hasSpace {
139139
indent = 1
140140
}
141-
for i := 0; i < indent; i++ {
141+
for range indent {
142142
res = append(res, '\t')
143143
}
144144

ulimit_linux_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestWithLowOpenFileLimit(t *testing.T) {
4848
)
4949
t.Logf("writing %d tiny Go files", numberFilesTotal)
5050
var allGoFiles []string
51-
for i := 0; i < numberDirs; i++ {
51+
for i := range numberDirs {
5252
// Prefix "p", so the package name is a valid identifier.
5353
// Add one go.mod file per directory as well,
5454
// which will help catch data races when loading module info.
@@ -58,14 +58,14 @@ func TestWithLowOpenFileLimit(t *testing.T) {
5858
qt.Assert(t, qt.IsNil(err))
5959

6060
err = os.WriteFile(filepath.Join(dirPath, "go.mod"),
61-
[]byte(fmt.Sprintf("module %s\n\ngo 1.16", dirName)), 0o666)
61+
fmt.Appendf(nil, "module %s\n\ngo 1.16", dirName), 0o666)
6262
qt.Assert(t, qt.IsNil(err))
6363

64-
for j := 0; j < numberFilesPerDir; j++ {
64+
for j := range numberFilesPerDir {
6565
filePath := filepath.Join(dirPath, fmt.Sprintf("%03d.go", j))
6666
err := os.WriteFile(filePath,
6767
// Extra newlines so that "-l" prints all paths.
68-
[]byte(fmt.Sprintf("package %s\n\n\n", dirName)), 0o666)
68+
fmt.Appendf(nil, "package %s\n\n\n", dirName), 0o666)
6969
qt.Assert(t, qt.IsNil(err))
7070
allGoFiles = append(allGoFiles, filePath)
7171
}

0 commit comments

Comments
 (0)