From 4417310ec307fb6c839ca61b45e5049511cfe509 Mon Sep 17 00:00:00 2001
From: Oleksandr Redko <oleksandr.red+github@gmail.com>
Date: Wed, 27 Nov 2024 00:41:39 +0200
Subject: [PATCH] unconvert: replace deprecated io/ioutil with os

---
 unconvert.go      |  5 ++---
 unconvert_test.go | 25 ++++++-------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/unconvert.go b/unconvert.go
index 507bf23..9bad5f4 100644
--- a/unconvert.go
+++ b/unconvert.go
@@ -15,7 +15,6 @@ import (
 	"go/parser"
 	"go/token"
 	"go/types"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -87,7 +86,7 @@ func apply(file string, edits editSet) {
 		log.Fatal(err)
 	}
 
-	err = ioutil.WriteFile(file, buf.Bytes(), 0)
+	err = os.WriteFile(file, buf.Bytes(), 0)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -143,7 +142,7 @@ func print(conversions []token.Position) {
 		fmt.Printf("%s:%d:%d: unnecessary conversion\n", pos.Filename, pos.Line, pos.Column)
 		if *flagV {
 			if pos.Filename != file {
-				buf, err := ioutil.ReadFile(pos.Filename)
+				buf, err := os.ReadFile(pos.Filename)
 				if err != nil {
 					log.Fatal(err)
 				}
diff --git a/unconvert_test.go b/unconvert_test.go
index f20da37..f4fdefd 100644
--- a/unconvert_test.go
+++ b/unconvert_test.go
@@ -6,7 +6,6 @@ package main_test
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -17,8 +16,7 @@ import (
 )
 
 func TestBinary(t *testing.T) {
-	exePath, cleanup := build(t)
-	defer cleanup()
+	exePath := build(t)
 
 	tests := []struct {
 		name string
@@ -139,7 +137,7 @@ func ParseOutput(t *testing.T, dir, output string) ([]Annotation, error) {
 
 func ParseDir(dir string) ([]Annotation, error) {
 	var all []Annotation
-	files, err := ioutil.ReadDir(dir)
+	files, err := os.ReadDir(dir)
 	if err != nil {
 		return nil, err
 	}
@@ -159,7 +157,7 @@ func ParseDir(dir string) ([]Annotation, error) {
 }
 
 func ParseFile(file string) ([]Annotation, error) {
-	data, err := ioutil.ReadFile(file)
+	data, err := os.ReadFile(file)
 	if err != nil {
 		return nil, err
 	}
@@ -183,24 +181,13 @@ func ParseFile(file string) ([]Annotation, error) {
 	return all, nil
 }
 
-func build(t *testing.T) (exePath string, cleanup func()) {
-	dir, err := ioutil.TempDir("", "unconvert_test")
-	if err != nil {
-		t.Fatalf("failed to create tempdir: %v\n", err)
-	}
-	exePath = filepath.Join(dir, "test_unconvert.exe")
-
-	cleanup = func() {
-		err := os.RemoveAll(dir)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
+func build(t *testing.T) (exePath string) {
+	exePath = filepath.Join(t.TempDir(), "test_unconvert.exe")
 
 	output, err := exec.Command("go", "build", "-o", exePath, ".").CombinedOutput()
 	if err != nil {
 		t.Fatalf("failed to build service program: %v\n%v", err, string(output))
 	}
 
-	return exePath, cleanup
+	return exePath
 }