Merge pull request #3480 from xwu/master

Conform ObjectIdentifier to CustomDebugStringConvertible [SR-2014]

Author: gribozavr

stdlib/public/core/Reflection.swift

@@ -40,6 +40,13 @@ public struct ObjectIdentifier : Hashable, Comparable {
   }
 }
 
+extension ObjectIdentifier : CustomDebugStringConvertible {
+  /// A textual representation of `self`, suitable for debugging.
+  public var debugDescription: String {
+    return "ObjectIdentifier(\(_rawPointerToString(_value)))"
+  }
+}
+
 public func <(lhs: ObjectIdentifier, rhs: ObjectIdentifier) -> Bool {
   return UInt(lhs) < UInt(rhs)
 }

test/1_stdlib/Runtime.swift.gyb

@@ -975,6 +975,14 @@ Reflection.test("CustomMirror") {
     expectEqual(
       [ ObjectIdentifier(a), ObjectIdentifier(b), ObjectIdentifier(c) ].sorted(),
       [ ObjectIdentifier(c), ObjectIdentifier(b), ObjectIdentifier(a) ].sorted())
+
+    // CustomDebugStringConvertible
+    expectEqual(
+      String(reflecting: ObjectIdentifier(a)),
+      String(reflecting: ObjectIdentifier(a)))
+    expectNotEqual(
+      String(reflecting: ObjectIdentifier(a)),
+      String(reflecting: ObjectIdentifier(b)))
   }
 }