From 2588ae3f9f5458626b61db0c202934b6ea7d8234 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 26 Oct 2020 00:01:36 +0100 Subject: [PATCH] tools: use ERROR_SHARING_VIOLATION const from golang.org/x/sys/windows Use ERROR_SHARING_VIOLATION defined in the golang.org/x/sys/windows package instead of duplicating it in robustio_windows.go. --- tools/robustio_windows.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/robustio_windows.go b/tools/robustio_windows.go index ef5e0443..fd5b882e 100644 --- a/tools/robustio_windows.go +++ b/tools/robustio_windows.go @@ -4,14 +4,9 @@ package tools import ( "os" - "syscall" "github.com/avast/retry-go" -) - -const ( - // This is private in [go]/src/internal/syscall/windows/syscall_windows.go :( - ERROR_SHARING_VIOLATION syscall.Errno = 32 + "golang.org/x/sys/windows" ) func underlyingError(err error) error { @@ -29,10 +24,10 @@ func underlyingError(err error) error { // isEphemeralError returns true if err may be resolved by waiting. func isEphemeralError(err error) bool { // TODO: Use this instead for Go >= 1.13 - // return errors.Is(err, ERROR_SHARING_VIOLATION) + // return errors.Is(err, windows.ERROR_SHARING_VIOLATION) err = underlyingError(err) - return err == ERROR_SHARING_VIOLATION + return err == windows.ERROR_SHARING_VIOLATION } func RobustRename(oldpath, newpath string) error {