parser: upgrade golang version to 1.21 (#55738)

close #55733
pingcap · Aug 29, 2024 · 53e5a00 · 53e5a00
1 parent 47ca7be
commit 53e5a00
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 7 deletions.
diff --git a/pkg/parser/charset/BUILD.bazel b/pkg/parser/charset/BUILD.bazel
@@ -20,7 +20,6 @@ go_library(
         "//pkg/parser/terror",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_log//:log",
-        "@org_golang_x_exp//slices",
         "@org_golang_x_text//encoding",
         "@org_golang_x_text//encoding/charmap",
         "@org_golang_x_text//encoding/japanese",

diff --git a/pkg/parser/charset/charset.go b/pkg/parser/charset/charset.go
@@ -14,14 +14,14 @@
 package charset
 
 import (
+	"slices"
 	"strings"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/parser/terror"
 	"go.uber.org/zap"
-	"golang.org/x/exp/slices"
 )
 
 var (

diff --git a/pkg/parser/go.mod b/pkg/parser/go.mod
@@ -1,6 +1,6 @@
 module github.com/pingcap/tidb/pkg/parser
 
-go 1.19
+go 1.21
 
 require (
 	github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548

diff --git a/pkg/parser/goyacc/BUILD.bazel b/pkg/parser/goyacc/BUILD.bazel
@@ -14,7 +14,6 @@ go_library(
         "@com_github_cznic_sortutil//:sortutil",
         "@com_github_cznic_strutil//:strutil",
         "@com_github_pingcap_errors//:errors",
-        "@org_golang_x_exp//slices",
         "@org_modernc_parser//yacc",
         "@org_modernc_y//:y",
     ],

diff --git a/pkg/parser/goyacc/main.go b/pkg/parser/goyacc/main.go
@@ -135,13 +135,13 @@ import (
 	"log"
 	"os"
 	"runtime"
+	"slices"
 	"sort"
 	"strings"
 
 	"github.com/cznic/mathutil"
 	"github.com/cznic/sortutil"
 	"github.com/cznic/strutil"
-	"golang.org/x/exp/slices"
 	parser "modernc.org/parser/yacc"
 	"modernc.org/y"
 )

diff --git a/pkg/parser/types/BUILD.bazel b/pkg/parser/types/BUILD.bazel
@@ -15,7 +15,6 @@ go_library(
         "//pkg/parser/mysql",
         "//pkg/parser/terror",
         "@com_github_cznic_mathutil//:mathutil",
-        "@org_golang_x_exp//slices",
     ],
 )
 

diff --git a/pkg/parser/types/field_type.go b/pkg/parser/types/field_type.go
@@ -17,14 +17,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"slices"
 	"strings"
 	"unsafe"
 
 	"github.com/cznic/mathutil"
 	"github.com/pingcap/tidb/pkg/parser/charset"
 	"github.com/pingcap/tidb/pkg/parser/format"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
-	"golang.org/x/exp/slices"
 )
 
 // UnspecifiedLength is unspecified length.