tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

refactor: move from io/ioutil to io and os package (#17109)

Browse Source 
The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
Eng Zer Jun
2021-09-22 13:38:34 +08:00
committed by GitHub
parent aa631d8cd1
commit f2e7d5477f
103 changed files with 261 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
routers/web/user/auth.go
View File

@@ -9,7 +9,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net/http"
"strings"
@@ -704,7 +703,7 @@ func updateAvatarIfNeed(url string, u *models.User) {
}
// ignore any error
if err == nil && resp.StatusCode == http.StatusOK {
data, err := ioutil.ReadAll(io.LimitReader(resp.Body, setting.Avatar.MaxFileSize+1))
data, err := io.ReadAll(io.LimitReader(resp.Body, setting.Avatar.MaxFileSize+1))
if err == nil && int64(len(data)) <= setting.Avatar.MaxFileSize {
_ = u.UploadAvatar(data)
}

6
routers/web/user/setting/profile.go
View File

@@ -8,7 +8,7 @@ package setting
import (
"errors"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"path/filepath"
@@ -167,9 +167,9 @@ func UpdateAvatarSetting(ctx *context.Context, form *forms.AvatarForm, ctxUser *
return errors.New(ctx.Tr("settings.uploaded_avatar_is_too_big"))
}
data, err := ioutil.ReadAll(fr)
data, err := io.ReadAll(fr)
if err != nil {
return fmt.Errorf("ioutil.ReadAll: %v", err)
return fmt.Errorf("io.ReadAll: %v", err)
}
st := typesniffer.DetectContentType(data)