Skip to content

Commit 818aeb9

Browse files
authored
fix: restore errors.Is for flag.ErrHelp regressed by JSON-RPC merge (#3927)
#3736 changed `err == flag.ErrHelp` to `errors.Is(err, flag.ErrHelp)` in `codegen/example/templates/client_endpoint_init.go.tpl` so the generated example client passes `golangci-lint` with `errorlint` enabled. That fix was later overwritten by #3734 (Add JSON-RPC 2.0 Transport Support, commit 8931cbb), which appears to have rebased on a pre-#3736 state and silently reverted the line back to `err == flag.ErrHelp`. This commit restores the `errors.Is` form and updates the affected golden testdata files. No other source change is required — the `errors` package is already in the import spec list for the generated file (`codegen/example/example_client.go:41`).
1 parent ad6e663 commit 818aeb9

6 files changed

Lines changed: 6 additions & 6 deletions

codegen/example/templates/client_endpoint_init.go.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
}
3232
}
3333
if err != nil {
34-
if err == flag.ErrHelp {
34+
if errors.Is(err, flag.ErrHelp) {
3535
os.Exit(0)
3636
}
3737
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-no-server.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func main() {
6161
}
6262
}
6363
if err != nil {
64-
if err == flag.ErrHelp {
64+
if errors.Is(err, flag.ErrHelp) {
6565
os.Exit(0)
6666
}
6767
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-single-server-multiple-hosts-with-variables.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func main() {
8080
}
8181
}
8282
if err != nil {
83-
if err == flag.ErrHelp {
83+
if errors.Is(err, flag.ErrHelp) {
8484
os.Exit(0)
8585
}
8686
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-single-server-multiple-hosts.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func main() {
6161
}
6262
}
6363
if err != nil {
64-
if err == flag.ErrHelp {
64+
if errors.Is(err, flag.ErrHelp) {
6565
os.Exit(0)
6666
}
6767
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-single-server-single-host-with-variables.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func main() {
7777
}
7878
}
7979
if err != nil {
80-
if err == flag.ErrHelp {
80+
if errors.Is(err, flag.ErrHelp) {
8181
os.Exit(0)
8282
}
8383
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-single-server-single-host.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func main() {
6161
}
6262
}
6363
if err != nil {
64-
if err == flag.ErrHelp {
64+
if errors.Is(err, flag.ErrHelp) {
6565
os.Exit(0)
6666
}
6767
fmt.Fprintln(os.Stderr, err.Error())

0 commit comments

Comments
 (0)