Skip to content

Commit 22cc08c

Browse files
mamo3grmamo3gr
authored
Fix warning QF1004 of staticcheck (#3684)
* ref. https://staticcheck.dev/docs/checks/#QF1004 Co-authored-by: Mamoru Miura <mamoru-miura@m3.com>
1 parent c1976d3 commit 22cc08c

10 files changed

Lines changed: 42 additions & 42 deletions

‎codegen/example/templates/client_usage.go.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ func indent(s string) string {
2828
if s == "" {
2929
return ""
3030
}
31-
return " " + strings.Replace(s, "\n", "\n ", -1)
32-
}
31+
return " " + strings.ReplaceAll(s, "\n", "\n ")
32+
}

‎codegen/example/templates/client_var_init.go.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var (
2727
os.Exit(1)
2828
}
2929
{{- end }}
30-
addr = strings.Replace(addr, "{{ printf "{%s}" .Name }}", *{{ .VarName }}F, -1)
30+
addr = strings.ReplaceAll(addr, "{{ printf "{%s}" .Name }}", *{{ .VarName }}F)
3131
{{- end }}
3232
{{- end }}
3333
default:

‎codegen/example/templates/server_handler.go.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
log.Fatal(ctx, fmt.Errorf("invalid value for URL '{{ .Name }}' variable: %q (valid values: {{ join .Values "," }})\n", *{{ .VarName }}F))
2424
}
2525
{{- end }}
26-
addr = strings.Replace(addr, "{{ printf "{%s}" .Name }}", *{{ .VarName }}F, -1)
26+
addr = strings.ReplaceAll(addr, "{{ printf "{%s}" .Name }}", *{{ .VarName }}F)
2727
{{- end }}
2828
u, err := url.Parse(addr)
2929
if err != nil {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,5 @@ func indent(s string) string {
104104
if s == "" {
105105
return ""
106106
}
107-
return " " + strings.Replace(s, "\n", "\n ", -1)
107+
return " " + strings.ReplaceAll(s, "\n", "\n ")
108108
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ func main() {
3636
fmt.Fprintf(os.Stderr, "invalid value for URL 'version' variable: %q (valid values: v1,v2)\n", *versionF)
3737
os.Exit(1)
3838
}
39-
addr = strings.Replace(addr, "{version}", *versionF, -1)
39+
addr = strings.ReplaceAll(addr, "{version}", *versionF)
4040
case "stage":
4141
addr = "https://example-{domain}:{port}"
42-
addr = strings.Replace(addr, "{domain}", *domainF, -1)
43-
addr = strings.Replace(addr, "{port}", *portF, -1)
42+
addr = strings.ReplaceAll(addr, "{domain}", *domainF)
43+
addr = strings.ReplaceAll(addr, "{port}", *portF)
4444
default:
4545
fmt.Fprintf(os.Stderr, "invalid host argument: %q (valid hosts: dev|stage)\n", *hostF)
4646
os.Exit(1)
@@ -126,5 +126,5 @@ func indent(s string) string {
126126
if s == "" {
127127
return ""
128128
}
129-
return " " + strings.Replace(s, "\n", "\n ", -1)
129+
return " " + strings.ReplaceAll(s, "\n", "\n ")
130130
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,5 @@ func indent(s string) string {
104104
if s == "" {
105105
return ""
106106
}
107-
return " " + strings.Replace(s, "\n", "\n ", -1)
107+
return " " + strings.ReplaceAll(s, "\n", "\n ")
108108
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ func main() {
2929
switch *hostF {
3030
case "dev":
3131
addr = "http://example-{int}-{uint}-{float32}:8090"
32-
addr = strings.Replace(addr, "{int}", *int_F, -1)
33-
addr = strings.Replace(addr, "{uint}", *uint_F, -1)
34-
addr = strings.Replace(addr, "{float32}", *float32_F, -1)
35-
addr = strings.Replace(addr, "{int32}", *int32_F, -1)
36-
addr = strings.Replace(addr, "{int64}", *int64_F, -1)
37-
addr = strings.Replace(addr, "{uint32}", *uint32_F, -1)
38-
addr = strings.Replace(addr, "{uint64}", *uint64_F, -1)
39-
addr = strings.Replace(addr, "{float64}", *float64_F, -1)
40-
addr = strings.Replace(addr, "{bool}", *bool_F, -1)
32+
addr = strings.ReplaceAll(addr, "{int}", *int_F)
33+
addr = strings.ReplaceAll(addr, "{uint}", *uint_F)
34+
addr = strings.ReplaceAll(addr, "{float32}", *float32_F)
35+
addr = strings.ReplaceAll(addr, "{int32}", *int32_F)
36+
addr = strings.ReplaceAll(addr, "{int64}", *int64_F)
37+
addr = strings.ReplaceAll(addr, "{uint32}", *uint32_F)
38+
addr = strings.ReplaceAll(addr, "{uint64}", *uint64_F)
39+
addr = strings.ReplaceAll(addr, "{float64}", *float64_F)
40+
addr = strings.ReplaceAll(addr, "{bool}", *bool_F)
4141
default:
4242
fmt.Fprintf(os.Stderr, "invalid host argument: %q (valid hosts: dev)\n", *hostF)
4343
os.Exit(1)
@@ -129,5 +129,5 @@ func indent(s string) string {
129129
if s == "" {
130130
return ""
131131
}
132-
return " " + strings.Replace(s, "\n", "\n ", -1)
132+
return " " + strings.ReplaceAll(s, "\n", "\n ")
133133
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,5 @@ func indent(s string) string {
104104
if s == "" {
105105
return ""
106106
}
107-
return " " + strings.Replace(s, "\n", "\n ", -1)
107+
return " " + strings.ReplaceAll(s, "\n", "\n ")
108108
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func main() {
7676
if !versionSeen {
7777
log.Fatal(ctx, fmt.Errorf("invalid value for URL 'version' variable: %q (valid values: v1,v2)\n", *versionF))
7878
}
79-
addr = strings.Replace(addr, "{version}", *versionF, -1)
79+
addr = strings.ReplaceAll(addr, "{version}", *versionF)
8080
u, err := url.Parse(addr)
8181
if err != nil {
8282
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
@@ -102,8 +102,8 @@ func main() {
102102
case "stage":
103103
{
104104
addr := "https://example-{domain}:{port}"
105-
addr = strings.Replace(addr, "{domain}", *domainF, -1)
106-
addr = strings.Replace(addr, "{port}", *portF, -1)
105+
addr = strings.ReplaceAll(addr, "{domain}", *domainF)
106+
addr = strings.ReplaceAll(addr, "{port}", *portF)
107107
u, err := url.Parse(addr)
108108
if err != nil {
109109
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ func main() {
7070
case "dev":
7171
{
7272
addr := "http://example-{int}-{uint}-{float32}:8090"
73-
addr = strings.Replace(addr, "{int}", *int_F, -1)
74-
addr = strings.Replace(addr, "{uint}", *uint_F, -1)
75-
addr = strings.Replace(addr, "{float32}", *float32_F, -1)
76-
addr = strings.Replace(addr, "{int32}", *int32_F, -1)
77-
addr = strings.Replace(addr, "{int64}", *int64_F, -1)
78-
addr = strings.Replace(addr, "{uint32}", *uint32_F, -1)
79-
addr = strings.Replace(addr, "{uint64}", *uint64_F, -1)
80-
addr = strings.Replace(addr, "{float64}", *float64_F, -1)
81-
addr = strings.Replace(addr, "{bool}", *bool_F, -1)
73+
addr = strings.ReplaceAll(addr, "{int}", *int_F)
74+
addr = strings.ReplaceAll(addr, "{uint}", *uint_F)
75+
addr = strings.ReplaceAll(addr, "{float32}", *float32_F)
76+
addr = strings.ReplaceAll(addr, "{int32}", *int32_F)
77+
addr = strings.ReplaceAll(addr, "{int64}", *int64_F)
78+
addr = strings.ReplaceAll(addr, "{uint32}", *uint32_F)
79+
addr = strings.ReplaceAll(addr, "{uint64}", *uint64_F)
80+
addr = strings.ReplaceAll(addr, "{float64}", *float64_F)
81+
addr = strings.ReplaceAll(addr, "{bool}", *bool_F)
8282
u, err := url.Parse(addr)
8383
if err != nil {
8484
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
@@ -103,15 +103,15 @@ func main() {
103103

104104
{
105105
addr := "https://example-{int32}-{int64}-{uint32}-{uint64}-{float64}:80/{bool}"
106-
addr = strings.Replace(addr, "{int}", *int_F, -1)
107-
addr = strings.Replace(addr, "{uint}", *uint_F, -1)
108-
addr = strings.Replace(addr, "{float32}", *float32_F, -1)
109-
addr = strings.Replace(addr, "{int32}", *int32_F, -1)
110-
addr = strings.Replace(addr, "{int64}", *int64_F, -1)
111-
addr = strings.Replace(addr, "{uint32}", *uint32_F, -1)
112-
addr = strings.Replace(addr, "{uint64}", *uint64_F, -1)
113-
addr = strings.Replace(addr, "{float64}", *float64_F, -1)
114-
addr = strings.Replace(addr, "{bool}", *bool_F, -1)
106+
addr = strings.ReplaceAll(addr, "{int}", *int_F)
107+
addr = strings.ReplaceAll(addr, "{uint}", *uint_F)
108+
addr = strings.ReplaceAll(addr, "{float32}", *float32_F)
109+
addr = strings.ReplaceAll(addr, "{int32}", *int32_F)
110+
addr = strings.ReplaceAll(addr, "{int64}", *int64_F)
111+
addr = strings.ReplaceAll(addr, "{uint32}", *uint32_F)
112+
addr = strings.ReplaceAll(addr, "{uint64}", *uint64_F)
113+
addr = strings.ReplaceAll(addr, "{float64}", *float64_F)
114+
addr = strings.ReplaceAll(addr, "{bool}", *bool_F)
115115
u, err := url.Parse(addr)
116116
if err != nil {
117117
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)

0 commit comments

Comments
 (0)