all: replace reflect.Value.Type.Kind with reflect.Value.Kind

Fixes #46107

Change-Id: I170f3cacda652752cd740e04b565a616a0e43fd1
Reviewed-on: https://go-review.googlesource.com/c/go/+/632635
Reviewed-by: Rob Pike <r@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Commit-Queue: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>

diff --git a/src/cmd/fix/cftype.go b/src/cmd/fix/cftype.go
index d4fcc4485e5791b9c00725de145ea5bfe4845c28..04ece9fe5b407947ff7c32db0ca9585debca8de6 100644 (file)
--- a/src/cmd/fix/cftype.go
+++ b/src/cmd/fix/cftype.go
@@ -67,14 +67,14 @@ func typefix(f *ast.File, badType func(string) bool) bool {
                                return
                        }
                        v := reflect.ValueOf(n)
-                       if v.Type().Kind() != reflect.Pointer {
+                       if v.Kind() != reflect.Pointer {
                                return
                        }
                        if v.IsNil() {
                                return
                        }
                        v = v.Elem()
-                       if v.Type().Kind() != reflect.Struct {
+                       if v.Kind() != reflect.Struct {
                                return
                        }
                        for i := 0; i < v.NumField(); i++ {

diff --git a/src/encoding/gob/decoder.go b/src/encoding/gob/decoder.go
index eae307838e201e150c17a890349df60110c5a50d..c35398d1054e9ee255b3f27a67e7dc1bdcba04e2 100644 (file)
--- a/src/encoding/gob/decoder.go
+++ b/src/encoding/gob/decoder.go
@@ -199,7 +199,7 @@ func (dec *Decoder) Decode(e any) error {
        value := reflect.ValueOf(e)
        // If e represents a value as opposed to a pointer, the answer won't
        // get back to the caller. Make sure it's a pointer.
-       if value.Type().Kind() != reflect.Pointer {
+       if value.Kind() != reflect.Pointer {
                dec.err = errors.New("gob: attempt to decode into a non-pointer")
                return dec.err
        }

diff --git a/src/encoding/gob/encode.go b/src/encoding/gob/encode.go
index 5f4d2539faafe3c783ac1102e3546cc45064ee71..ed3494218ce70efc4027167662519bf1a7837358 100644 (file)
--- a/src/encoding/gob/encode.go
+++ b/src/encoding/gob/encode.go
@@ -662,7 +662,7 @@ func (enc *Encoder) encode(b *encBuffer, value reflect.Value, ut *userTypeInfo)
        for i := 0; i < indir; i++ {
                value = reflect.Indirect(value)
        }
-       if ut.externalEnc == 0 && value.Type().Kind() == reflect.Struct {
+       if ut.externalEnc == 0 && value.Kind() == reflect.Struct {
                enc.encodeStruct(b, engine, value)
        } else {
                enc.encodeSingle(b, engine, value)

diff --git a/src/encoding/xml/read.go b/src/encoding/xml/read.go
index 3cc4968c762f3be408b7497fdc0a540fe9acf676..af25c20f0618dc815daf4ab8cb49fd98abac6945 100644 (file)
--- a/src/encoding/xml/read.go
+++ b/src/encoding/xml/read.go
@@ -280,7 +280,7 @@ func (d *Decoder) unmarshalAttr(val reflect.Value, attr Attr) error {
                }
        }
 
-       if val.Type().Kind() == reflect.Slice && val.Type().Elem().Kind() != reflect.Uint8 {
+       if val.Kind() == reflect.Slice && val.Type().Elem().Kind() != reflect.Uint8 {
                // Slice of element values.
                // Grow slice.
                n := val.Len()