Fall back to 'sort.Slice' on Go 1.7 where 'sort.SliceStable' does not…

… exist
golang · Jul 28, 2018 · 1baf6ee · 1baf6ee
1 parent 224a564
commit 1baf6ee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/gps/constraint.go b/gps/constraint.go
@@ -6,7 +6,6 @@ package gps
 
 import (
 	"fmt"
-	"sort"
 
 	"github.com/Masterminds/semver"
 	"github.com/golang/dep/gps/internal/pb"
@@ -375,7 +374,7 @@ func (m ProjectConstraints) overrideAll(pcm ProjectConstraints) (out []workingCo
 		k++
 	}
 
-	sort.SliceStable(out, func(i, j int) bool {
+	sortSlice(out, func(i, j int) bool {
 		return out[i].Ident.Less(out[j].Ident)
 	})
 	return

diff --git a/gps/lock_test.go b/gps/lock_test.go
@@ -21,7 +21,7 @@ func TestLockedProjectSorting(t *testing.T) {
 	lps2 := make([]LockedProject, len(lps))
 	copy(lps2, lps)
 
-	sort.SliceStable(lps2, func(i, j int) bool {
+	sortSlice(lps2, func(i, j int) bool {
 		return lps2[i].Ident().Less(lps2[j].Ident())
 	})
 

diff --git a/gps/sort_go_1_8.go b/gps/sort_go_1_8.go
@@ -0,0 +1,9 @@
+// +build go1.8
+
+package gps
+
+import "sort"
+
+func sortSlice(slice interface{}, less func(i, j int) bool) {
+	sort.SliceStable(slice, less)
+}
diff --git a/gps/sort_pre_go_1_8.go b/gps/sort_pre_go_1_8.go
@@ -0,0 +1,9 @@
+// +build !go1.8
+
+package gps
+
+import "sort"
+
+func sortSlice(slice interface{}, less func(i, j int) bool) {
+	sort.Slice(slice, less)
+}