diff --git a/common/common.go b/common/common.go index c00371be..a09f6fbe 100644 --- a/common/common.go +++ b/common/common.go @@ -38,7 +38,7 @@ func Error2(v interface{}, err error) error { func envFile() (string, error) { if file := os.Getenv("GOENV"); file != "" { if file == "off" { - return "", fmt.Errorf("GOENV=off") + return "", errors.New("GOENV=off") } return file, nil } @@ -47,7 +47,7 @@ func envFile() (string, error) { return "", err } if dir == "" { - return "", fmt.Errorf("missing user-config dir") + return "", errors.New("missing user-config dir") } return filepath.Join(dir, "go", "env"), nil } @@ -60,7 +60,7 @@ func GetRuntimeEnv(key string) (string, error) { return "", err } if file == "" { - return "", fmt.Errorf("missing runtime env file") + return "", errors.New("missing runtime env file") } var data []byte var runtimeEnv string diff --git a/infra/vformat/main.go b/infra/vformat/main.go index e676f08a..84c63a42 100644 --- a/infra/vformat/main.go +++ b/infra/vformat/main.go @@ -1,6 +1,7 @@ package main import ( + "errors" "flag" "fmt" "go/build" @@ -18,7 +19,7 @@ var directory = flag.String("pwd", "", "Working directory of Xray vformat.") func envFile() (string, error) { if file := os.Getenv("GOENV"); file != "" { if file == "off" { - return "", fmt.Errorf("GOENV=off") + return "", errors.New("GOENV=off") } return file, nil } @@ -27,7 +28,7 @@ func envFile() (string, error) { return "", err } if dir == "" { - return "", fmt.Errorf("missing user-config dir") + return "", errors.New("missing user-config dir") } return filepath.Join(dir, "go", "env"), nil } @@ -40,7 +41,7 @@ func GetRuntimeEnv(key string) (string, error) { return "", err } if file == "" { - return "", fmt.Errorf("missing runtime env file") + return "", errors.New("missing runtime env file") } var data []byte var runtimeEnv string diff --git a/infra/vprotogen/main.go b/infra/vprotogen/main.go index f62ae4ae..f5a4152a 100644 --- a/infra/vprotogen/main.go +++ b/infra/vprotogen/main.go @@ -1,6 +1,7 @@ package main import ( + "errors" "flag" "fmt" "go/build" @@ -22,7 +23,7 @@ var directory = flag.String("pwd", "", "Working directory of Xray vprotogen.") func envFile() (string, error) { if file := os.Getenv("GOENV"); file != "" { if file == "off" { - return "", fmt.Errorf("GOENV=off") + return "", errors.New("GOENV=off") } return file, nil } @@ -31,7 +32,7 @@ func envFile() (string, error) { return "", err } if dir == "" { - return "", fmt.Errorf("missing user-config dir") + return "", errors.New("missing user-config dir") } return filepath.Join(dir, "go", "env"), nil } @@ -44,7 +45,7 @@ func GetRuntimeEnv(key string) (string, error) { return "", err } if file == "" { - return "", fmt.Errorf("missing runtime env file") + return "", errors.New("missing runtime env file") } var data []byte var runtimeEnv string @@ -101,12 +102,12 @@ Download %s v%s or later from https://github.com/protocolbuffers/protobuf/releas func getProjectProtocVersion(url string) (string, error) { resp, err := http.Get(url) if err != nil { - return "", fmt.Errorf("can not get the version of protobuf used in xray project") + return "", errors.New("can not get the version of protobuf used in xray project") } defer resp.Body.Close() body, err := io.ReadAll(resp.Body) if err != nil { - return "", fmt.Errorf("can not read from body") + return "", errors.New("can not read from body") } versionRegexp := regexp.MustCompile(`\/\/\s*protoc\s*v\d+\.(\d+\.\d+)`) matched := versionRegexp.FindStringSubmatch(string(body)) diff --git a/main/commands/all/api/shared.go b/main/commands/all/api/shared.go index f9d18265..79f4171a 100644 --- a/main/commands/all/api/shared.go +++ b/main/commands/all/api/shared.go @@ -3,6 +3,7 @@ package api import ( "bytes" "context" + "errors" "fmt" "io" "net/http" @@ -101,7 +102,7 @@ func fetchHTTPContent(target string) ([]byte, error) { content, err := buf.ReadAllToBytes(resp.Body) if err != nil { - return nil, fmt.Errorf("failed to read HTTP response") + return nil, errors.New("failed to read HTTP response") } return content, nil