Merge branch 'conditional-hashable' of github.com:apple/swift into conditional-hashable

xwu · xwu · commit d03f0b366536 · 2018-02-10T21:20:09.000-06:00
diff --git a/stdlib/public/core/ClosedRange.swift b/stdlib/public/core/ClosedRange.swift
@@ -378,6 +378,7 @@ extension ClosedRange: Equatable {
   }
 }
 
+@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension ClosedRange : Hashable where Bound : Hashable {
   /// The hash value for the range.
   ///
@@ -386,6 +387,7 @@ extension ClosedRange : Hashable where Bound : Hashable {
   /// Hash values are not guaranteed to be equal across different executions of
   /// your program. Do not save hash values to use during a future execution.
   @_inlineable // FIXME(sil-serialize-all)
+  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     return _combineHashValues(lowerBound.hashValue, upperBound.hashValue)
   }

Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,7 @@ extension ClosedRange: Equatable {`
`378`	`378`	`}`
`379`	`379`	`}`
`380`	`380`
	`381`	`+@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`381`	`382`	`extension ClosedRange : Hashable where Bound : Hashable {`
`382`	`383`	`/// The hash value for the range.`
`383`	`384`	`///`
`@@ -386,6 +387,7 @@ extension ClosedRange : Hashable where Bound : Hashable {`
`386`	`387`	`/// Hash values are not guaranteed to be equal across different executions of`
`387`	`388`	`/// your program. Do not save hash values to use during a future execution.`
`388`	`389`	`@_inlineable // FIXME(sil-serialize-all)`
	`390`	`+ @available(swift, introduced: 4.1)`
`389`	`391`	`public var hashValue: Int {`
`390`	`392`	`return _combineHashValues(lowerBound.hashValue, upperBound.hashValue)`
`391`	`393`	`}`