all: run modernize happy

$ go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

Author: zchee

AUTHORS

@@ -80,6 +80,7 @@ Kamil Dziedzic <kamil at klecza.pl>
 Kei Kamikawa <x00.x7f.x86 at gmail.com>
 Kevin Malachowski <kevin at chowski.com>
 Kieron Woodhouse <kieron.woodhouse at infosum.com>
+Koichi Shiraishi <zchee.io at gmail.com>
 Lance Tian <lance6716 at gmail.com>
 Lennart Rudolph <lrudolph at hmc.edu>
 Leonardo YongUk Kim <dalinaum at gmail.com>

benchmark_test.go

@@ -92,7 +92,7 @@ func benchmarkQuery(b *testing.B, compr bool) {
 	defer wg.Wait()
 	b.StartTimer()
 
-	for i := 0; i < concurrencyLevel; i++ {
+	for range concurrencyLevel {
 		go func() {
 			for {
 				if atomic.AddInt64(&remain, -1) < 0 {
@@ -129,7 +129,7 @@ func BenchmarkExec(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()
 
-	for i := 0; i < concurrencyLevel; i++ {
+	for range concurrencyLevel {
 		go func() {
 			for {
 				if atomic.AddInt64(&remain, -1) < 0 {
@@ -345,7 +345,7 @@ func BenchmarkQueryRawBytes(b *testing.B) {
 	for i := range blob {
 		blob[i] = 42
 	}
-	for i := 0; i < 100; i++ {
+	for i := range 100 {
 		_, err := db.Exec("INSERT INTO bench_rawbytes VALUES (?, ?)", i, blob)
 		if err != nil {
 			b.Fatal(err)
@@ -404,7 +404,7 @@ func benchmark10kRows(b *testing.B, compress bool) {
 		args[i] = sval
 	}
 	for i := 0; i < 10000; i += 100 {
-		for j := 0; j < 100; j++ {
+		for j := range 100 {
 			args[j*2] = i + j
 		}
 		_, err := stmt.Exec(args...)
@@ -462,7 +462,7 @@ func BenchmarkReceiveMetadata(b *testing.B) {
 
 	// Create a table with 1000 integer fields
 	createTableQuery := "CREATE TABLE large_integer_table ("
-	for i := 0; i < 1000; i++ {
+	for i := range 1000 {
 		createTableQuery += fmt.Sprintf("col_%d INT", i)
 		if i < 999 {
 			createTableQuery += ", "

driver_test.go

@@ -176,7 +176,6 @@ func runTests(t *testing.T, dsn string, tests ...func(dbt *DBTest)) {
 	cleanupSql := "DROP TABLE IF EXISTS test"
 
 	for _, test := range tests {
-		test := test
 		t.Run("default", func(t *testing.T) {
 			dbt := &DBTest{t, db}
 			t.Cleanup(func() {
@@ -220,8 +219,6 @@ func runTestsParallel(t *testing.T, dsn string, tests ...func(dbt *DBTest, table
 
 	t.Parallel()
 	for _, test := range tests {
-		test := test
-
 		t.Run("default", func(t *testing.T) {
 			t.Parallel()
 
@@ -491,7 +488,6 @@ func TestMultiQuery(t *testing.T) {
 			dbt.Error("no data")
 		}
 		rows.Close()
-
 	})
 }
 
@@ -1692,7 +1688,7 @@ func TestTimezoneConversion(t *testing.T) {
 
 		// Insert local time into database (should be converted)
 		newYorkTz, _ := time.LoadLocation("America/New_York")
-		reftime := time.Date(2014, 05, 30, 18, 03, 17, 0, time.UTC).In(newYorkTz)
+		reftime := time.Date(2014, 0o5, 30, 18, 0o3, 17, 0, time.UTC).In(newYorkTz)
 		dbt.mustExec("INSERT INTO test VALUE (?)", reftime)
 
 		// Retrieve time from DB
@@ -1974,7 +1970,6 @@ func TestConcurrent(t *testing.T) {
 				defer wg.Done()
 
 				tx, err := dbt.db.Begin()
-
 				if err != nil {
 					if err.Error() != "Error 1040: Too many connections" {
 						fatalf("error on conn %d: %s", id, err.Error())
@@ -3051,12 +3046,12 @@ func TestRowsColumnTypes(t *testing.T) {
 	nfNULL := sql.NullFloat64{Float64: 0.0, Valid: false}
 	nf0 := sql.NullFloat64{Float64: 0.0, Valid: true}
 	nf1337 := sql.NullFloat64{Float64: 13.37, Valid: true}
-	nt0 := sql.NullTime{Time: time.Date(2006, 01, 02, 15, 04, 05, 0, time.UTC), Valid: true}
-	nt1 := sql.NullTime{Time: time.Date(2006, 01, 02, 15, 04, 05, 100000000, time.UTC), Valid: true}
-	nt2 := sql.NullTime{Time: time.Date(2006, 01, 02, 15, 04, 05, 110000000, time.UTC), Valid: true}
-	nt6 := sql.NullTime{Time: time.Date(2006, 01, 02, 15, 04, 05, 111111000, time.UTC), Valid: true}
-	nd1 := sql.NullTime{Time: time.Date(2006, 01, 02, 0, 0, 0, 0, time.UTC), Valid: true}
-	nd2 := sql.NullTime{Time: time.Date(2006, 03, 04, 0, 0, 0, 0, time.UTC), Valid: true}
+	nt0 := sql.NullTime{Time: time.Date(2006, 0o1, 0o2, 15, 0o4, 0o5, 0, time.UTC), Valid: true}
+	nt1 := sql.NullTime{Time: time.Date(2006, 0o1, 0o2, 15, 0o4, 0o5, 100000000, time.UTC), Valid: true}
+	nt2 := sql.NullTime{Time: time.Date(2006, 0o1, 0o2, 15, 0o4, 0o5, 110000000, time.UTC), Valid: true}
+	nt6 := sql.NullTime{Time: time.Date(2006, 0o1, 0o2, 15, 0o4, 0o5, 111111000, time.UTC), Valid: true}
+	nd1 := sql.NullTime{Time: time.Date(2006, 0o1, 0o2, 0, 0, 0, 0, time.UTC), Valid: true}
+	nd2 := sql.NullTime{Time: time.Date(2006, 0o3, 0o4, 0, 0, 0, 0, time.UTC), Valid: true}
 	ndNULL := sql.NullTime{Time: time.Time{}, Valid: false}
 	bNULL := []byte(nil)
 	nsNULL := sql.NullString{String: "", Valid: false}
@@ -3071,7 +3066,7 @@ func TestRowsColumnTypes(t *testing.T) {
 	bx0 := []byte("\x00")
 	bx42 := []byte("\x42")
 
-	var columns = []struct {
+	columns := []struct {
 		name             string
 		fieldType        string // type used when creating table schema
 		databaseTypeName string // actual type used by MySQL
@@ -3284,7 +3279,7 @@ func TestRawBytesAreNotModified(t *testing.T) {
 	const blobSize = defaultBufSize * 3 / 4 // Second row overwrites first row.
 	const insertRows = 4
 
-	var sqlBlobs = [2]string{
+	sqlBlobs := [2]string{
 		strings.Repeat(blob, blobSize/len(blob)),
 		strings.Repeat(strings.ToUpper(blob), blobSize/len(blob)),
 	}

packets.go

@@ -907,7 +907,7 @@ func (rows *textRows) readRow(dest []driver.Value) error {
 }
 
 func (mc *mysqlConn) skipPackets(n int) error {
-	for i := 0; i < n; i++ {
+	for range n {
 		if _, err := mc.readPacket(); err != nil {
 			return err
 		}