all: Replace deprecated ioutil with io and os

diff --git a/commands/server.go b/commands/server.go
index c878cac2ff45d9d3a8b460fd9e9b6549e933bb06..048b13ba3c2abd938cd4896724063fa18c89226b 100644 (file)
--- a/commands/server.go
+++ b/commands/server.go
@@ -20,7 +20,6 @@ import (
        "errors"
        "fmt"
        "io"
-       "io/ioutil"
        "net"
        "net/http"
        "net/url"
@@ -848,7 +847,7 @@ func (c *serverCommand) serve() error {
                        if err != nil {
                                return err
                        }
-                       err = ioutil.WriteFile(readyFile, b, 0777)
+                       err = os.WriteFile(readyFile, b, 0777)
                        if err != nil {
                                return err
                        }

diff --git a/main_test.go b/main_test.go
index 5629db3fe21c9795a1c14224de1d51c4cdf83496..aae8a0a9ed2fe1e0a160b91cfee0f88c52273576 100644 (file)
--- a/main_test.go
+++ b/main_test.go
@@ -17,8 +17,8 @@ import (
        "bytes"
        "encoding/json"
        "fmt"
+       "io"
        "io/fs"
-       "io/ioutil"
        "log"
        "net/http"
        "os"
@@ -203,7 +203,7 @@ var commonTestScriptsParam = testscript.Params{
                                }
 
                                defer resp.Body.Close()
-                               body, err := ioutil.ReadAll(resp.Body)
+                               body, err := io.ReadAll(resp.Body)
                                if err != nil {
                                        return fmt.Errorf("failed to read response body: %v", err)
                                }

diff --git a/tpl/internal/templatefuncsRegistry.go b/tpl/internal/templatefuncsRegistry.go
index eea14372b3528778b762cac88ad71d29ab590a87..c1b01f5a51fc895758c951825f3cfa8e54536e46 100644 (file)
--- a/tpl/internal/templatefuncsRegistry.go
+++ b/tpl/internal/templatefuncsRegistry.go
@@ -23,7 +23,6 @@ import (
        "go/doc"
        "go/parser"
        "go/token"
-       "io/ioutil"
        "log"
        "os"
        "path/filepath"
@@ -276,7 +275,7 @@ func getGetTplPackagesGoDoc() map[string]map[string]methodGoDocInfo {
                        basePath = filepath.Join(pwd, "tpl")
                }
 
-               files, err := ioutil.ReadDir(basePath)
+               files, err := os.ReadDir(basePath)
                if err != nil {
                        log.Fatal(err)
                }