re

Author: callthingsoff

src/io/fs/readdir_test.go

@@ -93,14 +93,15 @@ func TestFileInfoToDirEntry(t *testing.T) {
 	}
 }
 
-func TestReadDirPath(t *testing.T) {
-	errorPath := func(err error) string {
-		var perr *PathError
-		if !errors.As(err, &perr) {
-			return ""
-		}
-		return perr.Path
+func errorPath(err error) string {
+	var perr *PathError
+	if !errors.As(err, &perr) {
+		return ""
 	}
+	return perr.Path
+}
+
+func TestReadDirPath(t *testing.T) {
 	fsys := os.DirFS(t.TempDir())
 	_, err1 := ReadDir(fsys, "non-existent")
 	_, err2 := ReadDir(struct{ FS }{fsys}, "non-existent")

src/io/fs/readfile_test.go

@@ -5,7 +5,6 @@
 package fs_test
 
 import (
-	"errors"
 	. "io/fs"
 	"os"
 	"testing"
@@ -61,13 +60,6 @@ func TestReadFile(t *testing.T) {
 }
 
 func TestReadFilePath(t *testing.T) {
-	errorPath := func(err error) string {
-		var perr *PathError
-		if !errors.As(err, &perr) {
-			return ""
-		}
-		return perr.Path
-	}
 	fsys := os.DirFS(t.TempDir())
 	_, err1 := ReadFile(fsys, "non-existent")
 	_, err2 := ReadFile(struct{ FS }{fsys}, "non-existent")

src/os/file.go

@@ -692,8 +692,10 @@ func (dir dirFS) ReadFile(name string) ([]byte, error) {
 	}
 	b, err := ReadFile(fullname)
 	if err != nil {
-		// See comment in dirFS.Open.
-		err.(*PathError).Path = name
+		if e, ok := err.(*PathError); ok {
+			// See comment in dirFS.Open.
+			e.Path = name
+		}
 		return nil, err
 	}
 	return b, nil
@@ -708,8 +710,10 @@ func (dir dirFS) ReadDir(name string) ([]DirEntry, error) {
 	}
 	entries, err := ReadDir(fullname)
 	if err != nil {
-		// See comment in dirFS.Open.
-		err.(*PathError).Path = name
+		if e, ok := err.(*PathError); ok {
+			// See comment in dirFS.Open.
+			e.Path = name
+		}
 		return nil, err
 	}
 	return entries, nil