Merge pull request #3850 from CodaFi/cleanup-round-2

Keep cleaning up after AnyHashable

Author: shahmishal

validation-test/stdlib/AnyHashable.swift.gyb

@@ -596,7 +596,7 @@ AnyHashableTests.test("AnyHashable containing _SwiftNativeNSError") {
   expectEqual(
     .objCClassWrapper,
     SwiftRuntime.metadataKind(of: nsErrors.first!))
-  expectEqual("_SwiftNativeNSError", String(nsErrors[0].dynamicType))
+  expectEqual("_SwiftNativeNSError", String(describing: nsErrors[0].dynamicType))
   checkHashable(nsErrors, equalityOracle: { $0 / 2 == $1 / 2 })
   checkHashable(
     nsErrors.map(AnyHashable.init),

validation-test/stdlib/NSDecimalNumberBridging.swift.gyb

@@ -14,9 +14,9 @@ NSDecimalNumberTests.test("AnyHashable containing Foundation.Decimal") {
     NSDecimalNumber(string: "20.0"),
   ]
   let anyHashables = values.map(AnyHashable.init)
-  expectEqual("Decimal", String(anyHashables[0].base.dynamicType))
-  expectEqual("Decimal", String(anyHashables[1].base.dynamicType))
-  expectEqual("Decimal", String(anyHashables[2].base.dynamicType))
+  expectEqual("Decimal", String(describing: anyHashables[0].base.dynamicType))
+  expectEqual("Decimal", String(describing: anyHashables[1].base.dynamicType))
+  expectEqual("Decimal", String(describing: anyHashables[2].base.dynamicType))
   expectNotEqual(anyHashables[0], anyHashables[1])
   expectEqual(anyHashables[1], anyHashables[2])
 }

validation-test/stdlib/NSNumberBridging.swift.gyb

@@ -110,8 +110,8 @@ NSNumberTests.test("_SwiftTypePreservingNSNumber.classForCoder") {
   // Check that internal subclass is not achived.
   let n: NSNumber = (42 as Int)._bridgeToObjectiveC()
   expectTrue(isTypePreservingNSNumber(n))
-  expectEqual("NSNumber", String(n.classForCoder))
-  expectEqual("NSNumber", String(n.classForKeyedArchiver!))
+  expectEqual("NSNumber", String(describing: n.classForCoder))
+  expectEqual("NSNumber", String(describing: n.classForKeyedArchiver!))
 }
 
 NSNumberTests.test("_SwiftTypePreservingNSNumber.init(coder:)")
@@ -261,11 +261,11 @@ NSNumberTests.test("${Self} bridges to NSNumber (actually _SwiftTypePreservingNS
   expectEmpty(explicitNSNumber._toCustomAnyHashable())
   expectTrue(
     Set(["__NSCFNumber", "__NSCFBoolean"]).contains(
-      String(AnyHashable(explicitNSNumber).base.dynamicType)))
+      String(describing: AnyHashable(explicitNSNumber).base.dynamicType)))
   expectEqual(AnyHashable(explicitNSNumber), AnyHashable(explicitNSNumber))
 
   let ah = AnyHashable(bridgedNSNumber)
-  expectEqual("${Self}", String(ah.base.dynamicType))
+  expectEqual("${Self}", String(describing: ah.base.dynamicType))
 %   if Self in ['Float', 'Double', 'CGFloat']:
   // FIXME: remove special cases for floating point when we fix their
   // conformances to Equatable.

validation-test/stdlib/NSStringBridging.swift.gyb

@@ -19,7 +19,7 @@ NSStringTests.test("NSString bridges to String with custom AnyHashable")
   input in
   let s = input._bridgeToObjectiveC()
   expectNotEmpty(s._toCustomAnyHashable())
-  expectEqual("String", String(AnyHashable(s).base.dynamicType))
+  expectEqual("String", String(describing: AnyHashable(s).base.dynamicType))
 }
 
 NSStringTests.test("AnyHashable(NSString) uses Swift String comparison rules") {
@@ -29,8 +29,8 @@ NSStringTests.test("AnyHashable(NSString) uses Swift String comparison rules") {
   let nss2: NSString = NSString(utf8String: "\u{e1}")!
   let ah1 = AnyHashable(nss1)
   let ah2 = AnyHashable(nss2)
-  expectEqual("String", String(ah1.base.dynamicType))
-  expectEqual("String", String(ah2.base.dynamicType))
+  expectEqual("String", String(describing: ah1.base.dynamicType))
+  expectEqual("String", String(describing: ah2.base.dynamicType))
   checkHashable([ah1, ah2], equalityOracle: { _ in true })
 }
 

validation-test/stdlib/Unicode.swift.gyb

@@ -2380,7 +2380,7 @@ StringTests.test("StreamableConformance") {
   forStringsWithUnpairedSurrogates {
     (test: UTF16Test, subject: String) -> Void in
     let expected = test.scalarsHead + test.scalarsRepairedTail
-    let printedSubject = String(subject)
+    let printedSubject = subject
     let actual = printedSubject.unicodeScalars.map { $0.value }
     expectEqual(expected, actual)
   }