Merge pull request #135 from alexandear/remove-unused-go-1.15-files

Remove unnecessary files used for Go 1.15
otiai10 · Jan 9, 2024 · 2e7e0e6 · 2e7e0e6
2 parents 83d4daf + 03621bf
commit 2e7e0e6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 83 deletions.
diff --git a/fileinfo_go1.15.go b/fileinfo_go1.15.go
diff --git a/fileinfo_go1.16.go b/fileinfo_go1.16.go
diff --git a/patherror_go1.15_test.go b/patherror_go1.15_test.go
diff --git a/patherror_go1.16_test.go → patherror_test.go b/patherror_go1.16_test.go → patherror_test.go
@@ -1,6 +1,3 @@
-//go:build go1.16
-// +build go1.16
-
 package copy
 
 import (

diff --git a/permission_control.go b/permission_control.go
@@ -1,6 +1,7 @@
 package copy
 
 import (
+	"io/fs"
 	"os"
 )
 
@@ -11,11 +12,11 @@ const (
 	tmpPermissionForDirectory = os.FileMode(0755)
 )
 
-type PermissionControlFunc func(srcinfo fileInfo, dest string) (chmodfunc func(*error), err error)
+type PermissionControlFunc func(srcinfo fs.FileInfo, dest string) (chmodfunc func(*error), err error)
 
 var (
 	AddPermission = func(perm os.FileMode) PermissionControlFunc {
-		return func(srcinfo fileInfo, dest string) (func(*error), error) {
+		return func(srcinfo fs.FileInfo, dest string) (func(*error), error) {
 			orig := srcinfo.Mode()
 			if srcinfo.IsDir() {
 				if err := os.MkdirAll(dest, tmpPermissionForDirectory); err != nil {
@@ -28,7 +29,7 @@ var (
 		}
 	}
 	PerservePermission PermissionControlFunc = AddPermission(0)
-	DoNothing          PermissionControlFunc = func(srcinfo fileInfo, dest string) (func(*error), error) {
+	DoNothing          PermissionControlFunc = func(srcinfo fs.FileInfo, dest string) (func(*error), error) {
 		if srcinfo.IsDir() {
 			if err := os.MkdirAll(dest, srcinfo.Mode()); err != nil {
 				return func(*error) {}, err

diff --git a/preserve_owner.go b/preserve_owner.go
@@ -4,11 +4,12 @@
 package copy
 
 import (
+	"io/fs"
 	"os"
 	"syscall"
 )
 
-func preserveOwner(src, dest string, info fileInfo) (err error) {
+func preserveOwner(src, dest string, info fs.FileInfo) (err error) {
 	if info == nil {
 		if info, err = os.Stat(src); err != nil {
 			return err

diff --git a/preserve_owner_x.go b/preserve_owner_x.go
@@ -3,6 +3,8 @@
 
 package copy
 
-func preserveOwner(src, dest string, info fileInfo) (err error) {
+import "io/fs"
+
+func preserveOwner(src, dest string, info fs.FileInfo) (err error) {
 	return nil
 }