]> Cypherpunks repositories - gostls13.git/commitdiff
database/sql,testing/quick: use reflect.Value.SetZero
authorDaniel Martí <mvdan@mvdan.cc>
Sat, 1 Apr 2023 15:19:52 +0000 (16:19 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 4 Apr 2023 07:16:34 +0000 (07:16 +0000)
Change-Id: I2893a6aa8c2715f69745f424262c20c21370b05f
Reviewed-on: https://go-review.googlesource.com/c/go/+/481355
Reviewed-by: Michael Knyszek <mknyszek@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>

src/database/sql/convert.go
src/testing/quick/quick.go

index 32941cb4c2f2989c71ca81f80bd9c835f48279ef..ffc4e497b4c1cb720ab468ccaf65dc16aac58695 100644 (file)
@@ -422,7 +422,7 @@ func convertAssignRows(dest, src any, rows *Rows) error {
        switch dv.Kind() {
        case reflect.Pointer:
                if src == nil {
-                       dv.Set(reflect.Zero(dv.Type()))
+                       dv.SetZero()
                        return nil
                }
                dv.Set(reflect.New(dv.Type().Elem()))
index 95a635badec19e41be00fe83235e988d8f2c255b..d7117420a370f8fef1a8fac653aa766c178b10d8 100644 (file)
@@ -115,7 +115,7 @@ func sizedValue(t reflect.Type, rand *rand.Rand, size int) (value reflect.Value,
                }
        case reflect.Pointer:
                if rand.Intn(size) == 0 {
-                       v.Set(reflect.Zero(concrete)) // Generate nil pointer.
+                       v.SetZero() // Generate nil pointer.
                } else {
                        elem, ok := sizedValue(concrete.Elem(), rand, size)
                        if !ok {