*: upgrade revive (#38287)

DEPS.bzl

@@ -2316,8 +2316,8 @@ def go_deps():
         name = "com_github_mattn_go_runewidth",
         build_file_proto_mode = "disable",
         importpath = "github.com/mattn/go-runewidth",
-        sum = "h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=",
-        version = "v0.0.13",
+        sum = "h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=",
+        version = "v0.0.14",
     )
     go_repository(
         name = "com_github_mattn_goveralls",
@@ -2375,8 +2375,8 @@ def go_deps():
         name = "com_github_mgechev_revive",
         build_file_proto_mode = "disable",
         importpath = "github.com/mgechev/revive",
-        sum = "h1:a+itKsYpxka50MyaWQW1XCZ1vwfgjzVy/OzZ7DC/4+U=",
-        version = "v1.2.4-0.20220827111817-553604eaced5",
+        sum = "h1:+2Hd/S8oO2H0Ikq2+egtNwQsVhAeELHjxjIUFX5ajLI=",
+        version = "v1.2.4",
     )
 
     go_repository(
@@ -2993,8 +2993,8 @@ def go_deps():
         patches = [
             "//build/patches:com_github_rivo_uniseg.patch",
         ],
-        sum = "h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=",
-        version = "v0.3.4",
+        sum = "h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=",
+        version = "v0.4.2",
     )
     go_repository(
         name = "com_github_rlmcpherson_s3gof3r",
@@ -4321,8 +4321,8 @@ def go_deps():
         name = "org_golang_x_sys",
         build_file_proto_mode = "disable_global",
         importpath = "golang.org/x/sys",
-        sum = "h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=",
-        version = "v0.0.0-20220909162455-aba9fc2a8ff2",
+        sum = "h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=",
+        version = "v0.0.0-20220928140112-f11e5e49a4ec",
     )
     go_repository(
         name = "org_golang_x_term",

build/patches/com_github_rivo_uniseg.patch

@@ -1,33 +1,34 @@
-From 5097c14ae5e40af636fc3bd353edd64ca1f91713 Mon Sep 17 00:00:00 2001
+From 1492043a155839cb863210d4f564be3fa640c0d9 Mon Sep 17 00:00:00 2001
 From: Weizhen Wang <wangweizhen@pingcap.com>
-Date: Mon, 29 Aug 2022 18:15:12 +0800
-Subject: [PATCH] *: update dep
+Date: Sat, 8 Oct 2022 11:41:06 +0800
+Subject: [PATCH] update
 
 Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
 ---
- BUILD.bazel       |  26 +++++
+ BUILD.bazel       |  27 +++++
  WORKSPACE         |   2 +
- gen_breaktest.go  | 213 ----------------------------------------
- gen_properties.go | 240 ----------------------------------------------
- 4 files changed, 28 insertions(+), 453 deletions(-)
+ gen_breaktest.go  | 213 --------------------------------------
+ gen_properties.go | 256 ----------------------------------------------
+ 4 files changed, 29 insertions(+), 469 deletions(-)
  create mode 100644 BUILD.bazel
  create mode 100644 WORKSPACE
  delete mode 100644 gen_breaktest.go
  delete mode 100644 gen_properties.go
 
 diff --git a/BUILD.bazel b/BUILD.bazel
 new file mode 100644
-index 0000000..c6423e8
+index 0000000..a1e5c89
 --- /dev/null
 +++ b/BUILD.bazel
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,27 @@
 +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 +
 +go_library(
 +    name = "uniseg",
 +    srcs = [
 +        "doc.go",
 +        "eastasianwidth.go",
++        "emojipresentation.go",
 +        "grapheme.go",
 +        "graphemeproperties.go",
 +        "graphemerules.go",
@@ -39,14 +40,14 @@ index 0000000..c6423e8
 +        "sentenceproperties.go",
 +        "sentencerules.go",
 +        "step.go",
++        "width.go",
 +        "word.go",
 +        "wordproperties.go",
 +        "wordrules.go",
 +    ],
 +    importpath = "github.com/rivo/uniseg",
 +    visibility = ["//visibility:public"],
 +)
-+
 diff --git a/WORKSPACE b/WORKSPACE
 new file mode 100644
 index 0000000..d596273
@@ -276,28 +277,31 @@ index e613c4c..0000000
 -}
 diff --git a/gen_properties.go b/gen_properties.go
 deleted file mode 100644
-index 6451270..0000000
+index 999d5ef..0000000
 --- a/gen_properties.go
 +++ /dev/null
-@@ -1,240 +0,0 @@
+@@ -1,256 +0,0 @@
 -//go:build generate
 -
 -// This program generates a property file in Go file from Unicode Character
 -// Database auxiliary data files. The command line arguments are as follows:
 -//
--//   1. The name of the Unicode data file (just the filename, without extension).
--//   2. The name of the locally generated Go file.
--//   3. The name of the slice mapping code points to properties.
--//   4. The name of the generator, for logging purposes.
--//   5. (Optional) Flags, comma-separated. The following flags are available:
--//        - "emojis": include emoji properties (Extended Pictographic only).
--//        - "gencat": include general category properties.
+-//  1. The name of the Unicode data file (just the filename, without extension).
+-//     Can be "-" (to skip) if the emoji flag is included.
+-//  2. The name of the locally generated Go file.
+-//  3. The name of the slice mapping code points to properties.
+-//  4. The name of the generator, for logging purposes.
+-//  5. (Optional) Flags, comma-separated. The following flags are available:
+-//     - "emojis=<property>": include the specified emoji properties (e.g.
+-//     "Extended_Pictographic").
+-//     - "gencat": include general category properties.
 -//
--//go:generate go run gen_properties.go auxiliary/GraphemeBreakProperty graphemeproperties.go graphemeCodePoints graphemes emojis
--//go:generate go run gen_properties.go auxiliary/WordBreakProperty wordproperties.go workBreakCodePoints words emojis
+-//go:generate go run gen_properties.go auxiliary/GraphemeBreakProperty graphemeproperties.go graphemeCodePoints graphemes emojis=Extended_Pictographic
+-//go:generate go run gen_properties.go auxiliary/WordBreakProperty wordproperties.go workBreakCodePoints words emojis=Extended_Pictographic
 -//go:generate go run gen_properties.go auxiliary/SentenceBreakProperty sentenceproperties.go sentenceBreakCodePoints sentences
 -//go:generate go run gen_properties.go LineBreak lineproperties.go lineBreakCodePoints lines gencat
 -//go:generate go run gen_properties.go EastAsianWidth eastasianwidth.go eastAsianWidth eastasianwidth
+-//go:generate go run gen_properties.go - emojipresentation.go emojiPresentation emojipresentation emojis=Emoji_Presentation
 -package main
 -
 -import (
@@ -320,8 +324,8 @@ index 6451270..0000000
 -// We want to test against a specific version rather than the latest. When the
 -// package is upgraded to a new version, change these to generate new tests.
 -const (
--	gbpURL   = `https://www.unicode.org/Public/14.0.0/ucd/%s.txt`
--	emojiURL = `https://unicode.org/Public/14.0.0/ucd/emoji/emoji-data.txt`
+-	propertyURL = `https://www.unicode.org/Public/14.0.0/ucd/%s.txt`
+-	emojiURL    = `https://unicode.org/Public/14.0.0/ucd/emoji/emoji-data.txt`
 -)
 -
 -// The regular expression for a line containing a code point range property.
@@ -337,20 +341,25 @@ index 6451270..0000000
 -	log.SetFlags(0)
 -
 -	// Parse flags.
--	flags := make(map[string]struct{})
+-	flags := make(map[string]string)
 -	if len(os.Args) >= 6 {
 -		for _, flag := range strings.Split(os.Args[5], ",") {
--			flags[flag] = struct{}{}
+-			flagFields := strings.Split(flag, "=")
+-			if len(flagFields) == 1 {
+-				flags[flagFields[0]] = "yes"
+-			} else {
+-				flags[flagFields[0]] = flagFields[1]
+-			}
 -		}
 -	}
 -
 -	// Parse the text file and generate Go source code from it.
--	var emojis string
--	if _, ok := flags["emojis"]; ok {
--		emojis = emojiURL
--	}
 -	_, includeGeneralCategory := flags["gencat"]
--	src, err := parse(fmt.Sprintf(gbpURL, os.Args[1]), emojis, includeGeneralCategory)
+-	var mainURL string
+-	if os.Args[1] != "-" {
+-		mainURL = fmt.Sprintf(propertyURL, os.Args[1])
+-	}
+-	src, err := parse(mainURL, flags["emojis"], includeGeneralCategory)
 -	if err != nil {
 -		log.Fatal(err)
 -	}
@@ -370,65 +379,73 @@ index 6451270..0000000
 -
 -// parse parses the Unicode Properties text files located at the given URLs and
 -// returns their equivalent Go source code to be used in the uniseg package. If
--// "emojiURL" is an empty string, no emoji code points will be included. If
+-// "emojiProperty" is not an empty string, emoji code points for that emoji
+-// property (e.g. "Extended_Pictographic") will be included. In those cases, you
+-// may pass an empty "propertyURL" to skip parsing the main properties file. If
 -// "includeGeneralCategory" is true, the Unicode General Category property will
 -// be extracted from the comments and included in the output.
--func parse(gbpURL, emojiURL string, includeGeneralCategory bool) (string, error) {
+-func parse(propertyURL, emojiProperty string, includeGeneralCategory bool) (string, error) {
+-	if propertyURL == "" && emojiProperty == "" {
+-		return "", errors.New("no properties to parse")
+-	}
+-
 -	// Temporary buffer to hold properties.
 -	var properties [][4]string
 -
 -	// Open the first URL.
--	log.Printf("Parsing %s", gbpURL)
--	res, err := http.Get(gbpURL)
--	if err != nil {
--		return "", err
--	}
--	in1 := res.Body
--	defer in1.Close()
+-	if propertyURL != "" {
+-		log.Printf("Parsing %s", propertyURL)
+-		res, err := http.Get(propertyURL)
+-		if err != nil {
+-			return "", err
+-		}
+-		in1 := res.Body
+-		defer in1.Close()
 -
--	// Parse it.
--	scanner := bufio.NewScanner(in1)
--	num := 0
--	for scanner.Scan() {
--		num++
--		line := strings.TrimSpace(scanner.Text())
+-		// Parse it.
+-		scanner := bufio.NewScanner(in1)
+-		num := 0
+-		for scanner.Scan() {
+-			num++
+-			line := strings.TrimSpace(scanner.Text())
 -
--		// Skip comments and empty lines.
--		if strings.HasPrefix(line, "#") || line == "" {
--			continue
--		}
+-			// Skip comments and empty lines.
+-			if strings.HasPrefix(line, "#") || line == "" {
+-				continue
+-			}
 -
--		// Everything else must be a code point range, a property and a comment.
--		from, to, property, comment, err := parseProperty(line)
--		if err != nil {
--			return "", fmt.Errorf("%s line %d: %v", os.Args[4], num, err)
+-			// Everything else must be a code point range, a property and a comment.
+-			from, to, property, comment, err := parseProperty(line)
+-			if err != nil {
+-				return "", fmt.Errorf("%s line %d: %v", os.Args[4], num, err)
+-			}
+-			properties = append(properties, [4]string{from, to, property, comment})
+-		}
+-		if err := scanner.Err(); err != nil {
+-			return "", err
 -		}
--		properties = append(properties, [4]string{from, to, property, comment})
--	}
--	if err := scanner.Err(); err != nil {
--		return "", err
 -	}
 -
 -	// Open the second URL.
--	if emojiURL != "" {
+-	if emojiProperty != "" {
 -		log.Printf("Parsing %s", emojiURL)
--		res, err = http.Get(emojiURL)
+-		res, err := http.Get(emojiURL)
 -		if err != nil {
 -			return "", err
 -		}
 -		in2 := res.Body
 -		defer in2.Close()
 -
 -		// Parse it.
--		scanner = bufio.NewScanner(in2)
--		num = 0
+-		scanner := bufio.NewScanner(in2)
+-		num := 0
 -		for scanner.Scan() {
 -			num++
 -			line := scanner.Text()
 -
 -			// Skip comments, empty lines, and everything not containing
 -			// "Extended_Pictographic".
--			if strings.HasPrefix(line, "#") || line == "" || !strings.Contains(line, "Extended_Pictographic") {
+-			if strings.HasPrefix(line, "#") || line == "" || !strings.Contains(line, emojiProperty) {
 -				continue
 -			}
 -
@@ -471,7 +488,7 @@ index 6451270..0000000
 -// Code generated via go generate from gen_properties.go. DO NOT EDIT.
 -
 -// ` + os.Args[3] + ` are taken from
--// ` + gbpURL + emojiComment + `
+-// ` + propertyURL + emojiComment + `
 -// on ` + time.Now().Format("January 2, 2006") + `. See https://www.unicode.org/license.html for the Unicode
 -// license agreement.
 -var ` + os.Args[3] + ` = [][` + strconv.Itoa(columns) + `]int{
@@ -520,6 +537,6 @@ index 6451270..0000000
 -func translateProperty(prefix, property string) string {
 -	return prefix + strings.ReplaceAll(property, "_", "")
 -}
--- 
-2.37.2
+--
+2.38.0
 

go.mod

@@ -57,7 +57,7 @@ require (
 	github.com/kisielk/errcheck v1.6.2
 	github.com/klauspost/compress v1.15.1
 	github.com/kyoh86/exportloopref v0.1.8
-	github.com/mgechev/revive v1.2.4-0.20220827111817-553604eaced5
+	github.com/mgechev/revive v1.2.4
 	github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7
 	github.com/nishanths/predeclared v0.2.2
 	github.com/opentracing/basictracer-go v1.0.0
@@ -108,7 +108,7 @@ require (
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
-	golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2
+	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 	golang.org/x/text v0.3.7
 	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65
@@ -182,7 +182,7 @@ require (
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -200,7 +200,7 @@ require (
 	github.com/prometheus/tsdb v0.8.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
-	github.com/rivo/uniseg v0.3.4 // indirect
+	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/rogpeppe/go-internal v1.6.1 // indirect
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20180711163814-62bca832be04 // indirect

go.sum

@@ -647,16 +647,16 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/maxatome/go-testdeep v1.11.0 h1:Tgh5efyCYyJFGUYiT0qxBSIDeXw0F5zSoatlou685kk=
 github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg=
 github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ=
-github.com/mgechev/revive v1.2.4-0.20220827111817-553604eaced5 h1:a+itKsYpxka50MyaWQW1XCZ1vwfgjzVy/OzZ7DC/4+U=
-github.com/mgechev/revive v1.2.4-0.20220827111817-553604eaced5/go.mod h1:iAWlQishqCuj4yhV24FTnKSXGpbAA+0SckXB8GQMX/Q=
+github.com/mgechev/revive v1.2.4 h1:+2Hd/S8oO2H0Ikq2+egtNwQsVhAeELHjxjIUFX5ajLI=
+github.com/mgechev/revive v1.2.4/go.mod h1:iAWlQishqCuj4yhV24FTnKSXGpbAA+0SckXB8GQMX/Q=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.10/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -821,8 +821,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6O
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
-github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=
+github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rlmcpherson/s3gof3r v0.5.0/go.mod h1:s7vv7SMDPInkitQMuZzH615G7yWHdrU2r/Go7Bo71Rs=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -1280,8 +1280,8 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=
-golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=