chore: change interface{} to any (#2818)

* chore: change interface{} to any

* chore: update goctl version to 1.5.0

* chore: update goctl deps
This commit is contained in:
Kevin Wan
2023-01-24 16:32:02 +08:00
committed by GitHub
parent 7e0ac77139
commit ae87114282
221 changed files with 1910 additions and 2207 deletions

View File

@@ -10,7 +10,7 @@ import (
)
func TomlToJson(data []byte) ([]byte, error) {
var val interface{}
var val any
if err := toml.NewDecoder(bytes.NewReader(data)).Decode(&val); err != nil {
return nil, err
}
@@ -24,7 +24,7 @@ func TomlToJson(data []byte) ([]byte, error) {
}
func YamlToJson(data []byte) ([]byte, error) {
var val interface{}
var val any
if err := yaml.Unmarshal(data, &val); err != nil {
return nil, err
}
@@ -39,31 +39,31 @@ func YamlToJson(data []byte) ([]byte, error) {
return buf.Bytes(), nil
}
func convertKeyToString(in map[interface{}]interface{}) map[string]interface{} {
res := make(map[string]interface{})
func convertKeyToString(in map[any]any) map[string]any {
res := make(map[string]any)
for k, v := range in {
res[lang.Repr(k)] = toStringKeyMap(v)
}
return res
}
func convertNumberToJsonNumber(in interface{}) json.Number {
func convertNumberToJsonNumber(in any) json.Number {
return json.Number(lang.Repr(in))
}
func convertSlice(in []interface{}) []interface{} {
res := make([]interface{}, len(in))
func convertSlice(in []any) []any {
res := make([]any, len(in))
for i, v := range in {
res[i] = toStringKeyMap(v)
}
return res
}
func toStringKeyMap(v interface{}) interface{} {
func toStringKeyMap(v any) any {
switch v := v.(type) {
case []interface{}:
case []any:
return convertSlice(v)
case map[interface{}]interface{}:
case map[any]any:
return convertKeyToString(v)
case bool, string:
return v