From 5bca076182676b0364693d811b93d8273663b814 Mon Sep 17 00:00:00 2001
From: Ivan Daunis <idaunis@gmail.com>
Date: Mon, 17 May 2021 14:11:56 -0700
Subject: [PATCH] Refactor to interface convert

---
 convert.go | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/convert.go b/convert.go
index 7c8ff198..de9ba9ba 100644
--- a/convert.go
+++ b/convert.go
@@ -389,6 +389,11 @@ func NullAssignTo(dst interface{}) error {
 
 var kindTypes map[reflect.Kind]reflect.Type
 
+func toInterface(dst reflect.Value, t reflect.Type) (interface{}, bool) {
+	nextDst := dst.Convert(t)
+	return nextDst.Interface(), dst.Type() != nextDst.Type()
+}
+
 // GetAssignToDstType attempts to convert dst to something AssignTo can assign
 // to. If dst is a pointer to pointer it allocates a value and returns the
 // dereferences pointer. If dst is a named type such as *Foo where Foo is type
@@ -414,23 +419,18 @@ func GetAssignToDstType(dst interface{}) (interface{}, bool) {
 
 	// if dst is pointer to a base type that has been renamed
 	if baseValType, ok := kindTypes[dstVal.Kind()]; ok {
-		nextDst := dstPtr.Convert(reflect.PtrTo(baseValType))
-		return nextDst.Interface(), dstPtr.Type() != nextDst.Type()
+		return toInterface(dstPtr, reflect.PtrTo(baseValType))
 	}
 
 	if dstVal.Kind() == reflect.Slice {
 		if baseElemType, ok := kindTypes[dstVal.Type().Elem().Kind()]; ok {
-			baseSliceType := reflect.PtrTo(reflect.SliceOf(baseElemType))
-			nextDst := dstPtr.Convert(baseSliceType)
-			return nextDst.Interface(), dstPtr.Type() != nextDst.Type()
+			return toInterface(dstPtr, reflect.PtrTo(reflect.SliceOf(baseElemType)))
 		}
 	}
 
 	if dstVal.Kind() == reflect.Array {
 		if baseElemType, ok := kindTypes[dstVal.Type().Elem().Kind()]; ok {
-			baseArrayType := reflect.PtrTo(reflect.ArrayOf(dstVal.Len(), baseElemType))
-			nextDst := dstPtr.Convert(baseArrayType)
-			return nextDst.Interface(), dstPtr.Type() != nextDst.Type()
+			return toInterface(dstPtr, reflect.PtrTo(reflect.ArrayOf(dstVal.Len(), baseElemType)))
 		}
 	}
 
@@ -440,9 +440,7 @@ func GetAssignToDstType(dst interface{}) (interface{}, bool) {
 			nested := dstVal.Type().Field(0).Type
 			if nested.Kind() == reflect.Array {
 				if baseElemType, ok := kindTypes[nested.Elem().Kind()]; ok {
-					baseArrayType := reflect.PtrTo(reflect.ArrayOf(nested.Len(), baseElemType))
-					nextDst := dstPtr.Convert(baseArrayType)
-					return nextDst.Interface(), dstPtr.Type() != nextDst.Type()
+					return toInterface(dstPtr, reflect.PtrTo(reflect.ArrayOf(nested.Len(), baseElemType)))
 				}
 			}
 			if _, ok := kindTypes[nested.Kind()]; ok && dstPtr.CanInterface() {