fmt.Errorf to errors.New

rmatsuoka · rmatsuoka · commit 7616f774becf · 2024-11-18T21:17:46.000+09:00
diff --git a/commands.go b/commands.go
@@ -3,6 +3,7 @@
 package main
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"os"
@@ -115,11 +116,11 @@ func doConfigtest(fs *flag.FlagSet, argv []string) error {
 	red := color.New(color.FgRed)
 	yellow := color.New(color.FgYellow)
 	if err != nil {
-		return fmt.Errorf(red.Sprintf("[CRITICAL] failed to test config: %s", err))
+		return errors.New(red.Sprintf("[CRITICAL] failed to test config: %s", err))
 	}
 	validResult, err := config.ValidateConfigFile(conf.Conffile)
 	if err != nil {
-		return fmt.Errorf(red.Sprintf("[CRITICAL] failed to test config: %s", err))
+		return errors.New(red.Sprintf("[CRITICAL] failed to test config: %s", err))
 	}
 	if len(validResult) > 0 {
 		var messages string
@@ -130,7 +131,7 @@ func doConfigtest(fs *flag.FlagSet, argv []string) error {
 				messages += yellow.Sprintf("[WARNING] %s is unexpected key. Did you mean %s ?\n", v.Key, v.SuggestKey)
 			}
 		}
-		return fmt.Errorf(messages)
+		return errors.New(messages)
 	}
 
 	fmt.Fprintf(os.Stderr, "SUCCESS (%s)\n", conf.Conffile)

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`package main`
`4`	`4`
`5`	`5`	`import (`
	`6`	`+ "errors"`
`6`	`7`	`"flag"`
`7`	`8`	`"fmt"`
`8`	`9`	`"os"`
`@@ -115,11 +116,11 @@ func doConfigtest(fs *flag.FlagSet, argv []string) error {`
`115`	`116`	`red := color.New(color.FgRed)`
`116`	`117`	`yellow := color.New(color.FgYellow)`
`117`	`118`	`if err != nil {`
`118`		`- return fmt.Errorf(red.Sprintf("[CRITICAL] failed to test config: %s", err))`
	`119`	`+ return errors.New(red.Sprintf("[CRITICAL] failed to test config: %s", err))`
`119`	`120`	`}`
`120`	`121`	`validResult, err := config.ValidateConfigFile(conf.Conffile)`
`121`	`122`	`if err != nil {`
`122`		`- return fmt.Errorf(red.Sprintf("[CRITICAL] failed to test config: %s", err))`
	`123`	`+ return errors.New(red.Sprintf("[CRITICAL] failed to test config: %s", err))`
`123`	`124`	`}`
`124`	`125`	`if len(validResult) > 0 {`
`125`	`126`	`var messages string`
`@@ -130,7 +131,7 @@ func doConfigtest(fs *flag.FlagSet, argv []string) error {`
`130`	`131`	`messages += yellow.Sprintf("[WARNING] %s is unexpected key. Did you mean %s ?\n", v.Key, v.SuggestKey)`
`131`	`132`	`}`
`132`	`133`	`}`
`133`		`- return fmt.Errorf(messages)`
	`134`	`+ return errors.New(messages)`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`fmt.Fprintf(os.Stderr, "SUCCESS (%s)\n", conf.Conffile)`