util simplify partitionAll

nomad/util.go

@@ -200,30 +200,23 @@ func shuffleStrings(list []string) {
 // size of `size`. All entries from the original slice are preserved. The last slice may be
 // smaller than `size`. The input slice is unmodified
 func partitionAll(size int, xs []string) [][]string {
-	out := make([][]string, 0)
 	if size < 1 {
-		return append(out, xs)
+		return [][]string{xs}
 	}
 
-	got, part, i, j := 0, 0, 0, 0
-	for got < len(xs) {
-		i = size * part
-		j = minInt(size*(part+1), len(xs))
+	out := [][]string{}
+
+	for i := 0; i < len(xs); i += size {
+		j := i + size
+		if j > len(xs) {
+			j = len(xs)
+		}
 		out = append(out, xs[i:j])
-		part = part + 1
-		got = j
 	}
 
 	return out
 }
 
-func minInt(x, y int) int {
-	if x < y {
-		return x
-	}
-	return y
-}
-
 // maxUint64 returns the maximum value
 func maxUint64(inputs ...uint64) uint64 {
 	l := len(inputs)