*: use std/slices to replace exp/slices (#46107)

close #45933
pingcap · Aug 15, 2023 · 04f96b5 · 04f96b5
1 parent 6fd1924
commit 04f96b5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/types/BUILD.bazel b/types/BUILD.bazel
@@ -61,7 +61,6 @@ go_library(
         "//util/stringutil",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_log//:log",
-        "@org_golang_x_exp//slices",
         "@org_uber_go_zap//:zap",
     ],
 )

diff --git a/types/json_binary.go b/types/json_binary.go
@@ -16,12 +16,14 @@ package types
 
 import (
 	"bytes"
+	"cmp"
 	"encoding/base64"
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
 	"math"
 	"reflect"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -33,7 +35,6 @@ import (
 	"github.com/pingcap/tidb/util/hack"
 	"github.com/pingcap/tidb/util/logutil"
 	"go.uber.org/zap"
-	"golang.org/x/exp/slices"
 )
 
 /*
@@ -835,8 +836,8 @@ func appendBinaryObject(buf []byte, x map[string]interface{}) ([]byte, error) {
 	for key, val := range x {
 		fields = append(fields, field{key: key, val: val})
 	}
-	slices.SortFunc(fields, func(i, j field) bool {
-		return i.key < j.key
+	slices.SortFunc(fields, func(i, j field) int {
+		return cmp.Compare(i.key, j.key)
 	})
 	for i, field := range fields {
 		keyEntryOff := keyEntryBegin + i*keyEntrySize

diff --git a/types/json_binary_functions.go b/types/json_binary_functions.go
@@ -20,14 +20,14 @@ import (
 	"encoding/hex"
 	"fmt"
 	"math"
+	"slices"
 	"sort"
 	"unicode/utf8"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/parser/mysql"
 	"github.com/pingcap/tidb/util/hack"
 	"github.com/pingcap/tidb/util/stringutil"
-	"golang.org/x/exp/slices"
 )
 
 // Type returns type of BinaryJSON as string.
@@ -933,9 +933,7 @@ func mergePatchBinaryJSON(target, patch *BinaryJSON) (result *BinaryJSON, err er
 		for key := range keyValMap {
 			keys = append(keys, []byte(key))
 		}
-		slices.SortFunc(keys, func(i, j []byte) bool {
-			return bytes.Compare(i, j) < 0
-		})
+		slices.SortFunc(keys, bytes.Compare)
 		length = len(keys)
 		values := make([]BinaryJSON, 0, len(keys))
 		for i := 0; i < length; i++ {
@@ -1016,9 +1014,7 @@ func mergeBinaryObject(objects []BinaryJSON) BinaryJSON {
 			}
 		}
 	}
-	slices.SortFunc(keys, func(i, j []byte) bool {
-		return bytes.Compare(i, j) < 0
-	})
+	slices.SortFunc(keys, bytes.Compare)
 	values := make([]BinaryJSON, len(keys))
 	for i, key := range keys {
 		values[i] = keyValMap[string(key)]