Merge pull request #872 from apple/revert-838-revert-833-userinfoprovider-use-error
diff --git a/Foundation/NSError.swift b/Foundation/NSError.swift
index 3c6e255..576993a 100644
--- a/Foundation/NSError.swift
+++ b/Foundation/NSError.swift
@@ -144,14 +144,14 @@
return userInfo[NSHelpAnchorErrorKey] as? String
}
- internal typealias NSErrorProvider = (_ error: NSError, _ key: String) -> Any?
- internal static var userInfoProviders = [String: NSErrorProvider]()
+ internal typealias UserInfoProvider = (_ error: Error, _ key: String) -> Any?
+ internal static var userInfoProviders = [String: UserInfoProvider]()
- open class func setUserInfoValueProvider(forDomain errorDomain: String, provider: (/* @escaping */ (NSError, String) -> Any?)?) {
+ open class func setUserInfoValueProvider(forDomain errorDomain: String, provider: (/* @escaping */ (Error, String) -> Any?)?) {
NSError.userInfoProviders[errorDomain] = provider
}
- open class func userInfoValueProvider(forDomain errorDomain: String) -> ((NSError, String) -> Any?)? {
+ open class func userInfoValueProvider(forDomain errorDomain: String) -> ((Error, String) -> Any?)? {
return NSError.userInfoProviders[errorDomain]
}
