Merge pull request #1820 from ikesyo/use-hash-into

Author: swift-ci

Foundation/Calendar.swift

@@ -859,12 +859,12 @@ public struct Calendar : Hashable, Equatable, ReferenceConvertible, _MutableBoxi
 
     // MARK: -
 
-    public var hashValue: Int {
+    public func hash(into hasher: inout Hasher) {
         // We implement hash ourselves, because we need to make sure autoupdating calendars have the same hash
         if _autoupdating {
-            return 1
+            hasher.combine(1 as Int8)
         } else {
-            return _handle.map { $0.hash }
+            hasher.combine(_handle.map { $0 })
         }
     }
 

Foundation/CharacterSet.swift

@@ -169,8 +169,8 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
         }
     }
 
-    public var hashValue: Int {
-        return _mapUnmanaged { $0.hashValue }
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_mapUnmanaged { $0 })
     }
 
     public var description: String {

Foundation/DateComponents.swift

@@ -302,8 +302,8 @@ public struct DateComponents : ReferenceConvertible, Hashable, Equatable, _Mutab
 
     // MARK: -
 
-    public var hashValue: Int {
-        return _handle.map { $0.hash }
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_handle.map { $0 })
     }
 
     public static func ==(lhs: DateComponents, rhs: DateComponents) -> Bool {

Foundation/IndexSet.swift

@@ -173,10 +173,10 @@ public struct IndexSet : ReferenceConvertible, Equatable, BidirectionalCollectio
         _handle = _MutablePairHandle(NSIndexSet(), copying: false)
     }
 
-    public var hashValue: Int {
-        return _handle.map { $0.hash }
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_handle.map { $0 })
     }
-    
+
     /// Returns the number of integers in `self`.
     public var count: Int {
         return _handle.map { $0.count }

Foundation/Locale.swift

@@ -421,11 +421,11 @@ public struct Locale : CustomStringConvertible, CustomDebugStringConvertible, Ha
         return _wrapped.debugDescription
     }
 
-    public var hashValue : Int {
+    public func hash(into hasher: inout Hasher) {
         if _autoupdating {
-            return 1
+            hasher.combine(1 as Int8)
         } else {
-            return _wrapped.hash
+            hasher.combine(_wrapped)
         }
     }
 

Foundation/Notification.swift

@@ -36,11 +36,11 @@ public struct Notification : ReferenceConvertible, Equatable, Hashable {
         self.object = object
         self.userInfo = userInfo
     }
-    
-    public var hashValue: Int {
-        return name.rawValue.hash
-    }
 
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(name)
+    }
+    
     public var description: String {
         var description = "name = \(name.rawValue)"
         if let obj = object { description += ", object = \(obj)" }

Foundation/PersonNameComponents.swift

@@ -68,10 +68,10 @@ public struct PersonNameComponents : ReferenceConvertible, Hashable, Equatable,
         set { _applyMutation { $0.phoneticRepresentation = newValue } }
     }
 
-    public var hashValue : Int {
-        return _handle.map { $0.hash }
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_handle.map { $0 })
     }
-    
+
     public static func ==(lhs : PersonNameComponents, rhs: PersonNameComponents) -> Bool {
         // Don't copy references here; no one should be storing anything
         return lhs._handle._uncopiedReference().isEqual(rhs._handle._uncopiedReference())

Foundation/TimeZone.swift

@@ -210,11 +210,11 @@ public struct TimeZone : Hashable, Equatable, ReferenceConvertible {
 
     // MARK: -
 
-    public var hashValue : Int {
+    public func hash(into hasher: inout Hasher) {
         if _autoupdating {
-            return 1
+            hasher.combine(1 as Int8)
         } else {
-            return _wrapped.hash
+            hasher.combine(_wrapped)
         }
     }
 

Foundation/URL.swift

@@ -503,8 +503,8 @@ public struct URL : ReferenceConvertible, Equatable {
         _url = URL._converted(from: NSURL(fileURLWithFileSystemRepresentation: path, isDirectory: isDirectory, relativeTo: baseURL))
     }
 
-    public var hashValue: Int {
-        return _url.hash
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_url)
     }
 
     // MARK: -

Foundation/URLComponents.swift

@@ -274,10 +274,10 @@ public struct URLComponents : ReferenceConvertible, Hashable, Equatable, _Mutabl
         set { _applyMutation { $0.queryItems = newValue } }
     }
 
-    public var hashValue: Int {
-        return _handle.map { $0.hash }
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_handle.map { $0 })
     }
-    
+
     // MARK: - Bridging
 
     fileprivate init(reference: NSURLComponents) {
@@ -346,9 +346,11 @@ public struct URLQueryItem : ReferenceConvertible, Hashable, Equatable {
         get { return _queryItem.value }
         set { _queryItem = NSURLQueryItem(name: name, value: newValue) }
     }
-    
-    public var hashValue: Int { return _queryItem.hash }
-    
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_queryItem)
+    }
+
     public static func ==(lhs: URLQueryItem, rhs: URLQueryItem) -> Bool {
         return lhs._queryItem.isEqual(rhs._queryItem)
     }

Foundation/URLRequest.swift

@@ -227,8 +227,8 @@ public struct URLRequest : ReferenceConvertible, Equatable, Hashable {
         }
     }
 
-    public var hashValue: Int {
-        return _handle.map { $0.hashValue }
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_handle.map { $0 })
     }
 
     public static func ==(lhs: URLRequest, rhs: URLRequest) -> Bool {