optimize tailing nil removal

jedib0t · Nov 27, 2024 · 40cde39 · 40cde39
1 parent 2a23c39
commit 40cde39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/table/util.go b/table/util.go
@@ -92,15 +92,15 @@ func objAsSlice(in interface{}) []interface{} {
 	}
 
 	// remove trailing nil pointers
+	tailIdx := len(out)
 	for i := len(out) - 1; i >= 0; i-- {
 		val := reflect.ValueOf(out[i])
-		if val.Kind() == reflect.Ptr && val.IsNil() {
-			out = out[:i]
-		} else {
+		if val.Kind() != reflect.Ptr || !val.IsNil() {
 			break
 		}
+		tailIdx = i
 	}
-	return out
+	return out[:tailIdx]
 }
 
 func objIsSlice(in interface{}) bool {

diff --git a/table/util_test.go b/table/util_test.go
@@ -58,6 +58,8 @@ func Test_objAsSlice(t *testing.T) {
 	assert.Equal(t, "[1 2 3]", fmt.Sprint(objAsSlice(&[]int{a, b, c})))
 	assert.Equal(t, "[1 2 3]", fmt.Sprint(objAsSlice(&[]*int{&a, &b, &c})))
 	assert.Equal(t, "[1 2]", fmt.Sprint(objAsSlice(&[]*int{&a, &b, nil})))
+	assert.Equal(t, "[1]", fmt.Sprint(objAsSlice(&[]*int{&a, nil, nil})))
+	assert.Equal(t, "[]", fmt.Sprint(objAsSlice(&[]*int{nil, nil, nil})))
 	assert.Equal(t, "[<nil> 2]", fmt.Sprint(objAsSlice(&[]*int{nil, &b, nil})))
 }