slices: return quickly for Compact of one element

Change-Id: I993c34b2cedc18da3500d3ddcbdeeb6bbc73d10f GitHub-Last-Rev: 1620ea0 GitHub-Pull-Request: #46 Reviewed-on: https://go-review.googlesource.com/c/exp/+/448878 Auto-Submit: Keith Randall <[email protected]> Reviewed-by: Keith Randall <[email protected]> Reviewed-by: Keith Randall <[email protected]> Run-TryBot: Keith Randall <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
golang · Nov 10, 2022 · d0897a7 · d0897a7
1 parent fc8884a
commit d0897a7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/slices/slices.go b/slices/slices.go
@@ -193,7 +193,7 @@ func Clone[S ~[]E, E any](s S) S {
 // This is like the uniq command found on Unix.
 // Compact modifies the contents of the slice s; it does not create a new slice.
 func Compact[S ~[]E, E comparable](s S) S {
-	if len(s) == 0 {
+	if len(s) < 2 {
 		return s
 	}
 	i := 1
@@ -210,7 +210,7 @@ func Compact[S ~[]E, E comparable](s S) S {
 
 // CompactFunc is like Compact but uses a comparison function.
 func CompactFunc[S ~[]E, E any](s S, eq func(E, E) bool) S {
-	if len(s) == 0 {
+	if len(s) < 2 {
 		return s
 	}
 	i := 1

diff --git a/slices/slices_test.go b/slices/slices_test.go
@@ -497,30 +497,37 @@ func TestClone(t *testing.T) {
 }
 
 var compactTests = []struct {
+	name string
 	s    []int
 	want []int
 }{
 	{
+		"nil",
 		nil,
 		nil,
 	},
 	{
+		"one",
 		[]int{1},
 		[]int{1},
 	},
 	{
+		"sorted",
 		[]int{1, 2, 3},
 		[]int{1, 2, 3},
 	},
 	{
+		"1 item",
 		[]int{1, 1, 2},
 		[]int{1, 2},
 	},
 	{
+		"unsorted",
 		[]int{1, 2, 1},
 		[]int{1, 2, 1},
 	},
 	{
+		"many",
 		[]int{1, 2, 2, 3, 3, 4},
 		[]int{1, 2, 3, 4},
 	},
@@ -535,6 +542,20 @@ func TestCompact(t *testing.T) {
 	}
 }
 
+func BenchmarkCompact(b *testing.B) {
+	for _, c := range compactTests {
+		b.Run(c.name, func(b *testing.B) {
+			ss := make([]int, 0, 64)
+			for k := 0; k < b.N; k++ {
+				ss = ss[:0]
+				ss = append(ss, c.s...)
+				_ = Compact(ss)
+			}
+		})
+	}
+
+}
+
 func TestCompactFunc(t *testing.T) {
 	for _, test := range compactTests {
 		copy := Clone(test.s)