Use the new built-in min() and max() functions

Signed-off-by: Miloslav Trmač <[email protected]>

Author: mtrmac

idset.go

@@ -111,7 +111,7 @@ func (s *idSet) findAvailable(n int) (*idSet, error) {
 	iterator, cancel := s.iterator()
 	defer cancel()
 	for i := iterator(); n > 0 && i != nil; i = iterator() {
-		i.end = minInt(i.end, i.start+n)
+		i.end = min(i.end, i.start+n)
 		intervals = append(intervals, *i)
 		n -= i.length()
 	}
@@ -129,7 +129,7 @@ func (s *idSet) zip(container *idSet) []idtools.IDMap {
 	defer containerCancel()
 	var out []idtools.IDMap
 	for h, c := hostIterator(), containerIterator(); h != nil && c != nil; {
-		if n := minInt(h.length(), c.length()); n > 0 {
+		if n := min(h.length(), c.length()); n > 0 {
 			out = append(out, idtools.IDMap{
 				ContainerID: c.start,
 				HostID:      h.start,
@@ -159,12 +159,12 @@ type interval struct {
 }
 
 func (i interval) length() int {
-	return maxInt(0, i.end-i.start)
+	return max(0, i.end-i.start)
 }
 
 func (i interval) Intersect(other intervalset.Interval) intervalset.Interval {
 	j := other.(interval)
-	return interval{start: maxInt(i.start, j.start), end: minInt(i.end, j.end)}
+	return interval{start: max(i.start, j.start), end: min(i.end, j.end)}
 }
 
 func (i interval) Before(other intervalset.Interval) bool {
@@ -183,15 +183,15 @@ func (i interval) Bisect(other intervalset.Interval) (intervalset.Interval, inte
 	}
 	// Subtracting [j.start, j.end) is equivalent to the union of intersecting (-inf, j.start) and
 	// [j.end, +inf).
-	left := interval{start: i.start, end: minInt(i.end, j.start)}
-	right := interval{start: maxInt(i.start, j.end), end: i.end}
+	left := interval{start: i.start, end: min(i.end, j.start)}
+	right := interval{start: max(i.start, j.end), end: i.end}
 	return left, right
 }
 
 func (i interval) Adjoin(other intervalset.Interval) intervalset.Interval {
 	j := other.(interval)
 	if !i.IsZero() && !j.IsZero() && (i.end == j.start || j.end == i.start) {
-		return interval{start: minInt(i.start, j.start), end: maxInt(i.end, j.end)}
+		return interval{start: min(i.start, j.start), end: max(i.end, j.end)}
 	}
 	return interval{}
 }
@@ -204,24 +204,10 @@ func (i interval) Encompass(other intervalset.Interval) intervalset.Interval {
 	case j.IsZero():
 		return i
 	default:
-		return interval{start: minInt(i.start, j.start), end: maxInt(i.end, j.end)}
+		return interval{start: min(i.start, j.start), end: max(i.end, j.end)}
 	}
 }
 
-func minInt(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func maxInt(a, b int) int {
-	if a < b {
-		return b
-	}
-	return a
-}
-
 func hasOverlappingRanges(mappings []idtools.IDMap) error {
 	hostIntervals := intervalset.Empty()
 	containerIntervals := intervalset.Empty()

idset_test.go

@@ -6,18 +6,8 @@ import (
 
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/google/go-intervals/intervalset"
-	"github.com/stretchr/testify/assert"
 )
 
-func TestMinMaxInt(t *testing.T) {
-	assert.Equal(t, 5, minInt(5, 8))
-	assert.Equal(t, 3, minInt(10, 3))
-	assert.Equal(t, 2, minInt(2, 2))
-	assert.Equal(t, 8, maxInt(5, 8))
-	assert.Equal(t, 10, maxInt(10, 3))
-	assert.Equal(t, 2, maxInt(2, 2))
-}
-
 func allIntervals(s *idSet) []interval {
 	iterator, cancel := s.iterator()
 	defer cancel()

pkg/archive/changes_test.go

@@ -14,13 +14,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func max(x, y int) int {
-	if x >= y {
-		return x
-	}
-	return y
-}
-
 func copyDir(src, dst string) error {
 	cmd := exec.Command("cp", "-a", src, dst)
 	if runtime.GOOS == solaris {