From 53e5a002dda3fcfecbc0beb13072277fc82b7dbb Mon Sep 17 00:00:00 2001
From: lance6716 <lance6716@gmail.com>
Date: Thu, 29 Aug 2024 12:40:18 +0800
Subject: [PATCH] parser: upgrade golang version to 1.21 (#55738)

close pingcap/tidb#55733
---
 pkg/parser/charset/BUILD.bazel | 1 -
 pkg/parser/charset/charset.go  | 2 +-
 pkg/parser/go.mod              | 2 +-
 pkg/parser/goyacc/BUILD.bazel  | 1 -
 pkg/parser/goyacc/main.go      | 2 +-
 pkg/parser/types/BUILD.bazel   | 1 -
 pkg/parser/types/field_type.go | 2 +-
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkg/parser/charset/BUILD.bazel b/pkg/parser/charset/BUILD.bazel
index 1f65d7a18b..56718a7644 100644
--- 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
index 2be7b9c21d..69adcae00e 100644
--- a/pkg/parser/charset/charset.go
+++ b/pkg/parser/charset/charset.go
@@ -14,6 +14,7 @@
 package charset
 
 import (
+	"slices"
 	"strings"
 
 	"github.com/pingcap/errors"
@@ -21,7 +22,6 @@ import (
 	"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
index b5f9b3b646..b48c5dbbbc 100644
--- 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
index 2759d26126..8fc378a5e2 100644
--- 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
index 9c587896a2..f691f4ecf4 100644
--- 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
index 5c60603c8b..4e82ed0da8 100644
--- 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
index da66f2b1b7..917a6dba50 100644
--- a/pkg/parser/types/field_type.go
+++ b/pkg/parser/types/field_type.go
@@ -17,6 +17,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"slices"
 	"strings"
 	"unsafe"
 
@@ -24,7 +25,6 @@ import (
 	"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.