modernize (#1764)

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

Author: methane

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 {
@@ -164,10 +164,9 @@ func BenchmarkRoundtripTxt(b *testing.B) {
 	defer db.Close()
 
 	b.ReportAllocs()
-	b.ResetTimer()
 
 	var result string
-	for i := 0; i < b.N; i++ {
+	for i := 0; b.Loop(); i++ {
 		length := min + i
 		if length > max {
 			length = max
@@ -200,9 +199,9 @@ func BenchmarkRoundtripBin(b *testing.B) {
 	defer stmt.Close()
 
 	b.ReportAllocs()
-	b.ResetTimer()
+
 	var result sql.RawBytes
-	for i := 0; i < b.N; i++ {
+	for i := 0; b.Loop(); i++ {
 		length := min + i
 		if length > max {
 			length = max
@@ -248,8 +247,8 @@ func BenchmarkInterpolation(b *testing.B) {
 	q := "SELECT ?, ?, ?, ?, ?, ?"
 
 	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
+
+	for b.Loop() {
 		_, err := mc.interpolateParams(q, args)
 		if err != nil {
 			b.Fatal(err)
@@ -345,7 +344,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 +403,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...)
@@ -461,19 +460,20 @@ func BenchmarkReceiveMetadata(b *testing.B) {
 	tb := (*TB)(b)
 
 	// Create a table with 1000 integer fields
-	createTableQuery := "CREATE TABLE large_integer_table ("
-	for i := 0; i < 1000; i++ {
-		createTableQuery += fmt.Sprintf("col_%d INT", i)
+	var createTableQuery strings.Builder
+	createTableQuery.WriteString("CREATE TABLE large_integer_table (")
+	for i := range 1000 {
+		createTableQuery.WriteString(fmt.Sprintf("col_%d INT", i))
 		if i < 999 {
-			createTableQuery += ", "
+			createTableQuery.WriteString(", ")
 		}
 	}
-	createTableQuery += ")"
+	createTableQuery.WriteString(")")
 
 	// Initialize database
 	db := initDB(b, false,
 		"DROP TABLE IF EXISTS large_integer_table",
-		createTableQuery,
+		createTableQuery.String(),
 		"INSERT INTO large_integer_table VALUES ("+
 			strings.Repeat("0,", 999)+"0)", // Insert a row of zeros
 	)

conncheck.go

@@ -7,7 +7,6 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
 //go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || solaris || illumos
-// +build linux darwin dragonfly freebsd netbsd openbsd solaris illumos
 
 package mysql
 

conncheck_dummy.go

@@ -7,7 +7,6 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
 //go:build !linux && !darwin && !dragonfly && !freebsd && !netbsd && !openbsd && !solaris && !illumos
-// +build !linux,!darwin,!dragonfly,!freebsd,!netbsd,!openbsd,!solaris,!illumos
 
 package mysql
 

conncheck_test.go

@@ -7,7 +7,6 @@
 // You can obtain one at http://mozilla.org/MPL/2.0/.
 
 //go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || solaris || illumos
-// +build linux darwin dragonfly freebsd netbsd openbsd solaris illumos
 
 package mysql
 

connection.go

@@ -282,7 +282,7 @@ func (mc *mysqlConn) interpolateParams(query string, args []driver.Value) (strin
 	lenQuery := len(query)
 	lastIdx := 0
 
-	for i := 0; i < lenQuery; i++ {
+	for i := range lenQuery {
 		currentChar := query[i]
 		if state == stateEscape && !((currentChar == QUOTE_BYTE && singleQuotes) || (currentChar == DBL_QUOTE_BYTE && !singleQuotes)) {
 			state = stateString

connector.go

@@ -42,7 +42,7 @@ func encodeConnectionAttributes(cfg *Config) string {
 	}
 
 	// user-defined connection attributes
-	for _, connAttr := range strings.Split(cfg.ConnectionAttributes, ",") {
+	for connAttr := range strings.SplitSeq(cfg.ConnectionAttributes, ",") {
 		k, v, found := strings.Cut(connAttr, ":")
 		if !found {
 			continue

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,7 +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()

dsn.go

@@ -15,6 +15,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"maps"
 	"math/big"
 	"net"
 	"net/url"
@@ -157,9 +158,7 @@ func (cfg *Config) Clone() *Config {
 	}
 	if len(cp.Params) > 0 {
 		cp.Params = make(map[string]string, len(cfg.Params))
-		for k, v := range cfg.Params {
-			cp.Params[k] = v
-		}
+		maps.Copy(cp.Params, cfg.Params)
 	}
 	if cfg.pubKey != nil {
 		cp.pubKey = &rsa.PublicKey{
@@ -477,7 +476,7 @@ func ParseDSN(dsn string) (cfg *Config, err error) {
 // parseDSNParams parses the DSN "query string"
 // Values must be url.QueryEscape'ed
 func parseDSNParams(cfg *Config, params string) (err error) {
-	for _, v := range strings.Split(params, "&") {
+	for v := range strings.SplitSeq(params, "&") {
 		key, value, found := strings.Cut(v, "=")
 		if !found {
 			continue

dsn_fuzz_test.go

@@ -1,5 +1,4 @@
 //go:build go1.18
-// +build go1.18
 
 package mysql
 

dsn_test.go

@@ -432,7 +432,7 @@ func TestNormalizeTLSConfig(t *testing.T) {
 func BenchmarkParseDSN(b *testing.B) {
 	b.ReportAllocs()
 
-	for i := 0; i < b.N; i++ {
+	for b.Loop() {
 		for _, tst := range testDSNs {
 			if _, err := ParseDSN(tst.in); err != nil {
 				b.Error(err.Error())