Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rewrite interface{} to any #178

Merged
merged 1 commit into from
May 14, 2024
Merged

Rewrite interface{} to any #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions msgpack/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type DecodeConvertError struct {
// The MessagePack type of the value.
SrcType Type
// Option value.
SrcValue interface{}
SrcValue any
// Type of the Go value that could not be assigned to.
DestType reflect.Type
}
Expand Down Expand Up @@ -57,7 +57,7 @@ func (ds *decodeState) skip() {
}
}

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

func decodeNoReflect(ds *decodeState) (x interface{}) {
func decodeNoReflect(ds *decodeState) (x any) {
switch ds.Type() {
case Int:
return ds.Int()
Expand All @@ -652,7 +652,7 @@ func decodeNoReflect(ds *decodeState) (x interface{}) {
return ds.Bytes()
case ArrayLen:
n := ds.Len()
a := make([]interface{}, n)
a := make([]any, n)
for i := 0; i < n; i++ {
ds.unpack()
a[i] = decodeNoReflect(ds)
Expand All @@ -661,7 +661,7 @@ func decodeNoReflect(ds *decodeState) (x interface{}) {

case MapLen:
n := ds.Len()
m := make(map[string]interface{})
m := make(map[string]any)
for i := 0; i < n; i++ {
ds.unpack()

Expand Down
Loading
Loading