Skip to content

Commit 4ae48e9

Browse files
zrbeckerdolmen
authored andcommitted
Combine switch cases, difference wrapped in if statement
1 parent 2f7efa2 commit 4ae48e9

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

assert/assertions.go

+6-13
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,13 @@ func copyExportedFields(expected interface{}) interface{} {
114114
result.Elem().Set(reflect.ValueOf(unexportedRemoved))
115115
return result.Interface()
116116

117-
case reflect.Array:
118-
result := reflect.New(reflect.ArrayOf(expectedValue.Len(), expectedType.Elem())).Elem()
119-
for i := 0; i < expectedValue.Len(); i++ {
120-
index := expectedValue.Index(i)
121-
if isNil(index) {
122-
continue
123-
}
124-
unexportedRemoved := copyExportedFields(index.Interface())
125-
result.Index(i).Set(reflect.ValueOf(unexportedRemoved))
117+
case reflect.Array, reflect.Slice:
118+
var result reflect.Value
119+
if expectedKind == reflect.Array {
120+
result = reflect.New(reflect.ArrayOf(expectedValue.Len(), expectedType.Elem())).Elem()
121+
} else {
122+
result = reflect.MakeSlice(expectedType, expectedValue.Len(), expectedValue.Len())
126123
}
127-
return result.Interface()
128-
129-
case reflect.Slice:
130-
result := reflect.MakeSlice(expectedType, expectedValue.Len(), expectedValue.Len())
131124
for i := 0; i < expectedValue.Len(); i++ {
132125
index := expectedValue.Index(i)
133126
if isNil(index) {

0 commit comments

Comments
 (0)