*: fix gosimple check (pingcap#24460)

denimyftiu · May 10, 2021 · b0dfa74 · b0dfa74
1 parent 3b93528
commit b0dfa74
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/cmd/importcheck/importcheck.go b/cmd/importcheck/importcheck.go
@@ -93,7 +93,7 @@ func checkFile(path string) error {
 				continue
 			}
 			if !preIsStd {
-				return errors.New(fmt.Sprintf("stdlib %s need be group together and before non-stdlib group in %s", im.Path.Value, path))
+				return fmt.Errorf("stdlib %s need be group together and before non-stdlib group in %s", im.Path.Value, path)
 			}
 			continue
 		}
@@ -103,7 +103,7 @@ func checkFile(path string) error {
 				continue
 			}
 			if !checkSepWithNewline(src, importSpecs[i-1].Path.Pos(), im.Path.Pos()) {
-				return errors.New(fmt.Sprintf("non-stdlib %s need be group together and after stdlib group in %s", im.Path.Value, path))
+				return fmt.Errorf("non-stdlib %s need be group together and after stdlib group in %s", im.Path.Value, path)
 			}
 			preIsStd = false
 		}

diff --git a/config/config_util.go b/config/config_util.go
@@ -142,9 +142,9 @@ func FlattenConfigItems(nestedConfig map[string]interface{}) map[string]interfac
 }
 
 func flatten(flatMap map[string]interface{}, nested interface{}, prefix string) {
-	switch nested.(type) {
+	switch nested := nested.(type) {
 	case map[string]interface{}:
-		for k, v := range nested.(map[string]interface{}) {
+		for k, v := range nested {
 			path := k
 			if prefix != "" {
 				path = prefix + "." + k

diff --git a/store/tikv/mockstore/deadlock/deadlock_test.go b/store/tikv/mockstore/deadlock/deadlock_test.go
@@ -14,7 +14,6 @@
 package deadlock
 
 import (
-	"fmt"
 	"testing"
 
 	. "github.com/pingcap/check"
@@ -36,7 +35,7 @@ func (s *testDeadlockSuite) TestDeadlock(c *C) {
 	c.Assert(err, IsNil)
 	err = detector.Detect(3, 1, 300)
 	c.Assert(err, NotNil)
-	c.Assert(err.Error(), Equals, fmt.Sprintf("deadlock(200)"))
+	c.Assert(err.Error(), Equals, "deadlock(200)")
 	detector.CleanUp(2)
 	list2 := detector.waitForMap[2]
 	c.Assert(list2, IsNil)

diff --git a/types/json/binary_functions.go b/types/json/binary_functions.go
@@ -527,7 +527,6 @@ func (bm *binaryModifier) doInsert(path PathExpression, newBj BinaryJSON) {
 		elems = append(elems, newBj)
 	}
 	bm.modifyValue, bm.err = buildBinaryObject(keys, elems)
-	return
 }
 
 func (bm *binaryModifier) remove(path PathExpression) BinaryJSON {
@@ -582,7 +581,6 @@ func (bm *binaryModifier) doRemove(path PathExpression) {
 		}
 	}
 	bm.modifyValue, bm.err = buildBinaryObject(keys, elems)
-	return
 }
 
 // rebuild merges the old and the modified JSON into a new BinaryJSON

diff --git a/util/timeutil/time.go b/util/timeutil/time.go
@@ -81,7 +81,7 @@ func InferSystemTZ() string {
 	case !ok:
 		path, err1 := filepath.EvalSymlinks("/etc/localtime")
 		if err1 == nil {
-			if strings.Index(path, "posixrules") != -1 {
+			if strings.Contains(path, "posixrules") {
 				path, err1 = inferOneStepLinkForPath("/etc/localtime")
 				if err1 != nil {
 					logutil.BgLogger().Error("locate timezone files failed", zap.Error(err1))