From da24c95ce09668a0d977c208e8e610a21b98b019 Mon Sep 17 00:00:00 2001 From: weeellz Date: Sat, 14 Apr 2018 18:07:20 +0300 Subject: [PATCH] database/sql: remove unnecessary else conditions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes golint warning about "if block ends with a return statement, so drop this else and outdent its block". Change-Id: Iac4fd324e04e3e3fe3e3933f5e59095041d292c5 Reviewed-on: https://go-review.googlesource.com/107115 Reviewed-by: Daniel Martí Reviewed-by: Daniel Theophanes Run-TryBot: Daniel Martí TryBot-Result: Gobot Gobot --- src/database/sql/convert.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/database/sql/convert.go b/src/database/sql/convert.go index b79ec3f7b2..92a2ebe0e9 100644 --- a/src/database/sql/convert.go +++ b/src/database/sql/convert.go @@ -379,10 +379,9 @@ func convertAssign(dest, src interface{}) error { if src == nil { dv.Set(reflect.Zero(dv.Type())) return nil - } else { - dv.Set(reflect.New(dv.Type().Elem())) - return convertAssign(dv.Interface(), src) } + dv.Set(reflect.New(dv.Type().Elem())) + return convertAssign(dv.Interface(), src) case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: s := asString(src) i64, err := strconv.ParseInt(s, 10, dv.Type().Bits()) @@ -434,11 +433,10 @@ func strconvErr(err error) error { func cloneBytes(b []byte) []byte { if b == nil { return nil - } else { - c := make([]byte, len(b)) - copy(c, b) - return c } + c := make([]byte, len(b)) + copy(c, b) + return c } func asString(src interface{}) string { -- 2.48.1