From 311145cf0d0c9e80efb23b959f58bfa33d7f4c88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sat, 1 Apr 2023 16:19:52 +0100 Subject: [PATCH] database/sql,testing/quick: use reflect.Value.SetZero MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I2893a6aa8c2715f69745f424262c20c21370b05f Reviewed-on: https://go-review.googlesource.com/c/go/+/481355 Reviewed-by: Michael Knyszek TryBot-Result: Gopher Robot Reviewed-by: Emmanuel Odeke Reviewed-by: Ian Lance Taylor Run-TryBot: Daniel Martí --- src/database/sql/convert.go | 2 +- src/testing/quick/quick.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 { -- 2.50.0