icns

commit ec1a78510e218aec046708effefda4d90b5ecd8c
parent fc8699534bd85cf23bbce098bce8d768adca85f6
Author: Jack Mordaunt <jackmordaunt.dev@gmail.com>
Date:   Tue, 29 Oct 2024 10:12:30 +0800

icns: remove use of deprecated ioutil

Signed-off-by: Jack Mordaunt <jackmordaunt.dev@gmail.com>

Diffstat:
M
icns_test.go
 | 
15
+++++++--------
M
reader.go
 | 
3
+--

2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/icns_test.go b/icns_test.go
@@ -7,7 +7,6 @@ import (
 	"image/jpeg"
 	"image/png"
 	"io"
-	"io/ioutil"
 	"reflect"
 	"testing"
 )
@@ -88,7 +87,7 @@ func TestEncode(t *testing.T) {
 	}{
 		{
 			"nil image",
-			ioutil.Discard,
+			io.Discard,
 			nil,
 			true,
 		},
@@ -100,37 +99,37 @@ func TestEncode(t *testing.T) {
 		},
 		{
 			"valid sqaure",
-			ioutil.Discard,
+			io.Discard,
 			rect(0, 0, 50, 50),
 			false,
 		},
 		{
 			"valid non-square",
-			ioutil.Discard,
+			io.Discard,
 			rect(0, 0, 10, 50),
 			false,
 		},
 		{
 			"valid non-square, weird dimensions",
-			ioutil.Discard,
+			io.Discard,
 			rect(0, 0, 17, 77),
 			false,
 		},
 		{
 			"invalid zero img",
-			ioutil.Discard,
+			io.Discard,
 			rect(0, 0, 0, 0),
 			true,
 		},
 		{
 			"invalid small img",
-			ioutil.Discard,
+			io.Discard,
 			rect(0, 0, 1, 1),
 			true,
 		},
 		{
 			"valid square not at origin point",
-			ioutil.Discard,
+			io.Discard,
 			rect(10, 10, 50, 50),
 			false,
 		},
diff --git a/reader.go b/reader.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"image"
 	"io"
-	"io/ioutil"
 	"sort"
 )
 
@@ -54,7 +53,7 @@ func DecodeAll(r io.Reader) (images []image.Image, err error) {
 }
 
 func decode(r io.Reader) (icons []iconReader, err error) {
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}