Merge pull request swiftlang#1924 from hartbit/hash-value-warnings

Resolve Hashable related warnings

Author: hartbit

Sources/Basic/KeyedPair.swift

@@ -42,8 +42,8 @@ public struct KeyedPair<T, K: Hashable>: Hashable {
  self.key = key
  }
 
- public var hashValue: Int {
- return key.hashValue
+ public func hash(into hasher: inout Hasher) {
+ hasher.combine(key)
  }
 }
 public func ==<T, K>(lhs: KeyedPair<T, K>, rhs: KeyedPair<T, K>) -> Bool {

Sources/Basic/ObjectIdentifierProtocol.swift

@@ -14,8 +14,8 @@
 public protocol ObjectIdentifierProtocol: class, Hashable {}
 
 extension ObjectIdentifierProtocol {
- public var hashValue: Int {
- return ObjectIdentifier(self).hashValue
+ public func hash(into hasher: inout Hasher) {
+ hasher.combine(ObjectIdentifier(self))
  }
 
  public static func == (lhs: Self, rhs: Self) -> Bool {

Sources/PackageGraph/DependencyResolver.swift

@@ -109,23 +109,6 @@ public enum VersionSetSpecifier: Hashable, CustomStringConvertible {
  }
  }
 
- //FIXME: Remove in 4.2
- public var hashValue: Int {
- switch (self) {
- case .any:
- return 0xB58D
-
- case .empty:
- return 0x7121
-
- case .range(let range):
- return 0x4CF3 ^ (range.lowerBound.hashValue &* 31) ^ range.upperBound.hashValue
-
- case .exact(let version):
- return 0xD04F ^ version.hashValue
- }
- }
-
  /// Check if the set contains a version.
  public func contains(_ version: Version) -> Bool {
  switch self {
@@ -417,15 +400,6 @@ public struct PackageContainerConstraintSet<C: PackageContainer>: Collection, Ha
  return constraints[identifier] ?? .versionSet(.any)
  }
 
- //FIXME: Remove in 4.2? Perhaps?
- public var hashValue: Int {
- var result = 0
- for c in self.constraints {
- result ^= c.key.hashValue &* 0x62F ^ c.value.hashValue
- }
- return result
- }
-
  /// Create a constraint set by merging the `requirement` for container `identifier`.
  ///
  /// - Returns: The new set, or nil the resulting set is unsatisfiable.
@@ -839,8 +813,9 @@ public class DependencyResolver<
  let container: Container
  let allConstraints: ConstraintSet
 
- var hashValue: Int {
- return container.identifier.hashValue ^ allConstraints.hashValue
+ func hash(into hasher: inout Hasher) {
+ hasher.combine(container.identifier)
+ hasher.combine(allConstraints)
  }
 
  static func ==(lhs: ResolveSubtreeCacheKey, rhs: ResolveSubtreeCacheKey) -> Bool {

Sources/PackageModel/Package.swift

@@ -109,12 +109,7 @@ extension Package: CustomStringConvertible {
  }
 }
 
-extension Package: Hashable, Equatable {
- public var hashValue: Int { return ObjectIdentifier(self).hashValue }
- 
- public static func == (lhs: Package, rhs: Package) -> Bool {
- return ObjectIdentifier(lhs) == ObjectIdentifier(rhs)
- }
+extension Package: ObjectIdentifierProtocol {
 }
 
 /// A package reference.
@@ -163,8 +158,8 @@ public struct PackageReference: JSONMappable, JSONSerializable, CustomStringConv
  return lhs.identity == rhs.identity
  }
 
- public var hashValue: Int {
- return identity.hashValue
+ public func hash(into hasher: inout Hasher) {
+ hasher.combine(identity)
  }
 
  public init(json: JSON) throws {

Sources/Utility/ArgumentParser.swift

@@ -290,8 +290,8 @@ protocol ArgumentProtocol: Hashable {
 extension ArgumentProtocol {
  // MARK: - Conformance for Hashable
 
- public var hashValue: Int {
- return name.hashValue
+ public func hash(into hasher: inout Hasher) {
+ return hasher.combine(name)
  }
 
  public static func == (_ lhs: Self, _ rhs: Self) -> Bool {

Sources/Xcodeproj/XcodeProjectModelSerialization.swift

@@ -466,8 +466,8 @@ fileprivate class PropertyListSerializer {
  self.object = object
  }
 
- var hashValue: Int {
- return ObjectIdentifier(object).hashValue
+ func hash(into hasher: inout Hasher) {
+ hasher.combine(ObjectIdentifier(object))
  }
 
  static func == (lhs: SerializedObjectRef, rhs: SerializedObjectRef) -> Bool {