Skip to content

Commit 863141a

Browse files
committed
Rewrite interface{} to any
The type any is an alias for type interface{}.
1 parent 62787cc commit 863141a

21 files changed

+575
-576
lines changed

msgpack/decode.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type DecodeConvertError struct {
2222
// The MessagePack type of the value.
2323
SrcType Type
2424
// Option value.
25-
SrcValue interface{}
25+
SrcValue any
2626
// Type of the Go value that could not be assigned to.
2727
DestType reflect.Type
2828
}
@@ -57,7 +57,7 @@ func (ds *decodeState) skip() {
5757
}
5858
}
5959

60-
func (ds *decodeState) saveErrorAndSkip(destValue reflect.Value, srcValue interface{}) {
60+
func (ds *decodeState) saveErrorAndSkip(destValue reflect.Value, srcValue any) {
6161
if ds.errSaved == nil {
6262
ds.errSaved = &DecodeConvertError{
6363
SrcType: ds.Type(),
@@ -95,7 +95,7 @@ func (ds *decodeState) saveErrorAndSkip(destValue reflect.Value, srcValue interf
9595
// completes the decoding as best it can. If no more serious errors are
9696
// encountered, Decode returns an DecodeConvertError describing the earliest
9797
// such error.
98-
func (d *Decoder) Decode(v interface{}) (err error) {
98+
func (d *Decoder) Decode(v any) (err error) {
9999
defer handleAbort(&err)
100100
ds := &decodeState{
101101
Decoder: d,
@@ -634,7 +634,7 @@ func (ev extensionValue) MarshalMsgPack(e *Encoder) error {
634634
return e.PackExtension(ev.kind, ev.data)
635635
}
636636

637-
func decodeNoReflect(ds *decodeState) (x interface{}) {
637+
func decodeNoReflect(ds *decodeState) (x any) {
638638
switch ds.Type() {
639639
case Int:
640640
return ds.Int()
@@ -652,7 +652,7 @@ func decodeNoReflect(ds *decodeState) (x interface{}) {
652652
return ds.Bytes()
653653
case ArrayLen:
654654
n := ds.Len()
655-
a := make([]interface{}, n)
655+
a := make([]any, n)
656656
for i := 0; i < n; i++ {
657657
ds.unpack()
658658
a[i] = decodeNoReflect(ds)
@@ -661,7 +661,7 @@ func decodeNoReflect(ds *decodeState) (x interface{}) {
661661

662662
case MapLen:
663663
n := ds.Len()
664-
m := make(map[string]interface{})
664+
m := make(map[string]any)
665665
for i := 0; i < n; i++ {
666666
ds.unpack()
667667

0 commit comments

Comments
 (0)