Modernize hashing in Foundation’s RawRepresentable enumerations

lorentey · lorentey · commit 4175befc1e18 · 2019-04-15T11:30:13.000-07:00
diff --git a/Foundation/FileManager.swift b/Foundation/FileManager.swift
@@ -828,11 +828,11 @@ public struct FileAttributeKey : RawRepresentable, Equatable, Hashable {
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    
-    public var hashValue: Int {
-        return self.rawValue.hashValue
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
-    
+
     public static func ==(_ lhs: FileAttributeKey, _ rhs: FileAttributeKey) -> Bool {
         return lhs.rawValue == rhs.rawValue
     }
@@ -873,8 +873,8 @@ public struct FileAttributeType : RawRepresentable, Equatable, Hashable {
         self.rawValue = rawValue
     }
 
-    public var hashValue: Int {
-        return self.rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
 
     public static func ==(_ lhs: FileAttributeType, _ rhs: FileAttributeType) -> Bool {
diff --git a/Foundation/HTTPCookie.swift b/Foundation/HTTPCookie.swift
@@ -18,8 +18,8 @@ public struct HTTPCookiePropertyKey : RawRepresentable, Equatable, Hashable {
         self.rawValue = rawValue
     }
     
-    public var hashValue: Int {
-        return self.rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
     
     public static func ==(_ lhs: HTTPCookiePropertyKey, _ rhs: HTTPCookiePropertyKey) -> Bool {
diff --git a/Foundation/NSAttributedString.swift b/Foundation/NSAttributedString.swift
@@ -21,8 +21,12 @@ extension NSAttributedString {
             self.rawValue = rawValue
         }
 
-        public var hashValue: Int {
-            return rawValue.hashValue
+        public func hash(into hasher: inout Hasher) {
+            hasher.combine(rawValue)
+        }
+
+        public static func ==(left: NSAttributedString.Key, right: NSAttributedString.Key) -> Bool {
+            return left.rawValue == right.rawValue
         }
     }
 }
diff --git a/Foundation/NSCalendar.swift b/Foundation/NSCalendar.swift
@@ -65,9 +65,9 @@ extension NSCalendar {
         public init(rawValue: String) {
             self.rawValue = rawValue
         }
-        
-        public var hashValue: Int {
-            return rawValue.hashValue
+
+        public func hash(into hasher: inout Hasher) {
+            hasher.combine(rawValue)
         }
         
         public static let gregorian = NSCalendar.Identifier("gregorian")
diff --git a/Foundation/NSDecimalNumber.swift b/Foundation/NSDecimalNumber.swift
@@ -18,9 +18,9 @@ public struct NSExceptionName : RawRepresentable, Equatable, Hashable {
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    
-    public var hashValue: Int {
-        return self.rawValue.hashValue
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
     
     public static func ==(_ lhs: NSExceptionName, _ rhs: NSExceptionName) -> Bool {
diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
@@ -176,9 +176,9 @@ extension NSLocale {
         public init(rawValue: String) {
             self.rawValue = rawValue
         }
-        
-        public var hashValue: Int {
-            return rawValue.hashValue
+
+        public func hash(into hasher: inout Hasher) {
+            hasher.combine(rawValue)
         }
         
         public static let identifier = NSLocale.Key(rawValue: "kCFLocaleIdentifierKey")
diff --git a/Foundation/NSNotification.swift b/Foundation/NSNotification.swift
@@ -13,9 +13,9 @@ open class NSNotification: NSObject, NSCopying, NSCoding {
         public init(rawValue: String) {
             self.rawValue = rawValue
         }
-        
-        public var hashValue: Int {
-            return self.rawValue.hashValue
+
+        public func hash(into hasher: inout Hasher) {
+            hasher.combine(rawValue)
         }
         
         public static func ==(lhs: Name, rhs: Name) -> Bool {
diff --git a/Foundation/NSURL.swift b/Foundation/NSURL.swift
@@ -76,8 +76,8 @@ public struct URLResourceKey : RawRepresentable, Equatable, Hashable {
         self.rawValue = rawValue
     }
 
-    public var hashValue: Int {
-        return rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
 
     public static func ==(lhs: URLResourceKey, rhs: URLResourceKey) -> Bool {
@@ -198,8 +198,8 @@ public struct URLFileResourceType : RawRepresentable, Equatable, Hashable {
         self.rawValue = rawValue
     }
 
-    public var hashValue: Int {
-        return rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
 
     public static func ==(lhs: URLFileResourceType, rhs: URLFileResourceType) -> Bool {
diff --git a/Foundation/Progress.swift b/Foundation/Progress.swift
@@ -399,7 +399,7 @@ open class Progress : NSObject {
         public let rawValue: String
         public init(_ rawValue: String) { self.rawValue = rawValue }
         public init(rawValue: String) { self.rawValue = rawValue }
-        public var hashValue: Int { return self.rawValue.hashValue }
+        public func hash(into hasher: inout Hasher) { hasher.combine(rawValue) }
         public static func ==(_ lhs: FileOperationKind, _ rhs: FileOperationKind) -> Bool { return lhs.rawValue == rhs.rawValue }
         
         /// Use for indicating the progress represents a download.
@@ -478,7 +478,7 @@ public struct ProgressKind : RawRepresentable, Equatable, Hashable {
     public let rawValue: String
     public init(_ rawValue: String) { self.rawValue = rawValue }
     public init(rawValue: String) { self.rawValue = rawValue }
-    public var hashValue: Int { return self.rawValue.hashValue }
+    public func hash(into hasher: inout Hasher) { hasher.combine(rawValue) }
     public static func ==(_ lhs: ProgressKind, _ rhs: ProgressKind) -> Bool { return lhs.rawValue == rhs.rawValue }
     
     /// Indicates that the progress being performed is related to files.
@@ -491,7 +491,7 @@ public struct ProgressUserInfoKey : RawRepresentable, Equatable, Hashable {
     public let rawValue: String
     public init(_ rawValue: String) { self.rawValue = rawValue }
     public init(rawValue: String) { self.rawValue = rawValue }
-    public var hashValue: Int { return self.rawValue.hashValue }
+    public func hash(into hasher: inout Hasher) { hasher.combine(rawValue) }
     public static func ==(_ lhs: ProgressUserInfoKey, _ rhs: ProgressUserInfoKey) -> Bool { return lhs.rawValue == rhs.rawValue }
     
     /// How much time is probably left in the operation, as an NSNumber containing a number of seconds.
diff --git a/Foundation/Stream.swift b/Foundation/Stream.swift
@@ -28,11 +28,11 @@ extension Stream {
         public init(rawValue: String) {
             self.rawValue = rawValue
         }
-        
-        public var hashValue: Int {
-            return rawValue.hashValue
+
+        public func hash(into hasher: inout Hasher) {
+            hasher.combine(rawValue)
         }
-        
+
         public static func ==(lhs: Stream.PropertyKey, rhs: Stream.PropertyKey) -> Bool {
             return lhs.rawValue == rhs.rawValue
         }
@@ -303,8 +303,8 @@ public struct StreamSocketSecurityLevel : RawRepresentable, Equatable, Hashable
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    public var hashValue: Int {
-        return rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
     public static func ==(lhs: StreamSocketSecurityLevel, rhs: StreamSocketSecurityLevel) -> Bool {
         return lhs.rawValue == rhs.rawValue
@@ -325,8 +325,8 @@ public struct StreamSOCKSProxyConfiguration : RawRepresentable, Equatable, Hasha
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    public var hashValue: Int {
-        return rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
     public static func ==(lhs: StreamSOCKSProxyConfiguration, rhs: StreamSOCKSProxyConfiguration) -> Bool {
         return lhs.rawValue == rhs.rawValue
@@ -347,8 +347,8 @@ public struct StreamSOCKSProxyVersion : RawRepresentable, Equatable, Hashable {
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    public var hashValue: Int {
-        return rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
     public static func ==(lhs: StreamSOCKSProxyVersion, rhs: StreamSOCKSProxyVersion) -> Bool {
         return lhs.rawValue == rhs.rawValue
@@ -366,8 +366,8 @@ public struct StreamNetworkServiceTypeValue : RawRepresentable, Equatable, Hasha
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    public var hashValue: Int {
-        return rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
     public static func ==(lhs: StreamNetworkServiceTypeValue, rhs: StreamNetworkServiceTypeValue) -> Bool {
         return lhs.rawValue == rhs.rawValue
diff --git a/Foundation/StringEncodings.swift b/Foundation/StringEncodings.swift
@@ -68,8 +68,8 @@ extension String {
 }
 
 extension String.Encoding : Hashable {
-    public var hashValue : Int {
-        return rawValue.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(rawValue)
     }
 
     public static func ==(lhs: String.Encoding, rhs: String.Encoding) -> Bool {

Original file line number	Diff line number	Diff line change
`@@ -828,11 +828,11 @@ public struct FileAttributeKey : RawRepresentable, Equatable, Hashable {`
`828`	`828`	`public init(rawValue: String) {`
`829`	`829`	`self.rawValue = rawValue`
`830`	`830`	`}`
`831`		`-`
`832`		`- public var hashValue: Int {`
`833`		`- return self.rawValue.hashValue`
	`831`	`+`
	`832`	`+ public func hash(into hasher: inout Hasher) {`
	`833`	`+ hasher.combine(rawValue)`
`834`	`834`	`}`
`835`		`-`
	`835`	`+`
`836`	`836`	`public static func ==(_ lhs: FileAttributeKey, _ rhs: FileAttributeKey) -> Bool {`
`837`	`837`	`return lhs.rawValue == rhs.rawValue`
`838`	`838`	`}`
`@@ -873,8 +873,8 @@ public struct FileAttributeType : RawRepresentable, Equatable, Hashable {`
`873`	`873`	`self.rawValue = rawValue`
`874`	`874`	`}`
`875`	`875`
`876`		`- public var hashValue: Int {`
`877`		`- return self.rawValue.hashValue`
	`876`	`+ public func hash(into hasher: inout Hasher) {`
	`877`	`+ hasher.combine(rawValue)`
`878`	`878`	`}`
`879`	`879`
`880`	`880`	`public static func ==(_ lhs: FileAttributeType, _ rhs: FileAttributeType) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public struct HTTPCookiePropertyKey : RawRepresentable, Equatable, Hashable {`
`18`	`18`	`self.rawValue = rawValue`
`19`	`19`	`}`
`20`	`20`
`21`		`- public var hashValue: Int {`
`22`		`- return self.rawValue.hashValue`
	`21`	`+ public func hash(into hasher: inout Hasher) {`
	`22`	`+ hasher.combine(rawValue)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public static func ==(_ lhs: HTTPCookiePropertyKey, _ rhs: HTTPCookiePropertyKey) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,12 @@ extension NSAttributedString {`
`21`	`21`	`self.rawValue = rawValue`
`22`	`22`	`}`
`23`	`23`
`24`		`- public var hashValue: Int {`
`25`		`- return rawValue.hashValue`
	`24`	`+ public func hash(into hasher: inout Hasher) {`
	`25`	`+ hasher.combine(rawValue)`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ public static func ==(left: NSAttributedString.Key, right: NSAttributedString.Key) -> Bool {`
	`29`	`+ return left.rawValue == right.rawValue`
`26`	`30`	`}`
`27`	`31`	`}`
`28`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,9 @@ extension NSCalendar {`
`65`	`65`	`public init(rawValue: String) {`
`66`	`66`	`self.rawValue = rawValue`
`67`	`67`	`}`
`68`		`-`
`69`		`- public var hashValue: Int {`
`70`		`- return rawValue.hashValue`
	`68`	`+`
	`69`	`+ public func hash(into hasher: inout Hasher) {`
	`70`	`+ hasher.combine(rawValue)`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public static let gregorian = NSCalendar.Identifier("gregorian")`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ public struct NSExceptionName : RawRepresentable, Equatable, Hashable {`
`18`	`18`	`public init(rawValue: String) {`
`19`	`19`	`self.rawValue = rawValue`
`20`	`20`	`}`
`21`		`-`
`22`		`- public var hashValue: Int {`
`23`		`- return self.rawValue.hashValue`
	`21`	`+`
	`22`	`+ public func hash(into hasher: inout Hasher) {`
	`23`	`+ hasher.combine(rawValue)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static func ==(_ lhs: NSExceptionName, _ rhs: NSExceptionName) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -176,9 +176,9 @@ extension NSLocale {`
`176`	`176`	`public init(rawValue: String) {`
`177`	`177`	`self.rawValue = rawValue`
`178`	`178`	`}`
`179`		`-`
`180`		`- public var hashValue: Int {`
`181`		`- return rawValue.hashValue`
	`179`	`+`
	`180`	`+ public func hash(into hasher: inout Hasher) {`
	`181`	`+ hasher.combine(rawValue)`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`public static let identifier = NSLocale.Key(rawValue: "kCFLocaleIdentifierKey")`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ open class NSNotification: NSObject, NSCopying, NSCoding {`
`13`	`13`	`public init(rawValue: String) {`
`14`	`14`	`self.rawValue = rawValue`
`15`	`15`	`}`
`16`		`-`
`17`		`- public var hashValue: Int {`
`18`		`- return self.rawValue.hashValue`
	`16`	`+`
	`17`	`+ public func hash(into hasher: inout Hasher) {`
	`18`	`+ hasher.combine(rawValue)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public static func ==(lhs: Name, rhs: Name) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ public struct URLResourceKey : RawRepresentable, Equatable, Hashable {`
`76`	`76`	`self.rawValue = rawValue`
`77`	`77`	`}`
`78`	`78`
`79`		`- public var hashValue: Int {`
`80`		`- return rawValue.hashValue`
	`79`	`+ public func hash(into hasher: inout Hasher) {`
	`80`	`+ hasher.combine(rawValue)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public static func ==(lhs: URLResourceKey, rhs: URLResourceKey) -> Bool {`
`@@ -198,8 +198,8 @@ public struct URLFileResourceType : RawRepresentable, Equatable, Hashable {`
`198`	`198`	`self.rawValue = rawValue`
`199`	`199`	`}`
`200`	`200`
`201`		`- public var hashValue: Int {`
`202`		`- return rawValue.hashValue`
	`201`	`+ public func hash(into hasher: inout Hasher) {`
	`202`	`+ hasher.combine(rawValue)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`public static func ==(lhs: URLFileResourceType, rhs: URLFileResourceType) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ extension Stream {`
`28`	`28`	`public init(rawValue: String) {`
`29`	`29`	`self.rawValue = rawValue`
`30`	`30`	`}`
`31`		`-`
`32`		`- public var hashValue: Int {`
`33`		`- return rawValue.hashValue`
	`31`	`+`
	`32`	`+ public func hash(into hasher: inout Hasher) {`
	`33`	`+ hasher.combine(rawValue)`
`34`	`34`	`}`
`35`		`-`
	`35`	`+`
`36`	`36`	`public static func ==(lhs: Stream.PropertyKey, rhs: Stream.PropertyKey) -> Bool {`
`37`	`37`	`return lhs.rawValue == rhs.rawValue`
`38`	`38`	`}`
`@@ -303,8 +303,8 @@ public struct StreamSocketSecurityLevel : RawRepresentable, Equatable, Hashable`
`303`	`303`	`public init(rawValue: String) {`
`304`	`304`	`self.rawValue = rawValue`
`305`	`305`	`}`
`306`		`- public var hashValue: Int {`
`307`		`- return rawValue.hashValue`
	`306`	`+ public func hash(into hasher: inout Hasher) {`
	`307`	`+ hasher.combine(rawValue)`
`308`	`308`	`}`
`309`	`309`	`public static func ==(lhs: StreamSocketSecurityLevel, rhs: StreamSocketSecurityLevel) -> Bool {`
`310`	`310`	`return lhs.rawValue == rhs.rawValue`
`@@ -325,8 +325,8 @@ public struct StreamSOCKSProxyConfiguration : RawRepresentable, Equatable, Hasha`
`325`	`325`	`public init(rawValue: String) {`
`326`	`326`	`self.rawValue = rawValue`
`327`	`327`	`}`
`328`		`- public var hashValue: Int {`
`329`		`- return rawValue.hashValue`
	`328`	`+ public func hash(into hasher: inout Hasher) {`
	`329`	`+ hasher.combine(rawValue)`
`330`	`330`	`}`
`331`	`331`	`public static func ==(lhs: StreamSOCKSProxyConfiguration, rhs: StreamSOCKSProxyConfiguration) -> Bool {`
`332`	`332`	`return lhs.rawValue == rhs.rawValue`
`@@ -347,8 +347,8 @@ public struct StreamSOCKSProxyVersion : RawRepresentable, Equatable, Hashable {`
`347`	`347`	`public init(rawValue: String) {`
`348`	`348`	`self.rawValue = rawValue`
`349`	`349`	`}`
`350`		`- public var hashValue: Int {`
`351`		`- return rawValue.hashValue`
	`350`	`+ public func hash(into hasher: inout Hasher) {`
	`351`	`+ hasher.combine(rawValue)`
`352`	`352`	`}`
`353`	`353`	`public static func ==(lhs: StreamSOCKSProxyVersion, rhs: StreamSOCKSProxyVersion) -> Bool {`
`354`	`354`	`return lhs.rawValue == rhs.rawValue`
`@@ -366,8 +366,8 @@ public struct StreamNetworkServiceTypeValue : RawRepresentable, Equatable, Hasha`
`366`	`366`	`public init(rawValue: String) {`
`367`	`367`	`self.rawValue = rawValue`
`368`	`368`	`}`
`369`		`- public var hashValue: Int {`
`370`		`- return rawValue.hashValue`
	`369`	`+ public func hash(into hasher: inout Hasher) {`
	`370`	`+ hasher.combine(rawValue)`
`371`	`371`	`}`
`372`	`372`	`public static func ==(lhs: StreamNetworkServiceTypeValue, rhs: StreamNetworkServiceTypeValue) -> Bool {`
`373`	`373`	`return lhs.rawValue == rhs.rawValue`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ extension String {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`extension String.Encoding : Hashable {`
`71`		`- public var hashValue : Int {`
`72`		`- return rawValue.hashValue`
	`71`	`+ public func hash(into hasher: inout Hasher) {`
	`72`	`+ hasher.combine(rawValue)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public static func ==(lhs: String.Encoding, rhs: String.Encoding) -> Bool {`