From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 1 Apr 2023 15:19:52 +0000 (+0100)
Subject: database/sql,testing/quick: use reflect.Value.SetZero
X-Git-Tag: go1.21rc1~1057
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=311145cf0d0c9e80efb23b959f58bfa33d7f4c88;p=gostls13.git

database/sql,testing/quick: use reflect.Value.SetZero

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>
---

diff --git a/src/database/sql/convert.go b/src/database/sql/convert.go
index 32941cb4c2..ffc4e497b4 100644
--- a/src/database/sql/convert.go
+++ b/src/database/sql/convert.go
@@ -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()))
diff --git a/src/testing/quick/quick.go b/src/testing/quick/quick.go
index 95a635bade..d7117420a3 100644
--- a/src/testing/quick/quick.go
+++ b/src/testing/quick/quick.go
@@ -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 {