Skip to content

Commit

Permalink
rename interface{} to any
Browse files Browse the repository at this point in the history
  • Loading branch information
tenfyzhong committed Feb 9, 2024
1 parent db98e69 commit ba61768
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion json_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var (

type JsonUnmarshalTagFormat struct{}

func (j JsonUnmarshalTagFormat) Unmarshal(data []byte, v interface{}) error {
func (j JsonUnmarshalTagFormat) Unmarshal(data []byte, v any) error {
return jsonapi.Unmarshal(data, v)
}

Expand Down
12 changes: 6 additions & 6 deletions structured_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"sort"
)

type UnmarshalFunc func(data []byte, v interface{}) error
type UnmarshalFunc func(data []byte, v any) error

type UnmarshalTagFormat interface {
Unmarshal(data []byte, v interface{}) error
Unmarshal(data []byte, v any) error
TagFormat() string
}

Expand Down Expand Up @@ -46,7 +46,7 @@ func (p *StructuredParser) Parse(reader io.Reader) ([]*Struct, error) {
return nil, nil
}

var v interface{}
var v any
err = p.unmarshalTagFormat.Unmarshal(data, &v)
if err != nil {
return nil, err
Expand Down Expand Up @@ -173,7 +173,7 @@ func (p *StructuredParser) parseStructs(root *rawNode) *Member {
return member
}

func (p *StructuredParser) parseNode(tag string, v interface{}) *rawNode {
func (p *StructuredParser) parseNode(tag string, v any) *rawNode {
node := &rawNode{
Field: tag,
}
Expand Down Expand Up @@ -217,15 +217,15 @@ func (p *StructuredParser) parseNode(tag string, v interface{}) *rawNode {
node.Type = Uint64Val
case string:
node.Type = StringVal
case map[string]interface{}:
case map[string]any:
node.Type = StructLikeVal
node.Children = []*rawNode{}
for k, v := range c {
child := p.parseNode(k, v)
node.Children = append(node.Children, child)
}
sort.Sort(NodeList(node.Children))
case []interface{}:
case []any:
node.Type = ArrayVal
if len(c) > 0 {
child := p.parseNode("", c[0])
Expand Down
2 changes: 1 addition & 1 deletion yaml_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

type YamlUnmarshalTagFormat struct{}

func (j YamlUnmarshalTagFormat) Unmarshal(data []byte, v interface{}) error {
func (j YamlUnmarshalTagFormat) Unmarshal(data []byte, v any) error {
return yaml.Unmarshal(data, v)
}

Expand Down

0 comments on commit ba61768

Please sign in to comment.