pkg/archive: rename max/min as it collides with go1.21 builtin

thaJeztah · thaJeztah · commit 55192de9e3d7 · 2023-08-26T22:02:25.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/pkg/archive/changes_test.go b/pkg/archive/changes_test.go
@@ -21,7 +21,7 @@ import (
 	"gotest.tools/v3/skip"
 )
 
-func max(x, y int) int {
+func maxInt(x, y int) int {
 	if x >= y {
 		return x
 	}
@@ -404,7 +404,7 @@ func TestChangesDirsMutated(t *testing.T) {
 		{filepath.FromSlash("/symlinknew"), ChangeAdd},
 	}...)
 
-	for i := 0; i < max(len(changes), len(expectedChanges)); i++ {
+	for i := 0; i < maxInt(len(changes), len(expectedChanges)); i++ {
 		if i >= len(expectedChanges) {
 			t.Fatalf("unexpected change %s\n", changes[i].String())
 		}
@@ -530,7 +530,7 @@ func checkChanges(expectedChanges, changes []Change, t *testing.T) {
 	skip.If(t, runtime.GOOS != "windows" && os.Getuid() != 0, "skipping test that requires root")
 	sort.Sort(changesByPath(expectedChanges))
 	sort.Sort(changesByPath(changes))
-	for i := 0; i < max(len(changes), len(expectedChanges)); i++ {
+	for i := 0; i < maxInt(len(changes), len(expectedChanges)); i++ {
 		if i >= len(expectedChanges) {
 			t.Fatalf("unexpected change %s\n", changes[i].String())
 		}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"gotest.tools/v3/skip"`
`22`	`22`	`)`
`23`	`23`
`24`		`-func max(x, y int) int {`
	`24`	`+func maxInt(x, y int) int {`
`25`	`25`	`if x >= y {`
`26`	`26`	`return x`
`27`	`27`	`}`
`@@ -404,7 +404,7 @@ func TestChangesDirsMutated(t *testing.T) {`
`404`	`404`	`{filepath.FromSlash("/symlinknew"), ChangeAdd},`
`405`	`405`	`}...)`
`406`	`406`
`407`		`- for i := 0; i < max(len(changes), len(expectedChanges)); i++ {`
	`407`	`+ for i := 0; i < maxInt(len(changes), len(expectedChanges)); i++ {`
`408`	`408`	`if i >= len(expectedChanges) {`
`409`	`409`	`t.Fatalf("unexpected change %s\n", changes[i].String())`
`410`	`410`	`}`
`@@ -530,7 +530,7 @@ func checkChanges(expectedChanges, changes []Change, t *testing.T) {`
`530`	`530`	`skip.If(t, runtime.GOOS != "windows" && os.Getuid() != 0, "skipping test that requires root")`
`531`	`531`	`sort.Sort(changesByPath(expectedChanges))`
`532`	`532`	`sort.Sort(changesByPath(changes))`
`533`		`- for i := 0; i < max(len(changes), len(expectedChanges)); i++ {`
	`533`	`+ for i := 0; i < maxInt(len(changes), len(expectedChanges)); i++ {`
`534`	`534`	`if i >= len(expectedChanges) {`
`535`	`535`	`t.Fatalf("unexpected change %s\n", changes[i].String())`
`536`	`536`	`}`