io/ioutil is deprecated since Go 1.16

diff --git a/cmd/sgblog-comment-add/mail.go b/cmd/sgblog-comment-add/mail.go
index 016da8ccf066c9a9755a3f764ce8f36fbf5a8106..6d1aa5452eb0a9c8a99bcd9c141db4c6218096a8 100644 (file)
--- a/cmd/sgblog-comment-add/mail.go
+++ b/cmd/sgblog-comment-add/mail.go
@@ -22,7 +22,6 @@ import (
        "encoding/base64"
        "errors"
        "io"
-       "io/ioutil"
        "mime"
        "mime/multipart"
        "mime/quotedprintable"
@@ -84,7 +83,7 @@ func parseEmail(msg *mail.Message) (subj string, body io.Reader, err error) {
                err = errors.New("no boundary string")
                return
        }
-       data, err := ioutil.ReadAll(msg.Body)
+       data, err := io.ReadAll(msg.Body)
        if err != nil {
                return
        }

diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go
index a81d53d0ee28de9b594438ade0520486a32f62a5..186e56f36ad1635e60c05b1dde4ee871fe26b78b 100644 (file)
--- a/cmd/sgblog-comment-add/main.go
+++ b/cmd/sgblog-comment-add/main.go
@@ -24,7 +24,7 @@ import (
        "encoding/hex"
        "flag"
        "fmt"
-       "io/ioutil"
+       "io"
        "log"
        "mime"
        "net/mail"
@@ -103,7 +103,7 @@ func main() {
        if err != nil {
                log.Fatal(err)
        }
-       body, err := ioutil.ReadAll(r)
+       body, err := io.ReadAll(r)
        if err != nil {
                log.Fatal(err)
        }

diff --git a/cmd/sgblog/main.go b/cmd/sgblog/main.go
index 7ee4e723f2c3d4ec081aca28b2aa334483420fe2..767850c4b26d6ea8ce4b0b5d2d9d8990c5417582 100644 (file)
--- a/cmd/sgblog/main.go
+++ b/cmd/sgblog/main.go
@@ -23,8 +23,8 @@ import (
        "encoding/json"
        "flag"
        "fmt"
-       "io/ioutil"
        "log"
+       "os"
        "regexp"
        "strings"
 
@@ -126,7 +126,7 @@ func initRepo(cfg *Cfg) (*plumbing.Hash, error) {
 }
 
 func readCfg(cfgPath string) (*Cfg, error) {
-       cfgRaw, err := ioutil.ReadFile(cfgPath)
+       cfgRaw, err := os.ReadFile(cfgPath)
        if err != nil {
                return nil, err
        }

diff --git a/common.go b/common.go
index 03ce423de3759782de89bfd6390be4785225379d..1289dcc67b377e78c0af473ec60b739314756073 100644 (file)
--- a/common.go
+++ b/common.go
@@ -4,7 +4,7 @@ package sgblog
 import (
        "bytes"
        "fmt"
-       "io/ioutil"
+       "io"
        "sort"
        "text/scanner"
 
@@ -81,7 +81,7 @@ func GetNote(repo *git.Repository, tree *object.Tree, what plumbing.Hash) []byte
        if err != nil {
                return nil
        }
-       data, err := ioutil.ReadAll(r)
+       data, err := io.ReadAll(r)
        if err != nil {
                return nil
        }