pkg/mmv
1
0
Fork 0
mirror of https://github.com/itchyny/mmv.git synced 2025-12-26 14:14:57 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch from deprecated io/ioutil to os package

Browse source
This commit is contained in:
itchyny 2023-04-09 12:22:40 +09:00
parent 0d6dba4de7
commit 8d31a98aa7
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mmv_test.go
View file

@ -1,7 +1,6 @@
package mmv
import (
"io/ioutil"
"os"
"path/filepath"
"reflect"
@ -385,9 +384,9 @@ func TestRename(t *testing.T) {
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
dir, err := ioutil.TempDir("", "mmv-")
dir, err := os.MkdirTemp("", "mmv-")
if err != nil {
t.Fatalf("ioutil.TempDir returned an error: %s", err)
t.Fatalf("os.MkdirTemp returned an error: %s", err)
}
t.Cleanup(func() { os.RemoveAll(dir) })
if err := os.Chdir(dir); err != nil {
@ -423,7 +422,7 @@ func setupFiles(contents map[string]string) error {
return err
}
}
if err := ioutil.WriteFile(f, []byte(cnt), 0o600); err != nil {
if err := os.WriteFile(f, []byte(cnt), 0o600); err != nil {
return err
}
}
@ -432,7 +431,7 @@ func setupFiles(contents map[string]string) error {
func fileContents(dir string) map[string]string {
m := make(map[string]string)
fis, _ := ioutil.ReadDir(dir)
fis, _ := os.ReadDir(dir)
for _, fi := range fis {
if fi.IsDir() {
for k, v := range fileContents(filepath.Join(dir, fi.Name())) {
@ -440,7 +439,7 @@ func fileContents(dir string) map[string]string {
}
} else {
path := filepath.Join(dir, fi.Name())
cnt, _ := ioutil.ReadFile(path)
cnt, _ := os.ReadFile(path)
m[filepath.ToSlash(path)] = string(cnt)
}
}