pkg: Use sort.Slice (#504)

pingcap · Mar 28, 2019 · 96a0afc · 96a0afc
1 parent a88a371
commit 96a0afc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/pkg/types/urls.go b/pkg/types/urls.go
@@ -36,7 +36,7 @@ func NewURLs(strs []string) (URLs, error) {
 		all[i] = *u
 	}
 	us := URLs(all)
-	us.Sort()
+	sort.Slice(us, func(i, j int) bool { return us[i].String() < us[j].String() })
 
 	return us, nil
 }
@@ -46,20 +46,6 @@ func (us URLs) String() string {
 	return strings.Join(us.StringSlice(), ",")
 }
 
-// Sort sorts the URLs
-func (us *URLs) Sort() {
-	sort.Sort(us)
-}
-
-// Len return the lenght of URL slice
-func (us URLs) Len() int { return len(us) }
-
-// Less compares two URL and return the less one
-func (us URLs) Less(i, j int) bool { return us[i].String() < us[j].String() }
-
-// Swap swaps two URLs in the slice
-func (us URLs) Swap(i, j int) { us[i], us[j] = us[j], us[i] }
-
 // StringSlice return a slice of formatted string of URL
 func (us URLs) StringSlice() []string {
 	out := make([]string, len(us))

diff --git a/pkg/types/urls_test.go b/pkg/types/urls_test.go
@@ -17,14 +17,19 @@ type testTypesSuite struct{}
 
 func (s *testTypesSuite) TestURLs(c *C) {
 	urlstrs := []string{
+		"http://www.google.com:12306",
+		"http://192.168.199.111:1080",
+		"http://hostname:9000",
+	}
+	sorted := []string{
 		"http://192.168.199.111:1080",
 		"http://hostname:9000",
 		"http://www.google.com:12306",
 	}
 
 	urls, err := NewURLs(urlstrs)
 	c.Assert(err, IsNil)
-	c.Assert(urls.String(), Equals, strings.Join(urlstrs, ","))
+	c.Assert(urls.String(), Equals, strings.Join(sorted, ","))
 }
 
 func (s *testTypesSuite) TestBadURLs(c *C) {