From 8a5bf069254574a3dd32a24c2b8556ec05d848dd Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Mon, 20 Sep 2021 01:51:55 -0400 Subject: [PATCH] Chore: refine errorgen (#721) Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> --- common/errors/errorgen/main.go | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/common/errors/errorgen/main.go b/common/errors/errorgen/main.go index bb12ed78..6accc7a4 100644 --- a/common/errors/errorgen/main.go +++ b/common/errors/errorgen/main.go @@ -2,11 +2,8 @@ package main import ( "fmt" - "log" "os" "path/filepath" - - "github.com/xtls/xray-core/common" ) func main() { @@ -20,26 +17,21 @@ func main() { pkg = "core" } - moduleName, gmnErr := common.GetModuleName(pwd) - if gmnErr != nil { - fmt.Println("can not get module path", gmnErr) - os.Exit(1) - } - file, err := os.OpenFile("errors.generated.go", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644) if err != nil { - log.Fatalf("Failed to generate errors.generated.go: %v", err) + fmt.Printf("Failed to generate errors.generated.go: %v", err) os.Exit(1) } defer file.Close() - fmt.Fprintln(file, "package", pkg) - fmt.Fprintln(file, "") - fmt.Fprintln(file, "import \""+moduleName+"/common/errors\"") - fmt.Fprintln(file, "") - fmt.Fprintln(file, "type errPathObjHolder struct{}") - fmt.Fprintln(file, "") - fmt.Fprintln(file, "func newError(values ...interface{}) *errors.Error {") - fmt.Fprintln(file, " return errors.New(values...).WithPathObj(errPathObjHolder{})") - fmt.Fprintln(file, "}") + fmt.Fprintf(file, `package %s + +import "github.com/xtls/xray-core/common/errors" + +type errPathObjHolder struct{} + +func newError(values ...interface{}) *errors.Error { + return errors.New(values...).WithPathObj(errPathObjHolder{}) +} +`, pkg) }