Merge pull request #2134 from lorentey/delete-unnecessary-hashable-impls

swift-ci · web-flow · commit c82e1deba471 · 2019-04-23T17:14:37.000-07:00
diff --git a/Foundation/FileManager.swift b/Foundation/FileManager.swift
@@ -884,14 +884,6 @@ public struct FileAttributeKey : RawRepresentable, Equatable, Hashable {
         self.rawValue = rawValue
     }
 
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-
-    public static func ==(_ lhs: FileAttributeKey, _ rhs: FileAttributeKey) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
-    
     public static let type = FileAttributeKey(rawValue: "NSFileType")
     public static let size = FileAttributeKey(rawValue: "NSFileSize")
     public static let modificationDate = FileAttributeKey(rawValue: "NSFileModificationDate")
@@ -928,14 +920,6 @@ public struct FileAttributeType : RawRepresentable, Equatable, Hashable {
         self.rawValue = rawValue
     }
 
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-
-    public static func ==(_ lhs: FileAttributeType, _ rhs: FileAttributeType) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
-
 #if os(Windows)
     internal init(attributes: WIN32_FILE_ATTRIBUTE_DATA, atPath path: String) {
       if attributes.dwFileAttributes & DWORD(FILE_ATTRIBUTE_DIRECTORY) == DWORD(FILE_ATTRIBUTE_DIRECTORY) {
diff --git a/Foundation/HTTPCookie.swift b/Foundation/HTTPCookie.swift
@@ -17,14 +17,6 @@ public struct HTTPCookiePropertyKey : RawRepresentable, Equatable, Hashable {
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-    
-    public static func ==(_ lhs: HTTPCookiePropertyKey, _ rhs: HTTPCookiePropertyKey) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
 }
 
 extension HTTPCookiePropertyKey {
diff --git a/Foundation/NSAttributedString.swift b/Foundation/NSAttributedString.swift
@@ -20,14 +20,6 @@ extension NSAttributedString {
         public init(rawValue: String) {
             self.rawValue = rawValue
         }
-
-        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
@@ -66,10 +66,6 @@ extension NSCalendar {
             self.rawValue = rawValue
         }
 
-        public func hash(into hasher: inout Hasher) {
-            hasher.combine(rawValue)
-        }
-        
         public static let gregorian = NSCalendar.Identifier("gregorian")
         public static let buddhist = NSCalendar.Identifier("buddhist")
         public static let chinese = NSCalendar.Identifier("chinese")
@@ -137,10 +133,6 @@ extension NSCalendar {
 }
 
 extension NSCalendar.Identifier {
-    public static func ==(_ lhs: NSCalendar.Identifier, _ rhs: NSCalendar.Identifier) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
-
     public static func <(_ lhs: NSCalendar.Identifier, _ rhs: NSCalendar.Identifier) -> Bool {
         return lhs.rawValue < rhs.rawValue
     }
diff --git a/Foundation/NSDecimalNumber.swift b/Foundation/NSDecimalNumber.swift
@@ -18,14 +18,6 @@ public struct NSExceptionName : RawRepresentable, Equatable, Hashable {
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-    
-    public static func ==(_ lhs: NSExceptionName, _ rhs: NSExceptionName) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
 }
 
 extension NSExceptionName {
diff --git a/Foundation/NSLocale.swift b/Foundation/NSLocale.swift
@@ -177,10 +177,6 @@ extension NSLocale {
             self.rawValue = rawValue
         }
 
-        public func hash(into hasher: inout Hasher) {
-            hasher.combine(rawValue)
-        }
-        
         public static let identifier = NSLocale.Key(rawValue: "kCFLocaleIdentifierKey")
         public static let languageCode = NSLocale.Key(rawValue: "kCFLocaleLanguageCodeKey")
         public static let countryCode = NSLocale.Key(rawValue: "kCFLocaleCountryCodeKey")
@@ -213,13 +209,6 @@ extension NSLocale {
 }
 
 
-extension NSLocale.Key {
-    public static func ==(_ lhs: NSLocale.Key, _ rhs: NSLocale.Key) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
-}
-
-
 extension NSLocale {
     public static let currentLocaleDidChangeNotification = NSNotification.Name(rawValue: "kCFLocaleCurrentLocaleDidChangeNotification")
 }
diff --git a/Foundation/NSNotification.swift b/Foundation/NSNotification.swift
@@ -13,14 +13,6 @@ open class NSNotification: NSObject, NSCopying, NSCoding {
         public init(rawValue: String) {
             self.rawValue = rawValue
         }
-
-        public func hash(into hasher: inout Hasher) {
-            hasher.combine(rawValue)
-        }
-        
-        public static func ==(lhs: Name, rhs: Name) -> Bool {
-            return lhs.rawValue == rhs.rawValue
-        }
     }
 
     private(set) open var name: Name
diff --git a/Foundation/NSString.swift b/Foundation/NSString.swift
@@ -115,14 +115,6 @@ extension NSString {
 
     public let rawValue: String
 
-    public var hashValue: Int {
-      return self.rawValue.hashValue
-    }
-
-    public static func ==(_ lhs: StringTransform, _ rhs: StringTransform) -> Bool {
-      return lhs.rawValue == rhs.rawValue
-    }
-
     public init(_ rawValue: String) {
       self.rawValue = rawValue
     }
diff --git a/Foundation/NSURL.swift b/Foundation/NSURL.swift
@@ -75,14 +75,6 @@ public struct URLResourceKey : RawRepresentable, Equatable, Hashable {
     public init(_ rawValue: String) {
         self.rawValue = rawValue
     }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-
-    public static func ==(lhs: URLResourceKey, rhs: URLResourceKey) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
 }
 
 extension URLResourceKey {
@@ -197,14 +189,6 @@ public struct URLFileResourceType : RawRepresentable, Equatable, Hashable {
     public init(_ rawValue: String) {
         self.rawValue = rawValue
     }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-
-    public static func ==(lhs: URLFileResourceType, rhs: URLFileResourceType) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
 }
 
 extension URLFileResourceType {
diff --git a/Foundation/Progress.swift b/Foundation/Progress.swift
@@ -399,9 +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 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.
         public static let downloading = FileOperationKind(rawValue: "NSProgressFileOperationKindDownloading")
 
@@ -478,9 +476,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 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.
     ///
     /// Progress of this kind is assumed to use bytes as the unit of work being done and the default implementation of `localizedDescription` takes advantage of that to return more specific text than it could otherwise.
@@ -491,9 +487,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 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.
     ///
     /// If this value is present, then `Progress` can present a more detailed `localizedAdditionalDescription`.
diff --git a/Foundation/Stream.swift b/Foundation/Stream.swift
@@ -28,14 +28,6 @@ extension Stream {
         public init(rawValue: String) {
             self.rawValue = rawValue
         }
-
-        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
-        }
     }
     
     public enum Status : UInt {
@@ -303,12 +295,6 @@ public struct StreamSocketSecurityLevel : RawRepresentable, Equatable, Hashable
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-    public static func ==(lhs: StreamSocketSecurityLevel, rhs: StreamSocketSecurityLevel) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
 }
 extension StreamSocketSecurityLevel {
     public static let none = StreamSocketSecurityLevel(rawValue: "kCFStreamSocketSecurityLevelNone")
@@ -325,12 +311,6 @@ public struct StreamSOCKSProxyConfiguration : RawRepresentable, Equatable, Hasha
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-    public static func ==(lhs: StreamSOCKSProxyConfiguration, rhs: StreamSOCKSProxyConfiguration) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
 }
 extension StreamSOCKSProxyConfiguration {
     public static let hostKey = StreamSOCKSProxyConfiguration(rawValue: "NSStreamSOCKSProxyKey")
@@ -347,12 +327,6 @@ public struct StreamSOCKSProxyVersion : RawRepresentable, Equatable, Hashable {
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-    public static func ==(lhs: StreamSOCKSProxyVersion, rhs: StreamSOCKSProxyVersion) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
 }
 extension StreamSOCKSProxyVersion {
     public static let version4 = StreamSOCKSProxyVersion(rawValue: "kCFStreamSocketSOCKSVersion4")
@@ -366,12 +340,6 @@ public struct StreamNetworkServiceTypeValue : RawRepresentable, Equatable, Hasha
     public init(rawValue: String) {
         self.rawValue = rawValue
     }
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-    public static func ==(lhs: StreamNetworkServiceTypeValue, rhs: StreamNetworkServiceTypeValue) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
 }
 extension StreamNetworkServiceTypeValue {
     public static let voIP = StreamNetworkServiceTypeValue(rawValue: "kCFStreamNetworkServiceTypeVoIP")
diff --git a/Foundation/StringEncodings.swift b/Foundation/StringEncodings.swift
@@ -68,13 +68,7 @@ extension String {
 }
 
 extension String.Encoding : Hashable {
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(rawValue)
-    }
-
-    public static func ==(lhs: String.Encoding, rhs: String.Encoding) -> Bool {
-        return lhs.rawValue == rhs.rawValue
-    }
+  // ==, hash(into:) supplied by RawRepresentable
 }
 
 extension String.Encoding : CustomStringConvertible {
diff --git a/TestFoundation/TestNSCache.swift b/TestFoundation/TestNSCache.swift
@@ -117,12 +117,15 @@ class TestNSCache : XCTestCase {
 
     class TestHashableCacheKey: Hashable {
         let string: String
-        var hashValue: Int { return string.hashValue }
 
         init(string: String) {
             self.string = string
         }
 
+        func hash(into hasher: inout Hasher) {
+            hasher.combine(string)
+        }
+
         static func ==(lhs: TestHashableCacheKey,
             rhs:TestHashableCacheKey) -> Bool {
             return lhs.string == rhs.string

Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,6 @@ public struct HTTPCookiePropertyKey : RawRepresentable, Equatable, Hashable {`
`17`	`17`	`public init(rawValue: String) {`
`18`	`18`	`self.rawValue = rawValue`
`19`	`19`	`}`
`20`		`-`
`21`		`- public func hash(into hasher: inout Hasher) {`
`22`		`- hasher.combine(rawValue)`
`23`		`- }`
`24`		`-`
`25`		`- public static func ==(_ lhs: HTTPCookiePropertyKey, _ rhs: HTTPCookiePropertyKey) -> Bool {`
`26`		`- return lhs.rawValue == rhs.rawValue`
`27`		`- }`
`28`	`20`	`}`
`29`	`21`
`30`	`22`	`extension HTTPCookiePropertyKey {`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,6 @@ extension NSAttributedString {`
`20`	`20`	`public init(rawValue: String) {`
`21`	`21`	`self.rawValue = rawValue`
`22`	`22`	`}`
`23`		`-`
`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`
`30`		`- }`
`31`	`23`	`}`
`32`	`24`	`}`
`33`	`25`
Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,6 @@ extension NSCalendar {`
`66`	`66`	`self.rawValue = rawValue`
`67`	`67`	`}`
`68`	`68`
`69`		`- public func hash(into hasher: inout Hasher) {`
`70`		`- hasher.combine(rawValue)`
`71`		`- }`
`72`		`-`
`73`	`69`	`public static let gregorian = NSCalendar.Identifier("gregorian")`
`74`	`70`	`public static let buddhist = NSCalendar.Identifier("buddhist")`
`75`	`71`	`public static let chinese = NSCalendar.Identifier("chinese")`
`@@ -137,10 +133,6 @@ extension NSCalendar {`
`137`	`133`	`}`
`138`	`134`
`139`	`135`	`extension NSCalendar.Identifier {`
`140`		`- public static func ==(_ lhs: NSCalendar.Identifier, _ rhs: NSCalendar.Identifier) -> Bool {`
`141`		`- return lhs.rawValue == rhs.rawValue`
`142`		`- }`
`143`		`-`
`144`	`136`	`public static func <(_ lhs: NSCalendar.Identifier, _ rhs: NSCalendar.Identifier) -> Bool {`
`145`	`137`	`return lhs.rawValue < rhs.rawValue`
`146`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,6 @@ public struct NSExceptionName : RawRepresentable, Equatable, Hashable {`
`18`	`18`	`public init(rawValue: String) {`
`19`	`19`	`self.rawValue = rawValue`
`20`	`20`	`}`
`21`		`-`
`22`		`- public func hash(into hasher: inout Hasher) {`
`23`		`- hasher.combine(rawValue)`
`24`		`- }`
`25`		`-`
`26`		`- public static func ==(_ lhs: NSExceptionName, _ rhs: NSExceptionName) -> Bool {`
`27`		`- return lhs.rawValue == rhs.rawValue`
`28`		`- }`
`29`	`21`	`}`
`30`	`22`
`31`	`23`	`extension NSExceptionName {`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,6 @@ open class NSNotification: NSObject, NSCopying, NSCoding {`
`13`	`13`	`public init(rawValue: String) {`
`14`	`14`	`self.rawValue = rawValue`
`15`	`15`	`}`
`16`		`-`
`17`		`- public func hash(into hasher: inout Hasher) {`
`18`		`- hasher.combine(rawValue)`
`19`		`- }`
`20`		`-`
`21`		`- public static func ==(lhs: Name, rhs: Name) -> Bool {`
`22`		`- return lhs.rawValue == rhs.rawValue`
`23`		`- }`
`24`	`16`	`}`
`25`	`17`
`26`	`18`	`private(set) open var name: Name`