zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: support baggage propagation in httpc (#2375)

Browse Source 
* feat: support baggage propagation in httpc

* chore: use go 1.16

* chore: use go 1.16

* chore: use go ^1.16

* chore: remove deprecated
This commit is contained in:
Kevin Wan
2022-09-10 15:18:52 +08:00
committed by GitHub
parent 590d784800
commit d935c83a54
44 changed files with 141 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/goctl/api/format/format.go
View File

@@ -7,7 +7,6 @@ import (
"go/format"
"go/scanner"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -76,7 +75,7 @@ func GoFormatApi(_ *cobra.Command, _ []string) error {
// apiFormatReader
// filename is needed when there are `import` literals.
func apiFormatReader(reader io.Reader, filename string, skipCheckDeclare bool) error {
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
return err
}
@@ -91,7 +90,7 @@ func apiFormatReader(reader io.Reader, filename string, skipCheckDeclare bool) e
// ApiFormatByPath format api from file path
func ApiFormatByPath(apiFilePath string, skipCheckDeclare bool) error {
data, err := ioutil.ReadFile(apiFilePath)
data, err := os.ReadFile(apiFilePath)
if err != nil {
return err
}
@@ -111,7 +110,7 @@ func ApiFormatByPath(apiFilePath string, skipCheckDeclare bool) error {
return err
}
return ioutil.WriteFile(apiFilePath, []byte(result), os.ModePerm)
return os.WriteFile(apiFilePath, []byte(result), os.ModePerm)
}
func apiFormat(data string, skipCheckDeclare bool, filename ...string) (string, error) {
@@ -145,12 +144,12 @@ func apiFormat(data string, skipCheckDeclare bool, filename ...string) (string,
}
if tapCount == 0 {
format, err := formatGoTypeDef(line, s, &builder)
ft, err := formatGoTypeDef(line, s, &builder)
if err != nil {
return "", err
}
if format {
if ft {
continue
}
}