From 39b115841025dd4d6730cd2f420a00014a8cb0ea Mon Sep 17 00:00:00 2001
From: Serhat Sevki Dincer <jfcgauss@gmail.com>
Date: Thu, 23 Feb 2023 21:47:27 +1100
Subject: [PATCH] app,gpu{,/headless,/internal/rendertest}: replace io/ioutil
 with io & os

Signed-off-by: Serhat Sevki Dincer <jfcgauss@gmail.com>
---
 app/os_wayland.go                    | 3 +--
 gpu/compute.go                       | 4 ++--
 gpu/headless/driver_test.go          | 4 ++--
 gpu/internal/rendertest/util_test.go | 5 ++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/os_wayland.go b/app/os_wayland.go
index 40da6f7e..8d2602a1 100644
--- a/app/os_wayland.go
+++ b/app/os_wayland.go
@@ -12,7 +12,6 @@ import (
 	"fmt"
 	"image"
 	"io"
-	"io/ioutil"
 	"math"
 	"os"
 	"os/exec"
@@ -1018,7 +1017,7 @@ func (w *window) ReadClipboard() {
 	// Don't let slow clipboard transfers block event loop.
 	go func() {
 		defer r.Close()
-		data, _ := ioutil.ReadAll(r)
+		data, _ := io.ReadAll(r)
 		w.clipReads <- clipboard.Event{Text: string(data)}
 		w.Wakeup()
 	}()
diff --git a/gpu/compute.go b/gpu/compute.go
index 4819b9af..65cea7c7 100644
--- a/gpu/compute.go
+++ b/gpu/compute.go
@@ -12,9 +12,9 @@ import (
 	"image/color"
 	"image/draw"
 	"image/png"
-	"io/ioutil"
 	"math"
 	"math/bits"
+	"os"
 	"runtime"
 	"sort"
 	"time"
@@ -655,7 +655,7 @@ func (g *compute) dumpAtlases() {
 		if err := png.Encode(&buf, nrgba); err != nil {
 			panic(err)
 		}
-		if err := ioutil.WriteFile(fmt.Sprintf("dump-%d.png", i), buf.Bytes(), 0600); err != nil {
+		if err := os.WriteFile(fmt.Sprintf("dump-%d.png", i), buf.Bytes(), 0600); err != nil {
 			panic(err)
 		}
 	}
diff --git a/gpu/headless/driver_test.go b/gpu/headless/driver_test.go
index 6439ad47..2120152c 100644
--- a/gpu/headless/driver_test.go
+++ b/gpu/headless/driver_test.go
@@ -8,7 +8,7 @@ import (
 	"image"
 	"image/color"
 	"image/png"
-	"io/ioutil"
+	"os"
 	"runtime"
 	"testing"
 
@@ -202,5 +202,5 @@ func saveImage(file string, img image.Image) error {
 	if err := png.Encode(&buf, img); err != nil {
 		return err
 	}
-	return ioutil.WriteFile(file, buf.Bytes(), 0666)
+	return os.WriteFile(file, buf.Bytes(), 0666)
 }
diff --git a/gpu/internal/rendertest/util_test.go b/gpu/internal/rendertest/util_test.go
index 8825f154..5844deb0 100644
--- a/gpu/internal/rendertest/util_test.go
+++ b/gpu/internal/rendertest/util_test.go
@@ -10,7 +10,6 @@ import (
 	"image/color"
 	"image/draw"
 	"image/png"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -161,7 +160,7 @@ func verifyRef(t *testing.T, img *image.RGBA, frame int) (ok bool) {
 		saveImage(t, path, img)
 		return true
 	}
-	b, err := ioutil.ReadFile(path)
+	b, err := os.ReadFile(path)
 	if err != nil {
 		t.Error("could not open ref:", err)
 		return
@@ -286,7 +285,7 @@ func saveImage(t testing.TB, file string, img *image.RGBA) {
 		t.Error(err)
 		return
 	}
-	if err := ioutil.WriteFile(file, buf.Bytes(), 0666); err != nil {
+	if err := os.WriteFile(file, buf.Bytes(), 0666); err != nil {
 		t.Error(err)
 		return
 	}