mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-11-05 12:59:30 -06:00
[chore] update dependencies (#4423)
- codeberg.org/gruf/go-ffmpreg: v0.6.10 -> v0.6.11 - github.com/spf13/cast: v1.9.2 -> v1.10.0 - github.com/spf13/viper: v1.20.1 -> v1.21.0 - golang.org/x/crypto: v0.41.0 -> v0.42.0 - golang.org/x/image: v0.30.0 -> v0.31.0 Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4423 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
This commit is contained in:
parent
a6429b5410
commit
c949b9f2d1
97 changed files with 14611 additions and 3494 deletions
30
vendor/github.com/spf13/cast/map.go
generated
vendored
30
vendor/github.com/spf13/cast/map.go
generated
vendored
|
|
@ -15,7 +15,7 @@ func toMapE[K comparable, V any](i any, keyFn func(any) K, valFn func(any) V) (m
|
|||
m := map[K]V{}
|
||||
|
||||
if i == nil {
|
||||
return nil, fmt.Errorf(errorMsg, i, i, m)
|
||||
return m, fmt.Errorf(errorMsg, i, i, m)
|
||||
}
|
||||
|
||||
switch v := i.(type) {
|
||||
|
|
@ -45,14 +45,10 @@ func toMapE[K comparable, V any](i any, keyFn func(any) K, valFn func(any) V) (m
|
|||
|
||||
case string:
|
||||
err := jsonStringToObject(v, &m)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return m, nil
|
||||
return m, err
|
||||
|
||||
default:
|
||||
return nil, fmt.Errorf(errorMsg, i, i, m)
|
||||
return m, fmt.Errorf(errorMsg, i, i, m)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -112,23 +108,19 @@ func ToStringMapStringSliceE(i any) (map[string][]string, error) {
|
|||
for k, val := range v {
|
||||
key, err := ToStringE(k)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf(errorMsg, i, i, m)
|
||||
return m, fmt.Errorf(errorMsg, i, i, m)
|
||||
}
|
||||
value, err := ToStringSliceE(val)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf(errorMsg, i, i, m)
|
||||
return m, fmt.Errorf(errorMsg, i, i, m)
|
||||
}
|
||||
m[key] = value
|
||||
}
|
||||
case string:
|
||||
err := jsonStringToObject(v, &m)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return m, nil
|
||||
return m, err
|
||||
default:
|
||||
return nil, fmt.Errorf(errorMsg, i, i, m)
|
||||
return m, fmt.Errorf(errorMsg, i, i, m)
|
||||
}
|
||||
|
||||
return m, nil
|
||||
|
|
@ -180,15 +172,11 @@ func toStringMapIntE[T int | int64](i any, fn func(any) T, fnE func(any) (T, err
|
|||
|
||||
case string:
|
||||
err := jsonStringToObject(v, &m)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return m, nil
|
||||
return m, err
|
||||
}
|
||||
|
||||
if reflect.TypeOf(i).Kind() != reflect.Map {
|
||||
return nil, fmt.Errorf(errorMsg, i, i, m)
|
||||
return m, fmt.Errorf(errorMsg, i, i, m)
|
||||
}
|
||||
|
||||
mVal := reflect.ValueOf(m)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue