oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +00:00
Code Wiki Activity

Remove deprecated io/ioutil package

Browse source 
Miniflux now requires at least Go 1.16 and io/util is deprecated.

https://golang.org/doc/go1.16#ioutil
This commit is contained in:
Frédéric Guillot 2021-02-16 21:19:03 -08:00 • committed by fguillot
parent 713d575bad
commit a352aff93b
16 changed files with 26 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reader/xml/decoder.go
View file

@ -9,7 +9,6 @@ import (
"encoding/xml"
"fmt"
"io"
"io/ioutil"
"strings"
"miniflux.app/reader/encoding"
@ -18,7 +17,7 @@ import (
// NewDecoder returns a XML decoder that filters illegal characters.
func NewDecoder(data io.Reader) *xml.Decoder {
var decoder *xml.Decoder
buffer, _ := ioutil.ReadAll(data)
buffer, _ := io.ReadAll(data)
enc := procInst("encoding", string(buffer))
if enc != "" && enc != "utf-8" && enc != "UTF-8" && !strings.EqualFold(enc, "utf-8") {
// filter invalid chars later within decoder.CharsetReader
@ -36,7 +35,7 @@ func NewDecoder(data io.Reader) *xml.Decoder {
if err != nil {
return nil, err
}
rawData, err := ioutil.ReadAll(utf8Reader)
rawData, err := io.ReadAll(utf8Reader)
if err != nil {
return nil, fmt.Errorf("Unable to read data: %q", err)
}