1
0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 09:37:02 +00:00

chore: remove refs to deprecated io/ioutil (#376)

Signed-off-by: guoguangwu <guoguangwu@magic-shield.com>
This commit is contained in:
guangwu
2023-08-08 07:25:36 +08:00
committed by GitHub
parent 926f9f3804
commit 0ae452ed17
8 changed files with 16 additions and 19 deletions

View File

@@ -3,7 +3,6 @@ package message
import (
"io"
"io/ioutil"
"net/mail"
"net/textproto"
"time"
@@ -97,7 +96,7 @@ func (d *Delivery) Size() int64 {
// Source contains the raw content of the message.
func (d *Delivery) Source() (io.ReadCloser, error) {
return ioutil.NopCloser(d.Reader), nil
return io.NopCloser(d.Reader), nil
}
// Seen getter.

View File

@@ -2,7 +2,7 @@ package client
import (
"bytes"
"io/ioutil"
"io"
"net/http"
"net/url"
"testing"
@@ -33,7 +33,7 @@ func (m *mockHTTPClient) Do(req *http.Request) (resp *http.Response, err error)
}
resp = &http.Response{
StatusCode: m.statusCode,
Body: ioutil.NopCloser(bytes.NewBufferString(m.body)),
Body: io.NopCloser(bytes.NewBufferString(m.body)),
}
return
}
@@ -43,7 +43,7 @@ func (m *mockHTTPClient) ReqBody() []byte {
if err != nil {
return nil
}
body, err := ioutil.ReadAll(r)
body, err := io.ReadAll(r)
if err != nil {
return nil
}

View File

@@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"log"
"net/mail"
"os"
@@ -192,7 +191,7 @@ func TestGetLatestMessage(t *testing.T) {
// setupDataStore creates a new FileDataStore in a temporary directory
func setupDataStore(cfg config.Storage, extHost *extension.Host) (*Store, *bytes.Buffer) {
path, err := ioutil.TempDir("", "inbucket")
path, err := os.MkdirTemp("", "inbucket")
if err != nil {
panic(err)
}
@@ -228,7 +227,7 @@ func deliverMessage(ds *Store, mbName string, subject string, date time.Time) (s
meta.To[0].Address, meta.From.Address, subject)
delivery := &message.Delivery{
Meta: meta,
Reader: ioutil.NopCloser(strings.NewReader(testMsg)),
Reader: io.NopCloser(strings.NewReader(testMsg)),
}
id, err := ds.AddMessage(delivery)
if err != nil {

View File

@@ -4,7 +4,6 @@ import (
"bytes"
"container/list"
"io"
"io/ioutil"
"net/mail"
"time"
@@ -47,7 +46,7 @@ func (m *Message) Subject() string { return m.subject }
// Source returns a reader for the message source.
func (m *Message) Source() (io.ReadCloser, error) {
return ioutil.NopCloser(bytes.NewReader(m.source)), nil
return io.NopCloser(bytes.NewReader(m.source)), nil
}
// Size returns the message size in bytes.

View File

@@ -2,7 +2,7 @@ package mem
import (
"fmt"
"io/ioutil"
"io"
"sort"
"strconv"
"sync"
@@ -62,7 +62,7 @@ func (s *Store) AddMessage(message storage.Message) (id string, err error) {
err = ierr
return
}
source, ierr := ioutil.ReadAll(r)
source, ierr := io.ReadAll(r)
if ierr != nil {
err = ierr
return

View File

@@ -4,7 +4,7 @@ import (
"bytes"
"context"
"fmt"
"io/ioutil"
"io"
smtpclient "net/smtp"
"os"
"path/filepath"
@@ -266,7 +266,7 @@ func readTestData(path ...string) []byte {
if err != nil {
panic(err)
}
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
if err != nil {
panic(err)
}

View File

@@ -3,7 +3,7 @@ package test
import (
"bytes"
"fmt"
"io/ioutil"
"io"
"net/mail"
"strings"
"testing"
@@ -159,7 +159,7 @@ func testContent(t *testing.T, store storage.Store, extHost *extension.Host) {
if err != nil {
t.Fatal(err)
}
got, err := ioutil.ReadAll(r)
got, err := io.ReadAll(r)
if err != nil {
t.Fatal(err)
}
@@ -455,7 +455,7 @@ func DeliverToStore(
meta.To[0].Address, meta.From.Address, subject)
delivery := &message.Delivery{
Meta: meta,
Reader: ioutil.NopCloser(strings.NewReader(testMsg)),
Reader: io.NopCloser(strings.NewReader(testMsg)),
}
id, err := store.AddMessage(delivery)
if err != nil {

View File

@@ -2,7 +2,7 @@ package webui
import (
"fmt"
"io/ioutil"
"os"
"net/http"
"github.com/inbucket/inbucket/pkg/config"
@@ -11,7 +11,7 @@ import (
// RootGreeting serves the Inbucket greeting.
func RootGreeting(w http.ResponseWriter, req *http.Request, ctx *web.Context) (err error) {
greeting, err := ioutil.ReadFile(ctx.RootConfig.Web.GreetingFile)
greeting, err := os.ReadFile(ctx.RootConfig.Web.GreetingFile)
if err != nil {
return fmt.Errorf("Failed to load greeting: %v", err)
}