mirror of
https://github.com/ent/ent.git
synced 2026-05-22 09:31:45 +03:00
all: gofmt -w -r 'interface{} -> any' (#2874)
This commit is contained in:
@@ -13,7 +13,7 @@ import (
|
||||
)
|
||||
|
||||
// ScanOne scans one row to the given value. It fails if the rows holds more than 1 row.
|
||||
func ScanOne(rows ColumnScanner, v interface{}) error {
|
||||
func ScanOne(rows ColumnScanner, v any) error {
|
||||
columns, err := rows.Columns()
|
||||
if err != nil {
|
||||
return fmt.Errorf("sql/scan: failed getting column names: %w", err)
|
||||
@@ -82,7 +82,7 @@ func ScanValue(rows ColumnScanner) (driver.Value, error) {
|
||||
}
|
||||
|
||||
// ScanSlice scans the given ColumnScanner (basically, sql.Row or sql.Rows) into the given slice.
|
||||
func ScanSlice(rows ColumnScanner, v interface{}) error {
|
||||
func ScanSlice(rows ColumnScanner, v any) error {
|
||||
columns, err := rows.Columns()
|
||||
if err != nil {
|
||||
return fmt.Errorf("sql/scan: failed getting column names: %w", err)
|
||||
@@ -124,12 +124,12 @@ type rowScan struct {
|
||||
// column types of a row.
|
||||
columns []reflect.Type
|
||||
// value functions that converts the row columns (result) to a reflect.Value.
|
||||
value func(v ...interface{}) reflect.Value
|
||||
value func(v ...any) reflect.Value
|
||||
}
|
||||
|
||||
// values returns a []interface{} from the configured column types.
|
||||
func (r *rowScan) values() []interface{} {
|
||||
values := make([]interface{}, len(r.columns))
|
||||
// values returns a []any from the configured column types.
|
||||
func (r *rowScan) values() []any {
|
||||
values := make([]any, len(r.columns))
|
||||
for i := range r.columns {
|
||||
values[i] = reflect.New(r.columns[i]).Interface()
|
||||
}
|
||||
@@ -142,7 +142,7 @@ func scanType(typ reflect.Type, columns []string) (*rowScan, error) {
|
||||
case assignable(typ):
|
||||
return &rowScan{
|
||||
columns: []reflect.Type{typ},
|
||||
value: func(v ...interface{}) reflect.Value {
|
||||
value: func(v ...any) reflect.Value {
|
||||
return reflect.Indirect(reflect.ValueOf(v[0]))
|
||||
},
|
||||
}, nil
|
||||
@@ -211,7 +211,7 @@ func scanStruct(typ reflect.Type, columns []string) (*rowScan, error) {
|
||||
}
|
||||
scan.columns = append(scan.columns, rtype)
|
||||
}
|
||||
scan.value = func(vs ...interface{}) reflect.Value {
|
||||
scan.value = func(vs ...any) reflect.Value {
|
||||
st := reflect.New(typ).Elem()
|
||||
for i, v := range vs {
|
||||
rv := reflect.Indirect(reflect.ValueOf(v))
|
||||
@@ -261,7 +261,7 @@ func scanPtr(typ reflect.Type, columns []string) (*rowScan, error) {
|
||||
return nil, err
|
||||
}
|
||||
wrap := scan.value
|
||||
scan.value = func(vs ...interface{}) reflect.Value {
|
||||
scan.value = func(vs ...any) reflect.Value {
|
||||
v := wrap(vs...)
|
||||
pt := reflect.PtrTo(v.Type())
|
||||
pv := reflect.New(pt.Elem())
|
||||
|
||||
Reference in New Issue
Block a user