Replace all hashValue with hash(into…)

Mike Pollard · Mike Pollard · commit da6482092e38 · 2019-04-25T11:13:29.000+01:00
diff --git a/Sources/GraphQL/Error/GraphQLError.swift b/Sources/GraphQL/Error/GraphQLError.swift
@@ -91,8 +91,8 @@ extension GraphQLError : CustomStringConvertible {
 }
 
 extension GraphQLError : Hashable {
-    public var hashValue: Int {
-        return message.hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(message)
     }
 
     public static func == (lhs: GraphQLError, rhs: GraphQLError) -> Bool {
diff --git a/Sources/GraphQL/Language/AST.swift b/Sources/GraphQL/Language/AST.swift
@@ -337,8 +337,8 @@ public final class OperationDefinition {
 }
 
 extension OperationDefinition : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: OperationDefinition, rhs: OperationDefinition) -> Bool {
@@ -450,8 +450,8 @@ public final class SelectionSet {
 }
 
 extension SelectionSet : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: SelectionSet, rhs: SelectionSet) -> Bool {
@@ -709,8 +709,8 @@ public final class FragmentDefinition {
 }
 
 extension FragmentDefinition : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: FragmentDefinition, rhs: FragmentDefinition) -> Bool {
diff --git a/Sources/GraphQL/Map/Map.swift b/Sources/GraphQL/Map/Map.swift
@@ -597,38 +597,22 @@ public func == (lhs: Map, rhs: Map) -> Bool {
 // MARK: Hashable
 
 extension Map : Hashable {
-    public var hashValue: Int {
+    public func hash(into hasher: inout Hasher) {
         switch self {
         case .null:
-            return 0
+            hasher.combine(0)
         case .bool(let bool):
-            return bool.hashValue
+            hasher.combine(bool)
         case .double(let double):
-            return double.hashValue
+            hasher.combine(double)
         case .int(let int):
-            return int.hashValue
+            hasher.combine(int)
         case .string(let string):
-            return string.hashValue
+            hasher.combine(string)
         case .array(let array):
-            var hash = 5381
-
-            for item in array {
-                hash = ((hash << 5) &+ hash) &+ item.hashValue
-            }
-
-            return hash
+            hasher.combine(array)
         case .dictionary(let dictionary):
-            var hash = 5381
-            var keyHash = 5381
-            var valueHash = 5381
-
-            for (key, value) in dictionary {
-                keyHash = ((keyHash << 5) &+ keyHash) &+ key.hashValue
-                valueHash = ((valueHash << 5) &+ valueHash) &+ value.hashValue
-                hash = ((hash << 5) &+ hash) &+ (keyHash ^ valueHash)
-            }
-
-            return hash
+            hasher.combine(dictionary)
         }
     }
 }
diff --git a/Sources/GraphQL/Type/Definition.swift b/Sources/GraphQL/Type/Definition.swift
@@ -228,8 +228,8 @@ extension GraphQLScalarType {
 }
 
 extension GraphQLScalarType : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: GraphQLScalarType, rhs: GraphQLScalarType) -> Bool {
@@ -332,8 +332,8 @@ extension GraphQLObjectType {
 }
 
 extension GraphQLObjectType : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: GraphQLObjectType, rhs: GraphQLObjectType) -> Bool {
@@ -659,8 +659,8 @@ extension GraphQLInterfaceType {
 }
 
 extension GraphQLInterfaceType : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: GraphQLInterfaceType, rhs: GraphQLInterfaceType) -> Bool {
@@ -738,8 +738,8 @@ extension GraphQLUnionType {
 }
 
 extension GraphQLUnionType : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: GraphQLUnionType, rhs: GraphQLUnionType) -> Bool {
@@ -875,8 +875,8 @@ extension GraphQLEnumType {
 }
 
 extension GraphQLEnumType : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: GraphQLEnumType, rhs: GraphQLEnumType) -> Bool {
@@ -1009,8 +1009,8 @@ extension GraphQLInputObjectType {
 }
 
 extension GraphQLInputObjectType : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: GraphQLInputObjectType, rhs: GraphQLInputObjectType) -> Bool {
@@ -1137,8 +1137,8 @@ extension GraphQLList {
 }
 
 extension GraphQLList : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: GraphQLList, rhs: GraphQLList) -> Bool {
@@ -1210,8 +1210,8 @@ extension GraphQLNonNull {
 }
 
 extension GraphQLNonNull : Hashable {
-    public var hashValue: Int {
-        return ObjectIdentifier(self).hashValue
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ObjectIdentifier(self))
     }
 
     public static func == (lhs: GraphQLNonNull, rhs: GraphQLNonNull) -> Bool {
diff --git a/Sources/GraphQL/Validation/Validate.swift b/Sources/GraphQL/Validation/Validate.swift
@@ -77,12 +77,12 @@ enum HasSelectionSet {
 }
 
 extension HasSelectionSet : Hashable {
-    var hashValue: Int {
+    func hash(into hasher: inout Hasher) {
         switch self {
         case .operation(let operation):
-            return operation.hashValue
+            return hasher.combine(operation.hashValue)
         case .fragment(let fragment):
-            return fragment.hashValue
+            return hasher.combine(fragment.hashValue)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ extension GraphQLError : CustomStringConvertible {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`extension GraphQLError : Hashable {`
`94`		`- public var hashValue: Int {`
`95`		`- return message.hashValue`
	`94`	`+ public func hash(into hasher: inout Hasher) {`
	`95`	`+ hasher.combine(message)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public static func == (lhs: GraphQLError, rhs: GraphQLError) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -337,8 +337,8 @@ public final class OperationDefinition {`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`extension OperationDefinition : Hashable {`
`340`		`- public var hashValue: Int {`
`341`		`- return ObjectIdentifier(self).hashValue`
	`340`	`+ public func hash(into hasher: inout Hasher) {`
	`341`	`+ hasher.combine(ObjectIdentifier(self))`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`public static func == (lhs: OperationDefinition, rhs: OperationDefinition) -> Bool {`
`@@ -450,8 +450,8 @@ public final class SelectionSet {`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`extension SelectionSet : Hashable {`
`453`		`- public var hashValue: Int {`
`454`		`- return ObjectIdentifier(self).hashValue`
	`453`	`+ public func hash(into hasher: inout Hasher) {`
	`454`	`+ hasher.combine(ObjectIdentifier(self))`
`455`	`455`	`}`
`456`	`456`
`457`	`457`	`public static func == (lhs: SelectionSet, rhs: SelectionSet) -> Bool {`
`@@ -709,8 +709,8 @@ public final class FragmentDefinition {`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`extension FragmentDefinition : Hashable {`
`712`		`- public var hashValue: Int {`
`713`		`- return ObjectIdentifier(self).hashValue`
	`712`	`+ public func hash(into hasher: inout Hasher) {`
	`713`	`+ hasher.combine(ObjectIdentifier(self))`
`714`	`714`	`}`
`715`	`715`
`716`	`716`	`public static func == (lhs: FragmentDefinition, rhs: FragmentDefinition) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -228,8 +228,8 @@ extension GraphQLScalarType {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`extension GraphQLScalarType : Hashable {`
`231`		`- public var hashValue: Int {`
`232`		`- return ObjectIdentifier(self).hashValue`
	`231`	`+ public func hash(into hasher: inout Hasher) {`
	`232`	`+ hasher.combine(ObjectIdentifier(self))`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`public static func == (lhs: GraphQLScalarType, rhs: GraphQLScalarType) -> Bool {`
`@@ -332,8 +332,8 @@ extension GraphQLObjectType {`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`extension GraphQLObjectType : Hashable {`
`335`		`- public var hashValue: Int {`
`336`		`- return ObjectIdentifier(self).hashValue`
	`335`	`+ public func hash(into hasher: inout Hasher) {`
	`336`	`+ hasher.combine(ObjectIdentifier(self))`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`public static func == (lhs: GraphQLObjectType, rhs: GraphQLObjectType) -> Bool {`
`@@ -659,8 +659,8 @@ extension GraphQLInterfaceType {`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`extension GraphQLInterfaceType : Hashable {`
`662`		`- public var hashValue: Int {`
`663`		`- return ObjectIdentifier(self).hashValue`
	`662`	`+ public func hash(into hasher: inout Hasher) {`
	`663`	`+ hasher.combine(ObjectIdentifier(self))`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`public static func == (lhs: GraphQLInterfaceType, rhs: GraphQLInterfaceType) -> Bool {`
`@@ -738,8 +738,8 @@ extension GraphQLUnionType {`
`738`	`738`	`}`
`739`	`739`
`740`	`740`	`extension GraphQLUnionType : Hashable {`
`741`		`- public var hashValue: Int {`
`742`		`- return ObjectIdentifier(self).hashValue`
	`741`	`+ public func hash(into hasher: inout Hasher) {`
	`742`	`+ hasher.combine(ObjectIdentifier(self))`
`743`	`743`	`}`
`744`	`744`
`745`	`745`	`public static func == (lhs: GraphQLUnionType, rhs: GraphQLUnionType) -> Bool {`
`@@ -875,8 +875,8 @@ extension GraphQLEnumType {`
`875`	`875`	`}`
`876`	`876`
`877`	`877`	`extension GraphQLEnumType : Hashable {`
`878`		`- public var hashValue: Int {`
`879`		`- return ObjectIdentifier(self).hashValue`
	`878`	`+ public func hash(into hasher: inout Hasher) {`
	`879`	`+ hasher.combine(ObjectIdentifier(self))`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`public static func == (lhs: GraphQLEnumType, rhs: GraphQLEnumType) -> Bool {`
`@@ -1009,8 +1009,8 @@ extension GraphQLInputObjectType {`
`1009`	`1009`	`}`
`1010`	`1010`
`1011`	`1011`	`extension GraphQLInputObjectType : Hashable {`
`1012`		`- public var hashValue: Int {`
`1013`		`- return ObjectIdentifier(self).hashValue`
	`1012`	`+ public func hash(into hasher: inout Hasher) {`
	`1013`	`+ hasher.combine(ObjectIdentifier(self))`
`1014`	`1014`	`}`
`1015`	`1015`
`1016`	`1016`	`public static func == (lhs: GraphQLInputObjectType, rhs: GraphQLInputObjectType) -> Bool {`
`@@ -1137,8 +1137,8 @@ extension GraphQLList {`
`1137`	`1137`	`}`
`1138`	`1138`
`1139`	`1139`	`extension GraphQLList : Hashable {`
`1140`		`- public var hashValue: Int {`
`1141`		`- return ObjectIdentifier(self).hashValue`
	`1140`	`+ public func hash(into hasher: inout Hasher) {`
	`1141`	`+ hasher.combine(ObjectIdentifier(self))`
`1142`	`1142`	`}`
`1143`	`1143`
`1144`	`1144`	`public static func == (lhs: GraphQLList, rhs: GraphQLList) -> Bool {`
`@@ -1210,8 +1210,8 @@ extension GraphQLNonNull {`
`1210`	`1210`	`}`
`1211`	`1211`
`1212`	`1212`	`extension GraphQLNonNull : Hashable {`
`1213`		`- public var hashValue: Int {`
`1214`		`- return ObjectIdentifier(self).hashValue`
	`1213`	`+ public func hash(into hasher: inout Hasher) {`
	`1214`	`+ hasher.combine(ObjectIdentifier(self))`
`1215`	`1215`	`}`
`1216`	`1216`
`1217`	`1217`	`public static func == (lhs: GraphQLNonNull, rhs: GraphQLNonNull) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,12 @@ enum HasSelectionSet {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`extension HasSelectionSet : Hashable {`
`80`		`- var hashValue: Int {`
	`80`	`+ func hash(into hasher: inout Hasher) {`
`81`	`81`	`switch self {`
`82`	`82`	`case .operation(let operation):`
`83`		`- return operation.hashValue`
	`83`	`+ return hasher.combine(operation.hashValue)`
`84`	`84`	`case .fragment(let fragment):`
`85`		`- return fragment.hashValue`
	`85`	`+ return hasher.combine(fragment.hashValue)`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`