Update dependencies and build to go1.22 (#2113)
* Update dependencies and build to go1.22 * Fix api changes wrt to dependencies * Update golangci config
This commit is contained in:
17
vendor/github.com/gorilla/schema/encoder.go
generated
vendored
17
vendor/github.com/gorilla/schema/encoder.go
generated
vendored
@@ -93,8 +93,11 @@ func (e *Encoder) encode(v reflect.Value, dst map[string][]string) error {
|
||||
}
|
||||
|
||||
// Encode struct pointer types if the field is a valid pointer and a struct.
|
||||
if isValidStructPointer(v.Field(i)) {
|
||||
e.encode(v.Field(i).Elem(), dst)
|
||||
if isValidStructPointer(v.Field(i)) && !e.hasCustomEncoder(v.Field(i).Type()) {
|
||||
err := e.encode(v.Field(i).Elem(), dst)
|
||||
if err != nil {
|
||||
errors[v.Field(i).Elem().Type().String()] = err
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -112,7 +115,10 @@ func (e *Encoder) encode(v reflect.Value, dst map[string][]string) error {
|
||||
}
|
||||
|
||||
if v.Field(i).Type().Kind() == reflect.Struct {
|
||||
e.encode(v.Field(i), dst)
|
||||
err := e.encode(v.Field(i), dst)
|
||||
if err != nil {
|
||||
errors[v.Field(i).Type().String()] = err
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -142,6 +148,11 @@ func (e *Encoder) encode(v reflect.Value, dst map[string][]string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (e *Encoder) hasCustomEncoder(t reflect.Type) bool {
|
||||
_, exists := e.regenc[t]
|
||||
return exists
|
||||
}
|
||||
|
||||
func typeEncoder(t reflect.Type, reg map[reflect.Type]encoderFunc) encoderFunc {
|
||||
if f, ok := reg[t]; ok {
|
||||
return f
|
||||
|
||||
Reference in New Issue
Block a user