go fmt

issue38_test.go

@@ -27,8 +27,7 @@ func TestIssue38Merge(t *testing.T) {
 }
 
 func TestIssue38MergeEmptyStruct(t *testing.T) {
-	dst := structWithoutTimePointer{
-	}
+	dst := structWithoutTimePointer{}
 
 	expected := time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)
 	src := structWithoutTimePointer{

map.go

@@ -39,7 +39,7 @@ func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int, over
 		typ := dst.Type()
 		for p := seen; p != nil; p = p.next {
 			if p.ptr == addr && p.typ == typ {
-					return nil
+				return nil
 			}
 		}
 		// Remember, remember...
@@ -97,15 +97,15 @@ func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int, over
 				continue
 			}
 			if srcKind == dstKind {
-				if err = deepMerge(dstElement, srcElement, visited, depth + 1, overwrite); err != nil {
+				if err = deepMerge(dstElement, srcElement, visited, depth+1, overwrite); err != nil {
 					return
 				}
 			} else if dstKind == reflect.Interface && dstElement.Kind() == reflect.Interface {
-				if err = deepMerge(dstElement, srcElement, visited, depth + 1, overwrite); err != nil {
+				if err = deepMerge(dstElement, srcElement, visited, depth+1, overwrite); err != nil {
 					return
 				}
 			} else if srcKind == reflect.Map {
-				if err = deepMap(dstElement, srcElement, visited, depth + 1, overwrite); err != nil {
+				if err = deepMap(dstElement, srcElement, visited, depth+1, overwrite); err != nil {
 					return
 				}
 			} else {
@@ -140,7 +140,7 @@ func MapWithOverwrite(dst, src interface{}) error {
 func _map(dst, src interface{}, overwrite bool) error {
 	var (
 		vDst, vSrc reflect.Value
-		err error
+		err        error
 	)
 	if vDst, vSrc, err = resolveValues(dst, src); err != nil {
 		return err

merge.go

@@ -38,7 +38,7 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, ov
 		typ := dst.Type()
 		for p := seen; p != nil; p = p.next {
 			if p.ptr == addr && p.typ == typ {
-					return nil
+				return nil
 			}
 		}
 		// Remember, remember...
@@ -109,11 +109,11 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, ov
 					dst.Set(src)
 				}
 			} else if src.Kind() == reflect.Ptr {
-				if err = deepMerge(dst.Elem(), src.Elem(), visited, depth + 1, overwrite); err != nil {
+				if err = deepMerge(dst.Elem(), src.Elem(), visited, depth+1, overwrite); err != nil {
 					return
 				}
 			} else if dst.Elem().Type() == src.Type() {
-				if err = deepMerge(dst.Elem(), src, visited, depth + 1, overwrite); err != nil {
+				if err = deepMerge(dst.Elem(), src, visited, depth+1, overwrite); err != nil {
 					return
 				}
 			} else {

mergo_test.go

@@ -6,11 +6,11 @@
 package mergo
 
 import (
+	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"reflect"
 	"testing"
 	"time"
-	"gopkg.in/yaml.v2"
 )
 
 type simpleTest struct {
@@ -277,12 +277,12 @@ func TestEmptyToEmptyMaps(t *testing.T) {
 
 func TestEmptyToNotEmptyMaps(t *testing.T) {
 	a := mapTest{map[int]int{
-		1 : 2,
-		3 : 4,
+		1: 2,
+		3: 4,
 	}}
 	aa := mapTest{map[int]int{
-		1 : 2,
-		3 : 4,
+		1: 2,
+		3: 4,
 	}}
 	b := mapTest{
 		map[int]int{},