Merge pull request #2194 from compnerd/failure-is-success

compnerd · web-flow · commit 65a378df4834 · 2019-04-30T08:34:57.000-07:00
Foundation: allow failure in attribute query
diff --git a/Foundation/FileManager+Win32.swift b/Foundation/FileManager+Win32.swift
@@ -405,7 +405,7 @@ extension FileManager {
         guard alreadyConfirmed || shouldRemoveItemAtPath(path, isURL: isURL) else {
             return
         }
-        let faAttributes = try! windowsFileAttributes(atPath: path)
+        let faAttributes = try windowsFileAttributes(atPath: path)
         if faAttributes.dwFileAttributes & DWORD(FILE_ATTRIBUTE_DIRECTORY) == 0 {
             if !path.withCString(encodedAs: UTF16.self, DeleteFileW) {
                 throw _NSErrorWithWindowsError(GetLastError(), reading: false)

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ extension FileManager {`
`405`	`405`	`guard alreadyConfirmed \|\| shouldRemoveItemAtPath(path, isURL: isURL) else {`
`406`	`406`	`return`
`407`	`407`	`}`
`408`		`- let faAttributes = try! windowsFileAttributes(atPath: path)`
	`408`	`+ let faAttributes = try windowsFileAttributes(atPath: path)`
`409`	`409`	`if faAttributes.dwFileAttributes & DWORD(FILE_ATTRIBUTE_DIRECTORY) == 0 {`
`410`	`410`	`if !path.withCString(encodedAs: UTF16.self, DeleteFileW) {`
`411`	`411`	`throw _NSErrorWithWindowsError(GetLastError(), reading: false)`