all: replace deprecated io/ioutil with io and os

go-delve · Sep 22, 2023 · b734d9b · b734d9b
1 parent ebc3e61
commit b734d9b
Show file tree

Hide file tree

Showing 29 changed files with 77 additions and 97 deletions.
diff --git a/_scripts/gen-faq-toc.go b/_scripts/gen-faq-toc.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"regexp"
@@ -34,7 +33,7 @@ const (
 )
 
 func spliceDocs(docpath string, docs []byte, outpath string) {
-	docbuf, err := ioutil.ReadFile(docpath)
+	docbuf, err := os.ReadFile(docpath)
 	if err != nil {
 		log.Fatalf("could not read doc file: %v", err)
 	}
@@ -59,7 +58,7 @@ func spliceDocs(docpath string, docs []byte, outpath string) {
 	outbuf.Write([]byte(footer))
 
 	if outpath != "-" {
-		err = ioutil.WriteFile(outpath, outbuf.Bytes(), 0664)
+		err = os.WriteFile(outpath, outbuf.Bytes(), 0o664)
 		must(err, "could not write documentation file: %v", err)
 	} else {
 		os.Stdout.Write(outbuf.Bytes())

diff --git a/_scripts/gen-starlark-bindings.go b/_scripts/gen-starlark-bindings.go
@@ -7,7 +7,6 @@ import (
 	"go/format"
 	"go/token"
 	"go/types"
-	"io/ioutil"
 	"log"
 	"os"
 	"strings"
@@ -279,7 +278,7 @@ const (
 )
 
 func spliceDocs(docpath string, docs []byte, outpath string) {
-	docbuf, err := ioutil.ReadFile(docpath)
+	docbuf, err := os.ReadFile(docpath)
 	if err != nil {
 		log.Fatalf("could not read doc file: %v", err)
 	}
@@ -304,7 +303,7 @@ func spliceDocs(docpath string, docs []byte, outpath string) {
 	outbuf = append(outbuf, []byte(footer)...)
 
 	if outpath != "-" {
-		err = ioutil.WriteFile(outpath, outbuf, 0664)
+		err = os.WriteFile(outpath, outbuf, 0o664)
 		if err != nil {
 			log.Fatalf("could not write documentation file: %v", err)
 		}

diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go
@@ -9,7 +9,6 @@ import (
 	"go/token"
 	"go/types"
 	"io"
-	"io/ioutil"
 	"net"
 	"os"
 	"os/exec"
@@ -341,7 +340,7 @@ func checkAutogenDoc(t *testing.T, filename, gencommand string, generated []byte
 }
 
 func slurpFile(t *testing.T, filename string) []byte {
-	saved, err := ioutil.ReadFile(filename)
+	saved, err := os.ReadFile(filename)
 	if err != nil {
 		t.Fatalf("Could not read %s: %v", filename, err)
 	}
@@ -390,7 +389,7 @@ func TestGeneratedDoc(t *testing.T) {
 	cmd.Dir = projectRoot()
 	err := cmd.Run()
 	assertNoError(err, t, "go run _scripts/gen-usage-docs.go")
-	entries, err := ioutil.ReadDir(tempDir)
+	entries, err := os.ReadDir(tempDir)
 	assertNoError(err, t, "ReadDir")
 	for _, doc := range entries {
 		docFilename := "Documentation/usage/" + doc.Name()
@@ -912,7 +911,7 @@ func TestTrace(t *testing.T) {
 
 	assertNoError(cmd.Start(), t, "running trace")
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	if !bytes.Contains(output, expected) {
@@ -936,7 +935,7 @@ func TestTrace2(t *testing.T) {
 
 	assertNoError(cmd.Start(), t, "running trace")
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	if !bytes.Contains(output, expected) {
@@ -964,7 +963,7 @@ func TestTraceMultipleGoroutines(t *testing.T) {
 
 	assertNoError(cmd.Start(), t, "running trace")
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	if !bytes.Contains(output, expected) {
@@ -978,7 +977,7 @@ func TestTraceMultipleGoroutines(t *testing.T) {
 
 func TestTracePid(t *testing.T) {
 	if runtime.GOOS == "linux" {
-		bs, _ := ioutil.ReadFile("/proc/sys/kernel/yama/ptrace_scope")
+		bs, _ := os.ReadFile("/proc/sys/kernel/yama/ptrace_scope")
 		if bs == nil || strings.TrimSpace(string(bs)) != "0" {
 			t.Logf("can not run TestAttachDetach: %v\n", bs)
 			return
@@ -1007,7 +1006,7 @@ func TestTracePid(t *testing.T) {
 
 	assertNoError(cmd.Start(), t, "running trace")
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	if !bytes.Contains(output, expected) {
@@ -1035,7 +1034,7 @@ func TestTraceBreakpointExists(t *testing.T) {
 
 	defer cmd.Wait()
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	if bytes.Contains(output, []byte("Breakpoint exists")) {
@@ -1057,7 +1056,7 @@ func TestTracePrintStack(t *testing.T) {
 
 	defer cmd.Wait()
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	if !bytes.Contains(output, []byte("Stack:")) && !bytes.Contains(output, []byte("main.main")) {
@@ -1095,7 +1094,7 @@ func TestTraceEBPF(t *testing.T) {
 
 	assertNoError(cmd.Start(), t, "running trace")
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	cmd.Wait()
@@ -1155,7 +1154,7 @@ func TestTraceEBPF2(t *testing.T) {
 
 	assertNoError(cmd.Start(), t, "running trace")
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	cmd.Wait()
@@ -1203,7 +1202,7 @@ func TestTraceEBPF3(t *testing.T) {
 
 	assertNoError(cmd.Start(), t, "running trace")
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	cmd.Wait()
@@ -1251,7 +1250,7 @@ func TestTraceEBPF4(t *testing.T) {
 
 	assertNoError(cmd.Start(), t, "running trace")
 
-	output, err := ioutil.ReadAll(rdr)
+	output, err := io.ReadAll(rdr)
 	assertNoError(err, t, "ReadAll")
 
 	cmd.Wait()

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -3,7 +3,6 @@ package config
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/user"
 	"path"
@@ -166,7 +165,7 @@ func LoadConfig() (*Config, error) {
 	}
 	defer f.Close()
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return &Config{}, fmt.Errorf("unable to read config data: %v", err)
 	}

diff --git a/pkg/dwarf/frame/entries_test.go b/pkg/dwarf/frame/entries_test.go
@@ -2,7 +2,7 @@ package frame
 
 import (
 	"encoding/binary"
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 	"unsafe"
@@ -146,7 +146,7 @@ func BenchmarkFDEForPC(b *testing.B) {
 	}
 	defer f.Close()
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		b.Fatal(err)
 	}

diff --git a/pkg/dwarf/frame/parser_test.go b/pkg/dwarf/frame/parser_test.go
@@ -3,7 +3,7 @@ package frame
 import (
 	"bytes"
 	"encoding/binary"
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 )
@@ -47,7 +47,7 @@ func BenchmarkParse(b *testing.B) {
 	}
 	defer f.Close()
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		b.Fatal(err)
 	}

diff --git a/pkg/dwarf/line/line_parser_test.go b/pkg/dwarf/line/line_parser_test.go
@@ -7,7 +7,7 @@ import (
 	"debug/pe"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -191,7 +191,7 @@ func loadBenchmarkData(tb testing.TB) DebugLines {
 		tb.Fatal("Could not find test data", p, err)
 	}
 
-	data, err := ioutil.ReadFile(p)
+	data, err := os.ReadFile(p)
 	if err != nil {
 		tb.Fatal("Could not read test data", err)
 	}
@@ -311,7 +311,7 @@ func TestDebugLineC(t *testing.T) {
 		t.Fatal("Could not find test data", p, err)
 	}
 
-	data, err := ioutil.ReadFile(p)
+	data, err := os.ReadFile(p)
 	if err != nil {
 		t.Fatal("Could not read test data", err)
 	}
@@ -360,7 +360,7 @@ func TestDebugLineDwarf4(t *testing.T) {
 	if err != nil {
 		t.Fatal("Could not open test data (zlib)", err)
 	}
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		t.Fatal("Could not read test data", err)
 	}

diff --git a/pkg/dwarf/line/state_machine_test.go b/pkg/dwarf/line/state_machine_test.go
@@ -8,7 +8,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -27,7 +26,7 @@ func slurpGzip(path string) ([]byte, error) {
 		return nil, err
 	}
 	defer gzin.Close()
-	return ioutil.ReadAll(gzin)
+	return io.ReadAll(gzin)
 }
 
 func TestGrafana(t *testing.T) {

diff --git a/pkg/gobuild/defaultexe.go b/pkg/gobuild/defaultexe.go
@@ -1,7 +1,7 @@
 package gobuild
 
 import (
-	"io/ioutil"
+	"os"
 	"runtime"
 
 	"github.com/go-delve/delve/pkg/logflags"
@@ -14,7 +14,7 @@ func DefaultDebugBinaryPath(name string) string {
 	if runtime.GOOS == "windows" {
 		pattern += "*.exe"
 	}
-	f, err := ioutil.TempFile(".", pattern)
+	f, err := os.CreateTemp(".", pattern)
 	if err != nil {
 		logflags.DebuggerLogger().Errorf("could not create temporary file for build output: %v", err)
 		if runtime.GOOS == "windows" {

diff --git a/pkg/logflags/logflags.go b/pkg/logflags/logflags.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"os"
@@ -194,7 +193,7 @@ func Setup(logFlag bool, logstr, logDest string) error {
 	}
 	log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
 	if !logFlag {
-		log.SetOutput(ioutil.Discard)
+		log.SetOutput(io.Discard)
 		if logstr != "" {
 			return errLogstrWithoutLog
 		}

diff --git a/pkg/proc/bininfo.go b/pkg/proc/bininfo.go
@@ -15,7 +15,6 @@ import (
 	"go/token"
 	"hash/crc32"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -1352,7 +1351,7 @@ func (bi *BinaryInfo) openSeparateDebugInfo(image *Image, exe *elf.File, debugIn
 
 		if debugFilePath != "" {
 			// CRC check
-			buf, err := ioutil.ReadFile(debugFilePath)
+			buf, err := os.ReadFile(debugFilePath)
 			if err == nil {
 				computedCRC := crc32.ChecksumIEEE(buf)
 				if crc != computedCRC {
@@ -1567,7 +1566,7 @@ func (bi *BinaryInfo) getDebugLink(exe *elf.File) (debugLink string, crc uint32)
 	}
 
 	br := gnuDebugLink.Open()
-	buf, err := ioutil.ReadAll(br)
+	buf, err := io.ReadAll(br)
 	if err != nil {
 		bi.logger.Warnf("can't read .gnu_debuglink: %v", err)
 		return

diff --git a/pkg/proc/core/core_test.go b/pkg/proc/core/core_test.go
@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"go/constant"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -222,9 +221,9 @@ func withCoreFile(t *testing.T, name, args string) *proc.TargetGroup {
 	p, err := OpenCore(corePath, fix.Path, []string{})
 	if err != nil {
 		t.Errorf("OpenCore(%q) failed: %v", corePath, err)
-		pat, err := ioutil.ReadFile("/proc/sys/kernel/core_pattern")
+		pat, err := os.ReadFile("/proc/sys/kernel/core_pattern")
 		t.Errorf("read core_pattern: %q, %v", pat, err)
-		apport, err := ioutil.ReadFile("/var/log/apport.log")
+		apport, err := os.ReadFile("/var/log/apport.log")
 		t.Errorf("read apport log: %q, %v", apport, err)
 		t.Fatalf("previous errors")
 	}

diff --git a/pkg/proc/core/minidump/minidump.go b/pkg/proc/core/minidump/minidump.go
@@ -20,7 +20,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"unicode/utf16"
 	"unsafe"
 
@@ -318,7 +318,7 @@ const (
 
 // Open reads the minidump file at path and returns it as a Minidump structure.
 func Open(path string, logfn func(fmt string, args ...interface{})) (*Minidump, error) {
-	rawbuf, err := ioutil.ReadFile(path) //TODO(aarzilli): mmap?
+	rawbuf, err := os.ReadFile(path) //TODO(aarzilli): mmap?
 	if err != nil {
 		return nil, err
 	}