[stdlib] Remove unnecessary attributes and clarify comments

lorentey · lorentey · commit 6530c8870c8f · 2018-03-23T19:09:28.000Z
diff --git a/stdlib/public/core/Arrays.swift.gyb b/stdlib/public/core/Arrays.swift.gyb
@@ -2297,10 +2297,8 @@ extension ${Self} : Equatable where Element : Equatable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension ${Self} : Hashable where Element : Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     // FIXME(ABI)#177: <rdar://problem/18915294> Issue applies to Array too
     var result = 0
diff --git a/stdlib/public/core/ClosedRange.swift b/stdlib/public/core/ClosedRange.swift
@@ -166,11 +166,9 @@ extension ClosedRange.Index : Comparable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension ClosedRange.Index: Hashable
   where Bound: Strideable, Bound.Stride: SignedInteger, Bound: Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     switch self {
     case .inRange(let value):
@@ -384,10 +382,8 @@ extension ClosedRange: Equatable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension ClosedRange : Hashable where Bound : Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     return _combineHashValues(lowerBound.hashValue, upperBound.hashValue)
   }
diff --git a/stdlib/public/core/CollectionOfOne.swift b/stdlib/public/core/CollectionOfOne.swift
@@ -138,9 +138,8 @@ extension CollectionOfOne: RandomAccessCollection, MutableCollection {
 
 @available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension CollectionOfOne : Equatable where Element : Equatable {
-  /// Returns a Boolean value indicating whether two collections are equal.
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
+  @available(swift, introduced: 4.1) // FIXME(conformance-availability)
   public static func == (lhs: CollectionOfOne, rhs: CollectionOfOne) -> Bool {
     return lhs._element == rhs._element
   }
@@ -149,7 +148,6 @@ extension CollectionOfOne : Equatable where Element : Equatable {
 @available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension CollectionOfOne : Hashable where Element : Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     return _element.hashValue
   }
diff --git a/stdlib/public/core/Dictionary.swift b/stdlib/public/core/Dictionary.swift
@@ -1446,12 +1446,10 @@ extension Dictionary: Equatable where Value: Equatable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension Dictionary: Hashable where Value: Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
-    // FIXME(ABI)#177: <rdar://problem/18915294> Issue applies to Dictionary too
+    // FIXME(ABI)#177: <rdar://problem/18915294> Cache Dictionary<T> hashValue
     var result = 0
     for (k, v) in self {
       let combined = _combineHashValues(k.hashValue, v.hashValue)
diff --git a/stdlib/public/core/DropWhile.swift b/stdlib/public/core/DropWhile.swift
@@ -186,10 +186,8 @@ extension LazyDropWhileCollection.Index: Equatable, Comparable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension LazyDropWhileCollection.Index: Hashable where Base.Index: Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     return base.hashValue
   }
diff --git a/stdlib/public/core/EmptyCollection.swift b/stdlib/public/core/EmptyCollection.swift
@@ -173,10 +173,8 @@ extension EmptyCollection : Equatable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension EmptyCollection : Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     return 0
   }
diff --git a/stdlib/public/core/ExistentialCollection.swift.gyb b/stdlib/public/core/ExistentialCollection.swift.gyb
@@ -1247,7 +1247,7 @@ extension ${Self}: _AnyCollectionProtocol {
 @available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension AnyCollection : Equatable where Element : Equatable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
+  @available(swift, introduced: 4.1) // FIXME(conformance-availability)
   public static func == (
     lhs: AnyCollection<Element>, rhs: AnyCollection<Element>
   ) -> Bool {
@@ -1261,9 +1261,8 @@ extension AnyCollection : Equatable where Element : Equatable {
 @available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension AnyCollection : Hashable where Element : Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
-    // FIXME(ABI)#177: <rdar://problem/18915294> Issue applies to AnyCollection too
+    // FIXME(ABI)#177: <rdar://problem/18915294> Cache AnyCollection<T> hashValue
     var result = 0
     for element in self {
       result = _combineHashValues(result, element.hashValue)
diff --git a/stdlib/public/core/Flatten.swift b/stdlib/public/core/Flatten.swift
@@ -230,11 +230,9 @@ extension FlattenCollection.Index : Comparable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension FlattenCollection.Index : Hashable
   where Base.Index : Hashable, Base.Element.Index : Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     return _hashValue(for: self)
   }
diff --git a/stdlib/public/core/Mirror.swift b/stdlib/public/core/Mirror.swift
@@ -764,7 +764,7 @@ extension DictionaryLiteral : RandomAccessCollection {
 @available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension DictionaryLiteral: Equatable where Key: Equatable, Value: Equatable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
+  @available(swift, introduced: 4.1) // FIXME(conformance-availability)
   public static func == (
     lhs: DictionaryLiteral<Key, Value>, rhs: DictionaryLiteral<Key, Value>
   ) -> Bool {
@@ -778,7 +778,6 @@ extension DictionaryLiteral: Equatable where Key: Equatable, Value: Equatable {
 @available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension DictionaryLiteral: Hashable where Key: Hashable, Value: Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     // FIXME(ABI)#177: <rdar://problem/18915294> Issue applies to DictionaryLiteral too
     var result = 0
diff --git a/stdlib/public/core/Optional.swift b/stdlib/public/core/Optional.swift
@@ -409,7 +409,6 @@ extension Optional : Equatable where Wrapped : Equatable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension Optional : Hashable where Wrapped : Hashable {
   /// The hash value for the optional instance.
   ///
@@ -418,7 +417,6 @@ extension Optional : Hashable where Wrapped : 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 {
     var result: Int
     switch self {
diff --git a/stdlib/public/core/PrefixWhile.swift b/stdlib/public/core/PrefixWhile.swift
@@ -206,10 +206,8 @@ extension LazyPrefixWhileCollection.Index: Comparable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension LazyPrefixWhileCollection.Index: Hashable where Base.Index: Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     return _hashValue(for: self)
   }
diff --git a/stdlib/public/core/Range.swift b/stdlib/public/core/Range.swift
@@ -398,10 +398,8 @@ extension Range: Equatable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension Range : Hashable where Bound : Hashable {
   @_inlineable // FIXME(sil-serialize-all)
-  @available(swift, introduced: 4.1)
   public var hashValue: Int {
     return _combineHashValues(lowerBound.hashValue, upperBound.hashValue)
   }
diff --git a/stdlib/public/core/Reverse.swift b/stdlib/public/core/Reverse.swift
@@ -193,9 +193,8 @@ extension ReversedCollection.Index: Comparable {
   }
 }
 
-@available(swift, introduced: 4.1) // FIXME(conformance-availability)
 extension ReversedCollection.Index: Hashable where Base.Index: Hashable {
-  @available(swift, introduced: 4.1)
+  @_inlineable // FIXME(sil-serialize-all)
   public var hashValue: Int {
     return base.hashValue
   }

Original file line number	Diff line number	Diff line change
`@@ -2297,10 +2297,8 @@ extension ${Self} : Equatable where Element : Equatable {`
`2297`	`2297`	`}`
`2298`	`2298`	`}`
`2299`	`2299`
`2300`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`2301`	`2300`	`extension ${Self} : Hashable where Element : Hashable {`
`2302`	`2301`	`@_inlineable // FIXME(sil-serialize-all)`
`2303`		`- @available(swift, introduced: 4.1)`
`2304`	`2302`	`public var hashValue: Int {`
`2305`	`2303`	`// FIXME(ABI)#177: <rdar://problem/18915294> Issue applies to Array too`
`2306`	`2304`	`var result = 0`
Original file line number	Diff line number	Diff line change
`@@ -166,11 +166,9 @@ extension ClosedRange.Index : Comparable {`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`170`	`169`	`extension ClosedRange.Index: Hashable`
`171`	`170`	`where Bound: Strideable, Bound.Stride: SignedInteger, Bound: Hashable {`
`172`	`171`	`@_inlineable // FIXME(sil-serialize-all)`
`173`		`- @available(swift, introduced: 4.1)`
`174`	`172`	`public var hashValue: Int {`
`175`	`173`	`switch self {`
`176`	`174`	`case .inRange(let value):`
`@@ -384,10 +382,8 @@ extension ClosedRange: Equatable {`
`384`	`382`	`}`
`385`	`383`	`}`
`386`	`384`
`387`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`388`	`385`	`extension ClosedRange : Hashable where Bound : Hashable {`
`389`	`386`	`@_inlineable // FIXME(sil-serialize-all)`
`390`		`- @available(swift, introduced: 4.1)`
`391`	`387`	`public var hashValue: Int {`
`392`	`388`	`return _combineHashValues(lowerBound.hashValue, upperBound.hashValue)`
`393`	`389`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1446,12 +1446,10 @@ extension Dictionary: Equatable where Value: Equatable {`
`1446`	`1446`	`}`
`1447`	`1447`	`}`
`1448`	`1448`
`1449`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`1450`	`1449`	`extension Dictionary: Hashable where Value: Hashable {`
`1451`	`1450`	`@_inlineable // FIXME(sil-serialize-all)`
`1452`		`- @available(swift, introduced: 4.1)`
`1453`	`1451`	`public var hashValue: Int {`
`1454`		`- // FIXME(ABI)#177: <rdar://problem/18915294> Issue applies to Dictionary too`
	`1452`	`+ // FIXME(ABI)#177: <rdar://problem/18915294> Cache Dictionary<T> hashValue`
`1455`	`1453`	`var result = 0`
`1456`	`1454`	`for (k, v) in self {`
`1457`	`1455`	`let combined = _combineHashValues(k.hashValue, v.hashValue)`
Original file line number	Diff line number	Diff line change
`@@ -186,10 +186,8 @@ extension LazyDropWhileCollection.Index: Equatable, Comparable {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`189`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`190`	`189`	`extension LazyDropWhileCollection.Index: Hashable where Base.Index: Hashable {`
`191`	`190`	`@_inlineable // FIXME(sil-serialize-all)`
`192`		`- @available(swift, introduced: 4.1)`
`193`	`191`	`public var hashValue: Int {`
`194`	`192`	`return base.hashValue`
`195`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,10 +173,8 @@ extension EmptyCollection : Equatable {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`177`	`176`	`extension EmptyCollection : Hashable {`
`178`	`177`	`@_inlineable // FIXME(sil-serialize-all)`
`179`		`- @available(swift, introduced: 4.1)`
`180`	`178`	`public var hashValue: Int {`
`181`	`179`	`return 0`
`182`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,11 +230,9 @@ extension FlattenCollection.Index : Comparable {`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
`233`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`234`	`233`	`extension FlattenCollection.Index : Hashable`
`235`	`234`	`where Base.Index : Hashable, Base.Element.Index : Hashable {`
`236`	`235`	`@_inlineable // FIXME(sil-serialize-all)`
`237`		`- @available(swift, introduced: 4.1)`
`238`	`236`	`public var hashValue: Int {`
`239`	`237`	`return _hashValue(for: self)`
`240`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,6 @@ extension Optional : Equatable where Wrapped : Equatable {`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`
`412`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`413`	`412`	`extension Optional : Hashable where Wrapped : Hashable {`
`414`	`413`	`/// The hash value for the optional instance.`
`415`	`414`	`///`
`@@ -418,7 +417,6 @@ extension Optional : Hashable where Wrapped : Hashable {`
`418`	`417`	`/// Hash values are not guaranteed to be equal across different executions of`
`419`	`418`	`/// your program. Do not save hash values to use during a future execution.`
`420`	`419`	`@_inlineable // FIXME(sil-serialize-all)`
`421`		`- @available(swift, introduced: 4.1)`
`422`	`420`	`public var hashValue: Int {`
`423`	`421`	`var result: Int`
`424`	`422`	`switch self {`
Original file line number	Diff line number	Diff line change
`@@ -206,10 +206,8 @@ extension LazyPrefixWhileCollection.Index: Comparable {`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
`209`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`210`	`209`	`extension LazyPrefixWhileCollection.Index: Hashable where Base.Index: Hashable {`
`211`	`210`	`@_inlineable // FIXME(sil-serialize-all)`
`212`		`- @available(swift, introduced: 4.1)`
`213`	`211`	`public var hashValue: Int {`
`214`	`212`	`return _hashValue(for: self)`
`215`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -398,10 +398,8 @@ extension Range: Equatable {`
`398`	`398`	`}`
`399`	`399`	`}`
`400`	`400`
`401`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`402`	`401`	`extension Range : Hashable where Bound : Hashable {`
`403`	`402`	`@_inlineable // FIXME(sil-serialize-all)`
`404`		`- @available(swift, introduced: 4.1)`
`405`	`403`	`public var hashValue: Int {`
`406`	`404`	`return _combineHashValues(lowerBound.hashValue, upperBound.hashValue)`
`407`	`405`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,9 +193,8 @@ extension ReversedCollection.Index: Comparable {`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`
`196`		`-@available(swift, introduced: 4.1) // FIXME(conformance-availability)`
`197`	`196`	`extension ReversedCollection.Index: Hashable where Base.Index: Hashable {`
`198`		`- @available(swift, introduced: 4.1)`
	`197`	`+ @_inlineable // FIXME(sil-serialize-all)`
`199`	`198`	`public var hashValue: Int {`
`200`	`199`	`return base.hashValue`
`201`	`200`	`}`