From 02875cef9010633b6689cfd1e2ceec9107b756b4 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Sun, 4 Dec 2022 13:27:43 -0800
Subject: Stop using deprecated package io/ioutil

Since Go 1.16 (which recently became the minimum supported Go version
for this project), the package io/ioutil is deprecated in favor of
equivalent functionality in the io and os packages.  staticcheck warns
about this.  Address all the warnings by switching to the non-deprecated
replacement functions.
---
 actions/config_test.go   | 5 ++---
 actions/hashing_test.go  | 4 ++--
 actions/recovery_test.go | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'actions')

diff --git a/actions/config_test.go b/actions/config_test.go
index 3599667..49838e3 100644
--- a/actions/config_test.go
+++ b/actions/config_test.go
@@ -19,7 +19,6 @@
 package actions
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -37,7 +36,7 @@ func TestConfigFileIsCreatedWithCorrectMode(t *testing.T) {
 	defer unix.Umask(oldMask)
 	unix.Umask(0077)
 
-	tempDir, err := ioutil.TempDir("", "fscrypt")
+	tempDir, err := os.MkdirTemp("", "fscrypt")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -57,7 +56,7 @@ func TestConfigFileIsCreatedWithCorrectMode(t *testing.T) {
 }
 
 func TestCreateConfigFileV2Policy(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "fscrypt")
+	tempDir, err := os.MkdirTemp("", "fscrypt")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/actions/hashing_test.go b/actions/hashing_test.go
index 2e212e9..26f627b 100644
--- a/actions/hashing_test.go
+++ b/actions/hashing_test.go
@@ -20,7 +20,7 @@
 package actions
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"testing"
 	"time"
@@ -54,7 +54,7 @@ func TestCostsSearch(t *testing.T) {
 
 func benchmarkCostsSearch(b *testing.B, target time.Duration) {
 	// Disable logging for benchmarks
-	log.SetOutput(ioutil.Discard)
+	log.SetOutput(io.Discard)
 	for i := 0; i < b.N; i++ {
 		_, err := getHashingCosts(target)
 		if err != nil {
diff --git a/actions/recovery_test.go b/actions/recovery_test.go
index 5abd0a9..35ade0e 100644
--- a/actions/recovery_test.go
+++ b/actions/recovery_test.go
@@ -19,7 +19,6 @@
 package actions
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -29,7 +28,7 @@ import (
 )
 
 func TestRecoveryPassphrase(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "fscrypt")
+	tempDir, err := os.MkdirTemp("", "fscrypt")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -71,7 +70,7 @@ func TestRecoveryPassphrase(t *testing.T) {
 		recoveryFile); err != nil {
 		t.Fatal(err)
 	}
-	contentsBytes, err := ioutil.ReadFile(recoveryFile)
+	contentsBytes, err := os.ReadFile(recoveryFile)
 	if err != nil {
 		t.Fatal(err)
 	}
-- 
cgit v1.2.3