Skip to content

Commit 35847be

Browse files
authored
replace interface{} with any (#1560)
1 parent 8a327a3 commit 35847be

8 files changed

+67
-67
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ It's possible to access the last inserted ID and number of affected rows for mul
326326

327327
```go
328328
conn, _ := db.Conn(ctx)
329-
conn.Raw(func(conn interface{}) error {
329+
conn.Raw(func(conn any) error {
330330
ex := conn.(driver.Execer)
331331
res, err := ex.Exec(`
332332
UPDATE point SET x = 1 WHERE y = 2;

driver_test.go

+58-58
Large diffs are not rendered by default.

errors.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ var defaultLogger = Logger(log.New(os.Stderr, "[mysql] ", log.Ldate|log.Ltime|lo
4141

4242
// Logger is used to log critical error messages.
4343
type Logger interface {
44-
Print(v ...interface{})
44+
Print(v ...any)
4545
}
4646

4747
// NopLogger is a nop implementation of the Logger interface.
4848
type NopLogger struct{}
4949

5050
// Print implements Logger interface.
51-
func (nl *NopLogger) Print(_ ...interface{}) {}
51+
func (nl *NopLogger) Print(_ ...any) {}
5252

5353
// SetLogger is used to set the default logger for critical errors.
5454
// The initial logger is os.Stderr.

fields.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ var (
134134
scanTypeString = reflect.TypeOf("")
135135
scanTypeNullString = reflect.TypeOf(sql.NullString{})
136136
scanTypeBytes = reflect.TypeOf([]byte{})
137-
scanTypeUnknown = reflect.TypeOf(new(interface{}))
137+
scanTypeUnknown = reflect.TypeOf(new(any))
138138
)
139139

140140
type mysqlField struct {

nulltime.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type NullTime sql.NullTime
3838
// Scan implements the Scanner interface.
3939
// The value type must be time.Time or string / []byte (formatted time-string),
4040
// otherwise Scan fails.
41-
func (nt *NullTime) Scan(value interface{}) (err error) {
41+
func (nt *NullTime) Scan(value any) (err error) {
4242
if value == nil {
4343
nt.Time, nt.Valid = time.Time{}, false
4444
return

nulltime_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var (
2323

2424
func TestScanNullTime(t *testing.T) {
2525
var scanTests = []struct {
26-
in interface{}
26+
in any
2727
error bool
2828
valid bool
2929
time time.Time

statement.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ type converter struct{}
141141
// implementation does not. This function should be kept in sync with
142142
// database/sql/driver defaultConverter.ConvertValue() except for that
143143
// deliberate difference.
144-
func (c converter) ConvertValue(v interface{}) (driver.Value, error) {
144+
func (c converter) ConvertValue(v any) (driver.Value, error) {
145145
if driver.IsValue(v) {
146146
return v, nil
147147
}

statement_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestConvertPointer(t *testing.T) {
7777
}
7878

7979
func TestConvertSignedIntegers(t *testing.T) {
80-
values := []interface{}{
80+
values := []any{
8181
int8(-42),
8282
int16(-42),
8383
int32(-42),
@@ -106,7 +106,7 @@ func (u myUint64) Value() (driver.Value, error) {
106106
}
107107

108108
func TestConvertUnsignedIntegers(t *testing.T) {
109-
values := []interface{}{
109+
values := []any{
110110
uint8(42),
111111
uint16(42),
112112
uint32(42),

0 commit comments

Comments
 (0)