Merge pull request #40006 from lorentey/deninenineninenine-codable-additions

Author: lorentey

stdlib/public/core/Codable.swift

@@ -5535,33 +5535,34 @@ internal struct _DictionaryCodingKey: CodingKey {
 /// and decoding `Dictionary` values keyed by the conforming type to and from
 /// a keyed container, rather than encoding and decoding the dictionary as an
 /// unkeyed container of alternating key-value pairs.
-@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+@available(SwiftStdlib 5.6, *)
 public protocol CodingKeyRepresentable {
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   var codingKey: CodingKey { get }
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   init?<T: CodingKey>(codingKey: T)
 }
 
-@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
-extension RawRepresentable where Self: CodingKeyRepresentable, RawValue == String {
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+@available(SwiftStdlib 5.6, *)
+extension RawRepresentable
+where Self: CodingKeyRepresentable, RawValue == String {
+  @available(SwiftStdlib 5.6, *)
   public var codingKey: CodingKey {
     _DictionaryCodingKey(stringValue: rawValue)
   }
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   public init?<T: CodingKey>(codingKey: T) {
     self.init(rawValue: codingKey.stringValue)
   }
 }
 
-@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+@available(SwiftStdlib 5.6, *)
 extension RawRepresentable where Self: CodingKeyRepresentable, RawValue == Int {
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   public var codingKey: CodingKey {
     _DictionaryCodingKey(intValue: rawValue)
   }
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   public init?<T: CodingKey>(codingKey: T) {
     if let intValue = codingKey.intValue {
       self.init(rawValue: intValue)
@@ -5571,13 +5572,13 @@ extension RawRepresentable where Self: CodingKeyRepresentable, RawValue == Int {
   }
 }
 
-@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+@available(SwiftStdlib 5.6, *)
 extension Int: CodingKeyRepresentable {
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   public var codingKey: CodingKey {
     _DictionaryCodingKey(intValue: self)
   }
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   public init?<T: CodingKey>(codingKey: T) {
     if let intValue = codingKey.intValue {
       self = intValue
@@ -5587,13 +5588,13 @@ extension Int: CodingKeyRepresentable {
   }
 }
 
-@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+@available(SwiftStdlib 5.6, *)
 extension String: CodingKeyRepresentable {
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   public var codingKey: CodingKey {
     _DictionaryCodingKey(stringValue: self)
   }
-  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+  @available(SwiftStdlib 5.6, *)
   public init?<T: CodingKey>(codingKey: T) {
     self = codingKey.stringValue
   }
@@ -5603,9 +5604,9 @@ extension Dictionary: Encodable where Key: Encodable, Value: Encodable {
   /// Encodes the contents of this dictionary into the given encoder.
   ///
   /// If the dictionary uses keys that are `String`, `Int`, or a type conforming
-  /// to `CodingKeyRepresentable`, the contents are encoded in a keyed container.
-  /// Otherwise, the contents are encoded as alternating key-value pairs in an
-  /// unkeyed container.
+  /// to `CodingKeyRepresentable`, the contents are encoded in a keyed
+  /// container. Otherwise, the contents are encoded as alternating key-value
+  /// pairs in an unkeyed container.
   ///
   /// This function throws an error if any values are invalid for the given
   /// encoder's format.
@@ -5626,7 +5627,7 @@ extension Dictionary: Encodable where Key: Encodable, Value: Encodable {
         let codingKey = _DictionaryCodingKey(intValue: key as! Int)
         try container.encode(value, forKey: codingKey)
       }
-    } else if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *),
+    } else if #available(SwiftStdlib 5.6, *),
               Key.self is CodingKeyRepresentable.Type {
       // Since the keys are CodingKeyRepresentable, we can use the `codingKey`
       // to create `_DictionaryCodingKey` instances.
@@ -5690,7 +5691,7 @@ extension Dictionary: Decodable where Key: Decodable, Value: Decodable {
         let value = try container.decode(Value.self, forKey: key)
         self[key.intValue! as! Key] = value
       }
-    } else if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *),
+    } else if #available(SwiftStdlib 5.6, *),
               let keyType = Key.self as? CodingKeyRepresentable.Type {
       // The keys are CodingKeyRepresentable, so we should be able to expect
       // a keyed container.

test/stdlib/CodableTests.swift

@@ -480,7 +480,7 @@ class TestCodable : TestCodableSuper {
         }
     }
 
-    @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
+    @available(SwiftStdlib 5.6, *)
     func test_Dictionary_JSON() {
         enum X: String, Codable { case a, b }
         enum Y: String, Codable, CodingKeyRepresentable { case a, b }
@@ -1054,7 +1054,7 @@ if #available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
     tests["test_URLComponents_Plist"] = TestCodable.test_URLComponents_Plist
 }
 
-if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
+if #available(SwiftStdlib 5.6, *) {
     tests["test_Dictionary_JSON"] = TestCodable.test_Dictionary_JSON
 }
 

test/stdlib/RawRepresentable-tricky-hashing.swift

@@ -107,7 +107,7 @@ suite.test("hashValue forwarding") {
   //
   // See https://github.com/apple/swift/pull/39155
 
-  if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+  if #available(SwiftStdlib 5.6, *) {
     let r = CustomRawRepresentable2(rawValue: Bogus())!
     expectEqual(r.hashValue, 23.hashValue)
   }

validation-test/stdlib/Unicode.swift.gyb

@@ -212,7 +212,7 @@ UnicodeScalarTests.test("init") {
   expectEqual(nil, UnicodeScalar(UInt32(0xD800)))
   expectEqual("j", Unicode.Scalar(Int(0x6A)))
 
-  if #available(macOS 9999, iOS 9999, tvOS 9999, watchOS 9999, *) {
+  if #available(SwiftStdlib 5.6, *) {
     expectEqual(nil, Unicode.Scalar(-0x6A))
   }
 }