all: gofmt -w -r 'interface{} -> any' (#2874)

This commit is contained in:
Ariel Mashraki
2022-08-19 18:23:04 +03:00
committed by GitHub
parent b6c185a660
commit 2c63d1d70e
619 changed files with 3449 additions and 3449 deletions

View File

@@ -28,16 +28,16 @@ type Descriptor struct {
}
// To defines an association edge between two vertices.
func To(name string, t interface{}) *assocBuilder {
func To(name string, t any) *assocBuilder {
return &assocBuilder{desc: &Descriptor{Name: name, Type: typ(t)}}
}
// From represents a reversed-edge between two vertices that has a back-reference to its source edge.
func From(name string, t interface{}) *inverseBuilder {
func From(name string, t any) *inverseBuilder {
return &inverseBuilder{desc: &Descriptor{Name: name, Type: typ(t), Inverse: true}}
}
func typ(t interface{}) string {
func typ(t any) string {
if rt := reflect.TypeOf(t); rt.NumIn() > 0 {
return rt.In(0).Name()
}
@@ -93,7 +93,7 @@ func (b *assocBuilder) Field(f string) *assocBuilder {
// edge.To("friends", User.Type).
// Through("friendships", Friendship.Type)
//
func (b *assocBuilder) Through(name string, t interface{}) *assocBuilder {
func (b *assocBuilder) Through(name string, t any) *assocBuilder {
b.desc.Through = &struct{ N, T string }{N: name, T: typ(t)}
return b
}
@@ -193,7 +193,7 @@ func (b *inverseBuilder) Field(f string) *inverseBuilder {
// Ref("liked_tweets").
// Through("likes", TweetLike.Type)
//
func (b *inverseBuilder) Through(name string, t interface{}) *inverseBuilder {
func (b *inverseBuilder) Through(name string, t any) *inverseBuilder {
b.desc.Through = &struct{ N, T string }{N: name, T: typ(t)}
return b
}

View File

@@ -71,7 +71,7 @@ func Time(name string) *timeBuilder {
// field.JSON("info", &Info{}).
// Optional()
//
func JSON(name string, typ interface{}) *jsonBuilder {
func JSON(name string, typ any) *jsonBuilder {
b := &jsonBuilder{&Descriptor{
Name: name,
Info: &TypeInfo{
@@ -241,7 +241,7 @@ func (b *stringBuilder) Default(s string) *stringBuilder {
// field.String("cuid").
// DefaultFunc(cuid.New)
//
func (b *stringBuilder) DefaultFunc(fn interface{}) *stringBuilder {
func (b *stringBuilder) DefaultFunc(fn any) *stringBuilder {
b.desc.Default = fn
return b
}
@@ -304,7 +304,7 @@ func (b *stringBuilder) SchemaType(types map[string]string) *stringBuilder {
// field.String("dir").
// GoType(http.Dir("dir"))
//
func (b *stringBuilder) GoType(typ interface{}) *stringBuilder {
func (b *stringBuilder) GoType(typ any) *stringBuilder {
b.desc.goType(typ, stringType)
return b
}
@@ -374,7 +374,7 @@ func (b *timeBuilder) StructTag(s string) *timeBuilder {
// field.Time("created_at").
// Default(time.Now)
//
func (b *timeBuilder) Default(fn interface{}) *timeBuilder {
func (b *timeBuilder) Default(fn any) *timeBuilder {
b.desc.Default = fn
return b
}
@@ -391,7 +391,7 @@ func (b *timeBuilder) Default(fn interface{}) *timeBuilder {
// GoType(&sql.NullTime{}).
// UpdateDefault(NewNullTime),
//
func (b *timeBuilder) UpdateDefault(fn interface{}) *timeBuilder {
func (b *timeBuilder) UpdateDefault(fn any) *timeBuilder {
b.desc.UpdateDefault = fn
return b
}
@@ -408,7 +408,7 @@ func (b *timeBuilder) StorageKey(key string) *timeBuilder {
// field.Time("deleted_at").
// GoType(&sql.NullTime{})
//
func (b *timeBuilder) GoType(typ interface{}) *timeBuilder {
func (b *timeBuilder) GoType(typ any) *timeBuilder {
b.desc.goType(typ, timeType)
return b
}
@@ -503,7 +503,7 @@ func (b *boolBuilder) StorageKey(key string) *boolBuilder {
// field.Bool("deleted").
// GoType(&sql.NullBool{})
//
func (b *boolBuilder) GoType(typ interface{}) *boolBuilder {
func (b *boolBuilder) GoType(typ any) *boolBuilder {
b.desc.goType(typ, boolType)
return b
}
@@ -543,7 +543,7 @@ func (b *bytesBuilder) Default(v []byte) *bytesBuilder {
// field.Bytes("cuid").
// DefaultFunc(cuid.New)
//
func (b *bytesBuilder) DefaultFunc(fn interface{}) *bytesBuilder {
func (b *bytesBuilder) DefaultFunc(fn any) *bytesBuilder {
b.desc.Default = fn
return b
}
@@ -652,7 +652,7 @@ func (b *bytesBuilder) StorageKey(key string) *bytesBuilder {
// field.Bytes("ip").
// GoType(net.IP("127.0.0.1"))
//
func (b *bytesBuilder) GoType(typ interface{}) *bytesBuilder {
func (b *bytesBuilder) GoType(typ any) *bytesBuilder {
b.desc.goType(typ, bytesType)
return b
}
@@ -760,7 +760,7 @@ func (b *jsonBuilder) Annotations(annotations ...schema.Annotation) *jsonBuilder
// // A function for generating the default value.
// Default(DefaultDirs)
//
func (b *jsonBuilder) Default(v interface{}) *jsonBuilder {
func (b *jsonBuilder) Default(v any) *jsonBuilder {
b.desc.Default = v
switch fieldT, defaultT := b.desc.Info.RType.rtype, reflect.TypeOf(v); {
case fieldT == defaultT:
@@ -973,7 +973,7 @@ func (b *uuidBuilder) StructTag(s string) *uuidBuilder {
// field.UUID("id", uuid.UUID{}).
// Default(uuid.New)
//
func (b *uuidBuilder) Default(fn interface{}) *uuidBuilder {
func (b *uuidBuilder) Default(fn any) *uuidBuilder {
typ := reflect.TypeOf(fn)
if typ.Kind() != reflect.Func || typ.NumIn() != 0 || typ.NumOut() != 1 || typ.Out(0).String() != b.desc.Info.String() {
b.desc.Err = fmt.Errorf("expect type (func() %s) for uuid default value", b.desc.Info)
@@ -1048,7 +1048,7 @@ func (b *otherBuilder) Sensitive() *otherBuilder {
// // A function for generating the default value.
// Default(NewLink)
//
func (b *otherBuilder) Default(v interface{}) *otherBuilder {
func (b *otherBuilder) Default(v any) *otherBuilder {
b.desc.Default = v
switch fieldT, defaultT := b.desc.Info.RType.rtype, reflect.TypeOf(v); {
case fieldT == defaultT:
@@ -1148,9 +1148,9 @@ type Descriptor struct {
Nillable bool // nillable struct field.
Optional bool // nullable field in database.
Immutable bool // create-only field.
Default interface{} // default value on create.
UpdateDefault interface{} // default value on update.
Validators []interface{} // validator functions.
Default any // default value on create.
UpdateDefault any // default value on update.
Validators []any // validator functions.
StorageKey string // sql column or gremlin property.
Enums []struct{ N, V string } // enum values.
Sensitive bool // sensitive info string field.
@@ -1160,7 +1160,7 @@ type Descriptor struct {
Err error
}
func (d *Descriptor) goType(typ interface{}, expectType reflect.Type) {
func (d *Descriptor) goType(typ any, expectType reflect.Type) {
t := reflect.TypeOf(typ)
tv := indirect(t)
info := &TypeInfo{

View File

@@ -192,7 +192,7 @@ type Pair struct {
K, V []byte
}
func (*Pair) Scan(interface{}) error { return nil }
func (*Pair) Scan(any) error { return nil }
func (Pair) Value() (driver.Value, error) { return nil, nil }
func TestBytes(t *testing.T) {
@@ -308,7 +308,7 @@ func TestString_DefaultFunc(t *testing.T) {
type VString string
func (s *VString) Scan(interface{}) error {
func (s *VString) Scan(any) error {
return nil
}
@@ -559,7 +559,7 @@ func (i RoleInt) Value() (driver.Value, error) {
return i.String(), nil
}
func (i *RoleInt) Scan(val interface{}) error {
func (i *RoleInt) Scan(val any) error {
switch v := val.(type) {
case string:
switch v {
@@ -655,7 +655,7 @@ func TestField_UUID(t *testing.T) {
type custom struct {
}
func (c *custom) Scan(_ interface{}) (err error) {
func (c *custom) Scan(_ any) (err error) {
return nil
}
@@ -724,7 +724,7 @@ func (e UserRole) MarshalGQL(w io.Writer) {
}
// UnmarshalGQL implements graphql.Unmarshaler interface.
func (e *UserRole) UnmarshalGQL(val interface{}) error {
func (e *UserRole) UnmarshalGQL(val any) error {
str, ok := val.(string)
if !ok {
return fmt.Errorf("enum %T must be a string", val)
@@ -740,14 +740,14 @@ func (e *UserRole) UnmarshalGQL(val interface{}) error {
type Scalar struct{}
func (Scalar) MarshalGQL(io.Writer) {}
func (*Scalar) UnmarshalGQL(interface{}) error { return nil }
func (Scalar) Value() (driver.Value, error) { return nil, nil }
func (Scalar) MarshalGQL(io.Writer) {}
func (*Scalar) UnmarshalGQL(any) error { return nil }
func (Scalar) Value() (driver.Value, error) { return nil, nil }
func TestRType_Implements(t *testing.T) {
type (
marshaler interface{ MarshalGQL(w io.Writer) }
unmarshaler interface{ UnmarshalGQL(v interface{}) error }
unmarshaler interface{ UnmarshalGQL(v any) error }
codec interface {
marshaler
unmarshaler

View File

@@ -112,7 +112,7 @@ func (b *{{ $builder }}) Default(i {{ $t }}) *{{ $builder }} {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *{{ $builder }}) DefaultFunc(fn interface{}) *{{ $builder }} {
func (b *{{ $builder }}) DefaultFunc(fn any) *{{ $builder }} {
b.desc.Default = fn
return b
}
@@ -124,7 +124,7 @@ func (b *{{ $builder }}) DefaultFunc(fn interface{}) *{{ $builder }} {
// Default(0).
// UpdateDefault(GenNumber),
//
func (b *{{ $builder }}) UpdateDefault(fn interface{}) *{{ $builder }} {
func (b *{{ $builder }}) UpdateDefault(fn any) *{{ $builder }} {
b.desc.UpdateDefault = fn
return b
}
@@ -201,7 +201,7 @@ func (b *{{ $builder }}) SchemaType(types map[string]string) *{{ $builder }} {
// return add(t1, t2)
// }
//
func (b *{{ $builder }}) GoType(typ interface{}) *{{ $builder }} {
func (b *{{ $builder }}) GoType(typ any) *{{ $builder }} {
b.desc.goType(typ, {{ $t }}Type)
return b
}
@@ -370,7 +370,7 @@ func (b *{{ $builder }}) SchemaType(types map[string]string) *{{ $builder }} {
// return add(t1, t2)
// }
//
func (b *{{ $builder }}) GoType(typ interface{}) *{{ $builder }} {
func (b *{{ $builder }}) GoType(typ any) *{{ $builder }} {
b.desc.goType(typ, {{ $t }}Type)
return b
}

View File

@@ -178,7 +178,7 @@ func (b *intBuilder) Default(i int) *intBuilder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *intBuilder) DefaultFunc(fn interface{}) *intBuilder {
func (b *intBuilder) DefaultFunc(fn any) *intBuilder {
b.desc.Default = fn
return b
}
@@ -189,7 +189,7 @@ func (b *intBuilder) DefaultFunc(fn interface{}) *intBuilder {
// field.Int("int").
// Default(0).
// UpdateDefault(GenNumber),
func (b *intBuilder) UpdateDefault(fn interface{}) *intBuilder {
func (b *intBuilder) UpdateDefault(fn any) *intBuilder {
b.desc.UpdateDefault = fn
return b
}
@@ -263,7 +263,7 @@ func (b *intBuilder) SchemaType(types map[string]string) *intBuilder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *intBuilder) GoType(typ interface{}) *intBuilder {
func (b *intBuilder) GoType(typ any) *intBuilder {
b.desc.goType(typ, intType)
return b
}
@@ -343,7 +343,7 @@ func (b *uintBuilder) Default(i uint) *uintBuilder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *uintBuilder) DefaultFunc(fn interface{}) *uintBuilder {
func (b *uintBuilder) DefaultFunc(fn any) *uintBuilder {
b.desc.Default = fn
return b
}
@@ -354,7 +354,7 @@ func (b *uintBuilder) DefaultFunc(fn interface{}) *uintBuilder {
// field.Uint("uint").
// Default(0).
// UpdateDefault(GenNumber),
func (b *uintBuilder) UpdateDefault(fn interface{}) *uintBuilder {
func (b *uintBuilder) UpdateDefault(fn any) *uintBuilder {
b.desc.UpdateDefault = fn
return b
}
@@ -428,7 +428,7 @@ func (b *uintBuilder) SchemaType(types map[string]string) *uintBuilder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *uintBuilder) GoType(typ interface{}) *uintBuilder {
func (b *uintBuilder) GoType(typ any) *uintBuilder {
b.desc.goType(typ, uintType)
return b
}
@@ -518,7 +518,7 @@ func (b *int8Builder) Default(i int8) *int8Builder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *int8Builder) DefaultFunc(fn interface{}) *int8Builder {
func (b *int8Builder) DefaultFunc(fn any) *int8Builder {
b.desc.Default = fn
return b
}
@@ -529,7 +529,7 @@ func (b *int8Builder) DefaultFunc(fn interface{}) *int8Builder {
// field.Int8("int8").
// Default(0).
// UpdateDefault(GenNumber),
func (b *int8Builder) UpdateDefault(fn interface{}) *int8Builder {
func (b *int8Builder) UpdateDefault(fn any) *int8Builder {
b.desc.UpdateDefault = fn
return b
}
@@ -603,7 +603,7 @@ func (b *int8Builder) SchemaType(types map[string]string) *int8Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *int8Builder) GoType(typ interface{}) *int8Builder {
func (b *int8Builder) GoType(typ any) *int8Builder {
b.desc.goType(typ, int8Type)
return b
}
@@ -693,7 +693,7 @@ func (b *int16Builder) Default(i int16) *int16Builder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *int16Builder) DefaultFunc(fn interface{}) *int16Builder {
func (b *int16Builder) DefaultFunc(fn any) *int16Builder {
b.desc.Default = fn
return b
}
@@ -704,7 +704,7 @@ func (b *int16Builder) DefaultFunc(fn interface{}) *int16Builder {
// field.Int16("int16").
// Default(0).
// UpdateDefault(GenNumber),
func (b *int16Builder) UpdateDefault(fn interface{}) *int16Builder {
func (b *int16Builder) UpdateDefault(fn any) *int16Builder {
b.desc.UpdateDefault = fn
return b
}
@@ -778,7 +778,7 @@ func (b *int16Builder) SchemaType(types map[string]string) *int16Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *int16Builder) GoType(typ interface{}) *int16Builder {
func (b *int16Builder) GoType(typ any) *int16Builder {
b.desc.goType(typ, int16Type)
return b
}
@@ -868,7 +868,7 @@ func (b *int32Builder) Default(i int32) *int32Builder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *int32Builder) DefaultFunc(fn interface{}) *int32Builder {
func (b *int32Builder) DefaultFunc(fn any) *int32Builder {
b.desc.Default = fn
return b
}
@@ -879,7 +879,7 @@ func (b *int32Builder) DefaultFunc(fn interface{}) *int32Builder {
// field.Int32("int32").
// Default(0).
// UpdateDefault(GenNumber),
func (b *int32Builder) UpdateDefault(fn interface{}) *int32Builder {
func (b *int32Builder) UpdateDefault(fn any) *int32Builder {
b.desc.UpdateDefault = fn
return b
}
@@ -953,7 +953,7 @@ func (b *int32Builder) SchemaType(types map[string]string) *int32Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *int32Builder) GoType(typ interface{}) *int32Builder {
func (b *int32Builder) GoType(typ any) *int32Builder {
b.desc.goType(typ, int32Type)
return b
}
@@ -1043,7 +1043,7 @@ func (b *int64Builder) Default(i int64) *int64Builder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *int64Builder) DefaultFunc(fn interface{}) *int64Builder {
func (b *int64Builder) DefaultFunc(fn any) *int64Builder {
b.desc.Default = fn
return b
}
@@ -1054,7 +1054,7 @@ func (b *int64Builder) DefaultFunc(fn interface{}) *int64Builder {
// field.Int64("int64").
// Default(0).
// UpdateDefault(GenNumber),
func (b *int64Builder) UpdateDefault(fn interface{}) *int64Builder {
func (b *int64Builder) UpdateDefault(fn any) *int64Builder {
b.desc.UpdateDefault = fn
return b
}
@@ -1128,7 +1128,7 @@ func (b *int64Builder) SchemaType(types map[string]string) *int64Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *int64Builder) GoType(typ interface{}) *int64Builder {
func (b *int64Builder) GoType(typ any) *int64Builder {
b.desc.goType(typ, int64Type)
return b
}
@@ -1208,7 +1208,7 @@ func (b *uint8Builder) Default(i uint8) *uint8Builder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *uint8Builder) DefaultFunc(fn interface{}) *uint8Builder {
func (b *uint8Builder) DefaultFunc(fn any) *uint8Builder {
b.desc.Default = fn
return b
}
@@ -1219,7 +1219,7 @@ func (b *uint8Builder) DefaultFunc(fn interface{}) *uint8Builder {
// field.Uint8("uint8").
// Default(0).
// UpdateDefault(GenNumber),
func (b *uint8Builder) UpdateDefault(fn interface{}) *uint8Builder {
func (b *uint8Builder) UpdateDefault(fn any) *uint8Builder {
b.desc.UpdateDefault = fn
return b
}
@@ -1293,7 +1293,7 @@ func (b *uint8Builder) SchemaType(types map[string]string) *uint8Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *uint8Builder) GoType(typ interface{}) *uint8Builder {
func (b *uint8Builder) GoType(typ any) *uint8Builder {
b.desc.goType(typ, uint8Type)
return b
}
@@ -1373,7 +1373,7 @@ func (b *uint16Builder) Default(i uint16) *uint16Builder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *uint16Builder) DefaultFunc(fn interface{}) *uint16Builder {
func (b *uint16Builder) DefaultFunc(fn any) *uint16Builder {
b.desc.Default = fn
return b
}
@@ -1384,7 +1384,7 @@ func (b *uint16Builder) DefaultFunc(fn interface{}) *uint16Builder {
// field.Uint16("uint16").
// Default(0).
// UpdateDefault(GenNumber),
func (b *uint16Builder) UpdateDefault(fn interface{}) *uint16Builder {
func (b *uint16Builder) UpdateDefault(fn any) *uint16Builder {
b.desc.UpdateDefault = fn
return b
}
@@ -1458,7 +1458,7 @@ func (b *uint16Builder) SchemaType(types map[string]string) *uint16Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *uint16Builder) GoType(typ interface{}) *uint16Builder {
func (b *uint16Builder) GoType(typ any) *uint16Builder {
b.desc.goType(typ, uint16Type)
return b
}
@@ -1538,7 +1538,7 @@ func (b *uint32Builder) Default(i uint32) *uint32Builder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *uint32Builder) DefaultFunc(fn interface{}) *uint32Builder {
func (b *uint32Builder) DefaultFunc(fn any) *uint32Builder {
b.desc.Default = fn
return b
}
@@ -1549,7 +1549,7 @@ func (b *uint32Builder) DefaultFunc(fn interface{}) *uint32Builder {
// field.Uint32("uint32").
// Default(0).
// UpdateDefault(GenNumber),
func (b *uint32Builder) UpdateDefault(fn interface{}) *uint32Builder {
func (b *uint32Builder) UpdateDefault(fn any) *uint32Builder {
b.desc.UpdateDefault = fn
return b
}
@@ -1623,7 +1623,7 @@ func (b *uint32Builder) SchemaType(types map[string]string) *uint32Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *uint32Builder) GoType(typ interface{}) *uint32Builder {
func (b *uint32Builder) GoType(typ any) *uint32Builder {
b.desc.goType(typ, uint32Type)
return b
}
@@ -1703,7 +1703,7 @@ func (b *uint64Builder) Default(i uint64) *uint64Builder {
// DefaultFunc sets the function that is applied to set the default value
// of the field on creation.
func (b *uint64Builder) DefaultFunc(fn interface{}) *uint64Builder {
func (b *uint64Builder) DefaultFunc(fn any) *uint64Builder {
b.desc.Default = fn
return b
}
@@ -1714,7 +1714,7 @@ func (b *uint64Builder) DefaultFunc(fn interface{}) *uint64Builder {
// field.Uint64("uint64").
// Default(0).
// UpdateDefault(GenNumber),
func (b *uint64Builder) UpdateDefault(fn interface{}) *uint64Builder {
func (b *uint64Builder) UpdateDefault(fn any) *uint64Builder {
b.desc.UpdateDefault = fn
return b
}
@@ -1788,7 +1788,7 @@ func (b *uint64Builder) SchemaType(types map[string]string) *uint64Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *uint64Builder) GoType(typ interface{}) *uint64Builder {
func (b *uint64Builder) GoType(typ any) *uint64Builder {
b.desc.goType(typ, uint64Type)
return b
}
@@ -1954,7 +1954,7 @@ func (b *float64Builder) SchemaType(types map[string]string) *float64Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *float64Builder) GoType(typ interface{}) *float64Builder {
func (b *float64Builder) GoType(typ any) *float64Builder {
b.desc.goType(typ, float64Type)
return b
}
@@ -2104,7 +2104,7 @@ func (b *float32Builder) SchemaType(types map[string]string) *float32Builder {
// func(t1 T) Add(t2 T) T {
// return add(t1, t2)
// }
func (b *float32Builder) GoType(typ interface{}) *float32Builder {
func (b *float32Builder) GoType(typ any) *float32Builder {
b.desc.goType(typ, float32Type)
return b
}