From 5f04ef752bc9485821eae8a5b248b9d39d57989c Mon Sep 17 00:00:00 2001 From: mstmdev Date: Tue, 12 Sep 2023 11:49:41 +0000 Subject: io/fs, path/filepath, cmd/gofmt: replace statDirEntry with fs.FileInfoToDirEntry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie914367314ca72fab34c4d4529755dea853cf325 GitHub-Last-Rev: bc61665d33d7f15da371dcfb90c132fab25fc233 GitHub-Pull-Request: golang/go#62342 Reviewed-on: https://go-review.googlesource.com/c/go/+/523876 Reviewed-by: Ian Lance Taylor Reviewed-by: qiulaidongfeng <2645477756@qq.com> Reviewed-by: Tobias Klauser Auto-Submit: Ian Lance Taylor Commit-Queue: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI Reviewed-by: Heschi Kreinick Reviewed-by: Daniel Martí --- src/path/filepath/path_test.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/path/filepath/path_test.go') diff --git a/src/path/filepath/path_test.go b/src/path/filepath/path_test.go index 621208d31e..51e6a20554 100644 --- a/src/path/filepath/path_test.go +++ b/src/path/filepath/path_test.go @@ -560,25 +560,12 @@ func tempDirCanonical(t *testing.T) string { func TestWalk(t *testing.T) { walk := func(root string, fn fs.WalkDirFunc) error { return filepath.Walk(root, func(path string, info fs.FileInfo, err error) error { - return fn(path, &statDirEntry{info}, err) + return fn(path, fs.FileInfoToDirEntry(info), err) }) } testWalk(t, walk, 1) } -type statDirEntry struct { - info fs.FileInfo -} - -func (d *statDirEntry) Name() string { return d.info.Name() } -func (d *statDirEntry) IsDir() bool { return d.info.IsDir() } -func (d *statDirEntry) Type() fs.FileMode { return d.info.Mode().Type() } -func (d *statDirEntry) Info() (fs.FileInfo, error) { return d.info, nil } - -func (d *statDirEntry) String() string { - return fs.FormatDirEntry(d) -} - func TestWalkDir(t *testing.T) { testWalk(t, filepath.WalkDir, 2) } -- cgit v1.3-5-g9baa