2
2
mirror of https://github.com/octoleo/restic.git synced 2024-11-22 04:45:15 +00:00

Replace usages of ioutil.ReadDir

This changes the return type to []fs.DirEntry. However, as we only use
the filenames anyways, this doesn't make a difference.
This commit is contained in:
Michael Eischer 2022-12-02 19:42:19 +01:00
parent ff7ef5007e
commit f755233210
3 changed files with 3 additions and 6 deletions

View File

@ -6,7 +6,6 @@ package main
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"syscall" "syscall"
@ -57,7 +56,7 @@ func nlink(info os.FileInfo) uint64 {
func createFileSetPerHardlink(dir string) map[uint64][]string { func createFileSetPerHardlink(dir string) map[uint64][]string {
var stat syscall.Stat_t var stat syscall.Stat_t
linkTests := make(map[uint64][]string) linkTests := make(map[uint64][]string)
files, err := ioutil.ReadDir(dir) files, err := os.ReadDir(dir)
if err != nil { if err != nil {
return nil return nil
} }

View File

@ -6,7 +6,6 @@ package main
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
) )
@ -39,7 +38,7 @@ func inode(info os.FileInfo) uint64 {
func createFileSetPerHardlink(dir string) map[uint64][]string { func createFileSetPerHardlink(dir string) map[uint64][]string {
linkTests := make(map[uint64][]string) linkTests := make(map[uint64][]string)
files, err := ioutil.ReadDir(dir) files, err := os.ReadDir(dir)
if err != nil { if err != nil {
return nil return nil
} }

View File

@ -4,7 +4,6 @@ import (
"bufio" "bufio"
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -366,7 +365,7 @@ func runBuild(sourceDir, outputDir, version string) {
} }
func readdir(dir string) []string { func readdir(dir string) []string {
fis, err := ioutil.ReadDir(dir) fis, err := os.ReadDir(dir)
if err != nil { if err != nil {
die("readdir %v failed: %v", dir, err) die("readdir %v failed: %v", dir, err)
} }