diff options
| author | Moritz Poldrack <git@moritz.sh> | 2022-08-17 16:19:45 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2022-08-22 09:30:19 +0200 |
| commit | 9cffc45f0347e5c8b801c151955fa9326b9b2ba7 (patch) | |
| tree | 4de8e74f1ec7378297185f65807cb9019caf1a1a /worker/maildir | |
| parent | 1b91b68e7385239783bee818974c4ce2032b7039 (diff) | |
| download | aerc-9cffc45f0347e5c8b801c151955fa9326b9b2ba7.tar.gz | |
go: removed io/ioutil
Since the minimum required version of Go has been bumped to 1.16, the
deprecation of io/ioutil can now be acted upon. This Commit removes the
remaining dependencies on ioutil and replaces them with their io or os
counterparts.
Signed-off-by: Moritz Poldrack <git@moritz.sh>
Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'worker/maildir')
| -rw-r--r-- | worker/maildir/search.go | 6 | ||||
| -rw-r--r-- | worker/maildir/worker.go | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/worker/maildir/search.go b/worker/maildir/search.go index 6260deb4..2ad1c0e1 100644 --- a/worker/maildir/search.go +++ b/worker/maildir/search.go @@ -1,7 +1,7 @@ package maildir import ( - "io/ioutil" + "io" "net/textproto" "strings" "unicode" @@ -151,7 +151,7 @@ func (w *Worker) searchKey(key uint32, criteria *searchCriteria, if err != nil { return false, err } - bytes, err := ioutil.ReadAll(reader) + bytes, err := io.ReadAll(reader) if err != nil { return false, err } @@ -163,7 +163,7 @@ func (w *Worker) searchKey(key uint32, criteria *searchCriteria, return false, err } defer reader.Close() - bytes, err := ioutil.ReadAll(reader) + bytes, err := io.ReadAll(reader) if err != nil { return false, err } diff --git a/worker/maildir/worker.go b/worker/maildir/worker.go index 9f9fee9a..e482f4e0 100644 --- a/worker/maildir/worker.go +++ b/worker/maildir/worker.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/url" "os" "os/exec" @@ -543,7 +542,7 @@ func (w *Worker) handleFetchFullMessages(msg *types.FetchFullMessages) error { return err } defer r.Close() - b, err := ioutil.ReadAll(r) + b, err := io.ReadAll(r) if err != nil { return err } |