lint: Remove usage of deprecated io/util package

codeclysm · May 25, 2023 · 4518746 · 4518746
1 parent bfb3f5b
commit 4518746
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/extract_test.go b/extract_test.go
@@ -5,7 +5,6 @@ import (
  "context"
  "fmt"
  "io"
- "io/ioutil"
  "net/http"
  "os"
  "path/filepath"
@@ -187,9 +186,9 @@ func TestArchiveFailure(t *testing.T) {
 
 func TestExtract(t *testing.T) {
  for _, test := range ExtractCases {
- dir, _ := ioutil.TempDir("", "")
+ dir, _ := os.MkdirTemp("", "")
  dir = filepath.Join(dir, "test")
- data, err := ioutil.ReadFile(test.Archive)
+ data, err := os.ReadFile(test.Archive)
  if err != nil {
  t.Fatal(err)
  }
@@ -222,8 +221,8 @@ func TestExtract(t *testing.T) {
 }
 
 func BenchmarkArchive(b *testing.B) {
- dir, _ := ioutil.TempDir("", "")
- data, _ := ioutil.ReadFile("testdata/archive.tar.bz2")
+ dir, _ := os.MkdirTemp("", "")
+ data, _ := os.ReadFile("testdata/archive.tar.bz2")
 
  b.StartTimer()
 
@@ -244,8 +243,8 @@ func BenchmarkArchive(b *testing.B) {
 }
 
 func BenchmarkTarBz2(b *testing.B) {
- dir, _ := ioutil.TempDir("", "")
- data, _ := ioutil.ReadFile("testdata/archive.tar.bz2")
+ dir, _ := os.MkdirTemp("", "")
+ data, _ := os.ReadFile("testdata/archive.tar.bz2")
 
  b.StartTimer()
 
@@ -266,8 +265,8 @@ func BenchmarkTarBz2(b *testing.B) {
 }
 
 func BenchmarkTarGz(b *testing.B) {
- dir, _ := ioutil.TempDir("", "")
- data, _ := ioutil.ReadFile("testdata/archive.tar.gz")
+ dir, _ := os.MkdirTemp("", "")
+ data, _ := os.ReadFile("testdata/archive.tar.gz")
 
  b.StartTimer()
 
@@ -288,8 +287,8 @@ func BenchmarkTarGz(b *testing.B) {
 }
 
 func BenchmarkZip(b *testing.B) {
- dir, _ := ioutil.TempDir("", "")
- data, _ := ioutil.ReadFile("testdata/archive.zip")
+ dir, _ := os.MkdirTemp("", "")
+ data, _ := os.ReadFile("testdata/archive.zip")
 
  b.StartTimer()
 
@@ -319,7 +318,7 @@ func testWalk(t *testing.T, dir string, testFiles Files) {
  } else if info.Mode()&os.ModeSymlink != 0 {
  files[path] = "link"
  } else {
- data, err := ioutil.ReadFile(filepath.Join(dir, path))
+ data, err := os.ReadFile(filepath.Join(dir, path))
  require.NoError(t, err)
  files[path] = strings.TrimSpace(string(data))
  }

diff --git a/extractor.go b/extractor.go
@@ -9,7 +9,6 @@ import (
  "context"
  "fmt"
  "io"
- "io/ioutil"
  "os"
  "path/filepath"
  "strings"
@@ -307,7 +306,7 @@ func (e *Extractor) Zip(ctx context.Context, body io.Reader, location string, re
  case info.Mode()&os.ModeSymlink != 0:
  if f, err := header.Open(); err != nil {
  return errors.Annotatef(err, "Open link %s", path)
- } else if name, err := ioutil.ReadAll(f); err != nil {
+ } else if name, err := io.ReadAll(f); err != nil {
  return errors.Annotatef(err, "Read address of link %s", path)
  } else {
  links = append(links, link{Path: path, Name: string(name)})