ci: add fmt lint setting for interface{}

.golangci.yml

@@ -25,6 +25,7 @@ linters:
     - predeclared
     - revive
     - lll
+    - gofmt
 
 linters-settings:
   staticcheck:
@@ -389,6 +390,13 @@ linters-settings:
       - name: waitgroup-by-value
         severity: warning
         disabled: false
+  gofmt:
+    # https://golangci-lint.run/usage/linters/#gofmt
+    # disable for faster check
+    simplify: false
+    rewrite-rules:
+      - pattern: 'interface{}'
+        replacement: 'any'
 issues:
   exclude-rules:
     - path: _test\.go

Makefile

@@ -44,7 +44,7 @@ check: check-bazel-prepare parser_yacc check-parallel lint tidy testSuite errdoc
 
 fmt:
 	@echo "gofmt (simplify)"
-	@gofmt -s -l -w $(FILES) 2>&1 | $(FAIL_ON_STDOUT)
+	@gofmt -s -l -w -r 'interface{} -> any' $(FILES) 2>&1 | $(FAIL_ON_STDOUT)
 
 check-static: tools/bin/golangci-lint
 	GO111MODULE=on CGO_ENABLED=0 tools/bin/golangci-lint run -v $$($(PACKAGE_DIRECTORIES)) --config .golangci.yml

br/cmd/br/fips.go

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build boringcrypto
-// +build boringcrypto
 
 package main
 

br/cmd/tidb-lightning-ctl/fips.go

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build boringcrypto
-// +build boringcrypto
 
 package main
 

br/cmd/tidb-lightning/fips.go

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build boringcrypto
-// +build boringcrypto
 
 package main
 

build/linter/gofmt/analyzer.go

@@ -45,9 +45,12 @@ func run(pass *analysis.Pass) (any, error) {
 			fileNames = append(fileNames, pos.Filename)
 		}
 	}
-
+	rules := []gofmt.RewriteRule{{
+		Pattern:     "interface{}",
+		Replacement: "any",
+	}}
 	for _, f := range fileNames {
-		diff, err := gofmt.Run(f, needSimplify)
+		diff, err := gofmt.RunRewrite(f, needSimplify, rules)
 		if err != nil {
 			return nil, fmt.Errorf("could not run gofmt: %w (%s)", err, f)
 		}

build/nogo_config.json

@@ -258,7 +258,7 @@
   },
   "gofmt": {
     "exclude_files": {
-      "pkg/parser/parser.go": "parser/parser.go code",
+      "pkg/parser/": "parser/*.go code",
       "external/": "no need to vet third party code",
       ".*_generated\\.go$": "ignore generated code",
       ".*mock.go$": "ignore generated code",

cmd/tidb-server/fips.go

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build boringcrypto
-// +build boringcrypto
 
 package main
 

pkg/expression/context.go

@@ -82,7 +82,7 @@ type BuildContext interface {
 	// GetSessionVars gets the session variables.
 	GetSessionVars() *variable.SessionVars
 	// SetValue saves a value associated with this context for key.
-	SetValue(key fmt.Stringer, value interface{})
+	SetValue(key fmt.Stringer, value any)
 	// BuiltinFunctionUsageInc increase the counting of each builtin function usage
 	// Notice that this is a thread safe function
 	BuiltinFunctionUsageInc(scalarFuncSigName string)

pkg/kv/key.go

@@ -464,7 +464,7 @@ func calcStrsMemUsage(strs map[string]strHandleVal) int64 {
 	return res
 }
 
-func calcIntsMemUsage(ints map[int64]interface{}) int64 {
+func calcIntsMemUsage(ints map[int64]any) int64 {
 	return int64(len(ints)) * (size.SizeOfInt64 + size.SizeOfInterface)
 }