Skip to content

Commit 9ae69ea

Browse files
authored
Merge pull request #430 from kolyshkin/ptr
Switch from reflect.Ptr to reflect.Pointer
2 parents 399fd76 + a12ae41 commit 9ae69ea

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

dbus.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func storeInterfaces(src, dest any) error {
6060
}
6161

6262
func store(dest, src reflect.Value) error {
63-
if dest.Kind() == reflect.Ptr {
63+
if dest.Kind() == reflect.Pointer {
6464
if dest.IsNil() {
6565
dest.Set(reflect.New(dest.Type().Elem()))
6666
}
@@ -119,7 +119,7 @@ func isConvertibleTo(dest, src reflect.Type) bool {
119119
case dest.Kind() == reflect.Slice:
120120
return src.Kind() == reflect.Slice &&
121121
isConvertibleTo(dest.Elem(), src.Elem())
122-
case dest.Kind() == reflect.Ptr:
122+
case dest.Kind() == reflect.Pointer:
123123
dest = dest.Elem()
124124
return isConvertibleTo(dest, src)
125125
case dest.Kind() == reflect.Struct:
@@ -358,7 +358,7 @@ func alignment(t reflect.Type) int {
358358
return 4
359359
case reflect.Uint64, reflect.Int64, reflect.Float64, reflect.Struct:
360360
return 8
361-
case reflect.Ptr:
361+
case reflect.Pointer:
362362
return alignment(t.Elem())
363363
}
364364
return 1

encoder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func (enc *encoder) encode(v reflect.Value, depth int) {
148148
panic(err)
149149
}
150150
enc.pos += n
151-
case reflect.Ptr:
151+
case reflect.Pointer:
152152
enc.encode(v.Elem(), depth)
153153
case reflect.Slice, reflect.Array:
154154
// Lookahead offset: 4 bytes for uint32 length (with alignment),

sig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func getSignature(t reflect.Type, depth *depthCounter) (sig string) {
8181
return "t"
8282
case reflect.Float64:
8383
return "d"
84-
case reflect.Ptr:
84+
case reflect.Pointer:
8585
return getSignature(t.Elem(), depth)
8686
case reflect.String:
8787
if t == objectPathType {

0 commit comments

Comments
 (0)