Skip to content

Commit b69c4a8

Browse files
mohansonjorgemmsilva
authored andcommitted
rlp: replace reflect.PtrTo with reflect.PointerTo (ethereum#29488)
reflect.PtrTo has been deprecated and superseded by reflect.PointerTo
1 parent 6c1026a commit b69c4a8

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

rlp/decode.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,17 @@ func makeDecoder(typ reflect.Type, tags rlpstruct.Tags) (dec decoder, err error)
158158
switch {
159159
case typ == rawValueType:
160160
return decodeRawValue, nil
161-
case typ.AssignableTo(reflect.PtrTo(bigInt)):
161+
case typ.AssignableTo(reflect.PointerTo(bigInt)):
162162
return decodeBigInt, nil
163163
case typ.AssignableTo(bigInt):
164164
return decodeBigIntNoPtr, nil
165-
case typ == reflect.PtrTo(u256Int):
165+
case typ == reflect.PointerTo(u256Int):
166166
return decodeU256, nil
167167
case typ == u256Int:
168168
return decodeU256NoPtr, nil
169169
case kind == reflect.Ptr:
170170
return makePtrDecoder(typ, tags)
171-
case reflect.PtrTo(typ).Implements(decoderInterface):
171+
case reflect.PointerTo(typ).Implements(decoderInterface):
172172
return decodeDecoder, nil
173173
case isUint(kind):
174174
return decodeUint, nil
@@ -262,7 +262,7 @@ func decodeU256(s *Stream, val reflect.Value) error {
262262

263263
func makeListDecoder(typ reflect.Type, tag rlpstruct.Tags) (decoder, error) {
264264
etype := typ.Elem()
265-
if etype.Kind() == reflect.Uint8 && !reflect.PtrTo(etype).Implements(decoderInterface) {
265+
if etype.Kind() == reflect.Uint8 && !reflect.PointerTo(etype).Implements(decoderInterface) {
266266
if typ.Kind() == reflect.Array {
267267
return decodeByteArray, nil
268268
}
@@ -474,7 +474,7 @@ func makeSimplePtrDecoder(etype reflect.Type, etypeinfo *typeinfo) decoder {
474474
//
475475
// This decoder is used for pointer-typed struct fields with struct tag "nil".
476476
func makeNilPtrDecoder(etype reflect.Type, etypeinfo *typeinfo, ts rlpstruct.Tags) decoder {
477-
typ := reflect.PtrTo(etype)
477+
typ := reflect.PointerTo(etype)
478478
nilPtr := reflect.Zero(typ)
479479

480480
// Determine the value kind that results in nil pointer.

rlp/encode.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,17 @@ func makeWriter(typ reflect.Type, ts rlpstruct.Tags) (writer, error) {
141141
switch {
142142
case typ == rawValueType:
143143
return writeRawValue, nil
144-
case typ.AssignableTo(reflect.PtrTo(bigInt)):
144+
case typ.AssignableTo(reflect.PointerTo(bigInt)):
145145
return writeBigIntPtr, nil
146146
case typ.AssignableTo(bigInt):
147147
return writeBigIntNoPtr, nil
148-
case typ == reflect.PtrTo(u256Int):
148+
case typ == reflect.PointerTo(u256Int):
149149
return writeU256IntPtr, nil
150150
case typ == u256Int:
151151
return writeU256IntNoPtr, nil
152152
case kind == reflect.Ptr:
153153
return makePtrWriter(typ, ts)
154-
case reflect.PtrTo(typ).Implements(encoderInterface):
154+
case reflect.PointerTo(typ).Implements(encoderInterface):
155155
return makeEncoderWriter(typ), nil
156156
case isUint(kind):
157157
return writeUint, nil

0 commit comments

Comments
 (0)