Remove deprecated ioutils pkg functions (#35)

webrpc · Aug 25, 2023 · c081f17 · c081f17
1 parent 45007cb
commit c081f17
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/_examples/golang-basics/example.gen.go b/_examples/golang-basics/example.gen.go
diff --git a/_examples/golang-imports/api.gen.go b/_examples/golang-imports/api.gen.go
diff --git a/client.go.tmpl b/client.go.tmpl
@@ -132,7 +132,7 @@ func doJSONRequest(ctx context.Context, client HTTPClient, url string, in, out i
 	}
 
 	if resp.StatusCode != 200 {
-		respBody, err := ioutil.ReadAll(resp.Body)
+		respBody, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return ErrorWithCause(ErrWebrpcBadResponse, fmt.Errorf("failed to read server error response body: %w", err))
 		}
@@ -148,7 +148,7 @@ func doJSONRequest(ctx context.Context, client HTTPClient, url string, in, out i
 	}
 
 	if out != nil {
-		respBody, err := ioutil.ReadAll(resp.Body)
+		respBody, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return ErrorWithCause(ErrWebrpcBadResponse, fmt.Errorf("failed to read response body: %w", err))
 		}

diff --git a/imports.go.tmpl b/imports.go.tmpl
@@ -7,7 +7,6 @@
 {{- set $stdlibImports "context" "" -}}
 {{- set $stdlibImports "errors" "" -}}
 {{- set $stdlibImports "fmt" "" -}}
-{{- set $stdlibImports "io/ioutil" "" -}}
 {{- set $stdlibImports "net/http" "" -}}
 
 {{- if eq $opts.json "stdlib" -}}
@@ -22,6 +21,7 @@
 
 {{- if $opts.server }}
 	{{- set $stdlibImports "strings" "" -}}
+	{{- set $stdlibImports "io" "" -}}
 {{- end -}}
 
 {{- /* Import "time" if there's at least one timestamp. */ -}}

diff --git a/server.go.tmpl b/server.go.tmpl
@@ -76,7 +76,7 @@ func (s *{{$serviceName}}) serve{{ .Name | firstLetterToUpper }}JSON(ctx context
 	{{- end}}
 	}{}
 
-	reqBody, err := ioutil.ReadAll(r.Body)
+	reqBody, err := io.ReadAll(r.Body)
 	if err != nil {
 		err = ErrorWithCause(ErrWebrpcBadRequest, fmt.Errorf("failed to read request data: %w", err))
 		RespondWithError(w, err)