Merge pull request swiftlang#24586 from dmcyk/ProtocolUSR

[api-digester] Serialize protocol USRs in conformances
athas · May 13, 2019 · bf93fac · bf93fac
2 parents 6dd4d06 + d2603af
commit bf93fac
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 65 deletions.
diff --git a/test/api-digester/Outputs/cake-abi.json b/test/api-digester/Outputs/cake-abi.json
@@ -64,12 +64,14 @@
         {
           "kind": "Conformance",
           "name": "P2",
-          "printedName": "P2"
+          "printedName": "P2",
+          "usr": "s:4cake2P2P"
         },
         {
           "kind": "Conformance",
           "name": "P1",
-          "printedName": "P1"
+          "printedName": "P1",
+          "usr": "s:4cake2P1P"
         }
       ]
     },
@@ -138,12 +140,14 @@
         {
           "kind": "Conformance",
           "name": "P1",
-          "printedName": "P1"
+          "printedName": "P1",
+          "usr": "s:4cake2P1P"
         },
         {
           "kind": "Conformance",
           "name": "P2",
-          "printedName": "P2"
+          "printedName": "P2",
+          "usr": "s:4cake2P2P"
         }
       ]
     },
@@ -555,12 +559,14 @@
         {
           "kind": "Conformance",
           "name": "Equatable",
-          "printedName": "Equatable"
+          "printedName": "Equatable",
+          "usr": "s:SQ"
         },
         {
           "kind": "Conformance",
           "name": "Hashable",
-          "printedName": "Hashable"
+          "printedName": "Hashable",
+          "usr": "s:SH"
         },
         {
           "kind": "Conformance",
@@ -580,7 +586,8 @@
                 }
               ]
             }
-          ]
+          ],
+          "usr": "s:SY"
         }
       ]
     },
@@ -1081,7 +1088,8 @@
         {
           "kind": "Conformance",
           "name": "PSuper",
-          "printedName": "PSuper"
+          "printedName": "PSuper",
+          "usr": "s:4cake6PSuperP"
         }
       ]
     },
@@ -1231,12 +1239,14 @@
           "kind": "Conformance",
           "name": "P1",
           "printedName": "P1",
+          "usr": "s:4cake2P1P",
           "isABIPlaceholder": true
         },
         {
           "kind": "Conformance",
           "name": "P2",
-          "printedName": "P2"
+          "printedName": "P2",
+          "usr": "s:4cake2P2P"
         }
       ]
     },
@@ -1288,17 +1298,20 @@
         {
           "kind": "Conformance",
           "name": "FixedWidthInteger",
-          "printedName": "FixedWidthInteger"
+          "printedName": "FixedWidthInteger",
+          "usr": "s:s17FixedWidthIntegerP"
         },
         {
           "kind": "Conformance",
           "name": "SignedInteger",
-          "printedName": "SignedInteger"
+          "printedName": "SignedInteger",
+          "usr": "s:SZ"
         },
         {
           "kind": "Conformance",
           "name": "_ExpressibleByBuiltinIntegerLiteral",
-          "printedName": "_ExpressibleByBuiltinIntegerLiteral"
+          "printedName": "_ExpressibleByBuiltinIntegerLiteral",
+          "usr": "s:s35_ExpressibleByBuiltinIntegerLiteralP"
         },
         {
           "kind": "Conformance",
@@ -1318,17 +1331,20 @@
                 }
               ]
             }
-          ]
+          ],
+          "usr": "s:Sz"
         },
         {
           "kind": "Conformance",
           "name": "LosslessStringConvertible",
-          "printedName": "LosslessStringConvertible"
+          "printedName": "LosslessStringConvertible",
+          "usr": "s:s25LosslessStringConvertibleP"
         },
         {
           "kind": "Conformance",
           "name": "SignedNumeric",
-          "printedName": "SignedNumeric"
+          "printedName": "SignedNumeric",
+          "usr": "s:s13SignedNumericP"
         },
         {
           "kind": "Conformance",
@@ -1348,12 +1364,14 @@
                 }
               ]
             }
-          ]
+          ],
+          "usr": "s:Sj"
         },
         {
           "kind": "Conformance",
           "name": "CustomStringConvertible",
-          "printedName": "CustomStringConvertible"
+          "printedName": "CustomStringConvertible",
+          "usr": "s:s23CustomStringConvertibleP"
         },
         {
           "kind": "Conformance",
@@ -1373,12 +1391,14 @@
                 }
               ]
             }
-          ]
+          ],
+          "usr": "s:Sx"
         },
         {
           "kind": "Conformance",
           "name": "AdditiveArithmetic",
-          "printedName": "AdditiveArithmetic"
+          "printedName": "AdditiveArithmetic",
+          "usr": "s:s18AdditiveArithmeticP"
         },
         {
           "kind": "Conformance",
@@ -1398,62 +1418,74 @@
                 }
               ]
             }
-          ]
+          ],
+          "usr": "s:s27ExpressibleByIntegerLiteralP"
         },
         {
           "kind": "Conformance",
           "name": "Comparable",
-          "printedName": "Comparable"
+          "printedName": "Comparable",
+          "usr": "s:SL"
         },
         {
           "kind": "Conformance",
           "name": "P1",
-          "printedName": "P1"
+          "printedName": "P1",
+          "usr": "s:4cake2P1P"
         },
         {
           "kind": "Conformance",
           "name": "MirrorPath",
-          "printedName": "MirrorPath"
+          "printedName": "MirrorPath",
+          "usr": "s:s10MirrorPathP"
         },
         {
           "kind": "Conformance",
           "name": "CVarArg",
-          "printedName": "CVarArg"
+          "printedName": "CVarArg",
+          "usr": "s:s7CVarArgP"
         },
         {
           "kind": "Conformance",
           "name": "Encodable",
-          "printedName": "Encodable"
+          "printedName": "Encodable",
+          "usr": "s:SE"
         },
         {
           "kind": "Conformance",
           "name": "Decodable",
-          "printedName": "Decodable"
+          "printedName": "Decodable",
+          "usr": "s:Se"
         },
         {
           "kind": "Conformance",
           "name": "Hashable",
-          "printedName": "Hashable"
+          "printedName": "Hashable",
+          "usr": "s:SH"
         },
         {
           "kind": "Conformance",
           "name": "Equatable",
-          "printedName": "Equatable"
+          "printedName": "Equatable",
+          "usr": "s:SQ"
         },
         {
           "kind": "Conformance",
           "name": "_HasCustomAnyHashableRepresentation",
-          "printedName": "_HasCustomAnyHashableRepresentation"
+          "printedName": "_HasCustomAnyHashableRepresentation",
+          "usr": "s:s35_HasCustomAnyHashableRepresentationP"
         },
         {
           "kind": "Conformance",
           "name": "CustomReflectable",
-          "printedName": "CustomReflectable"
+          "printedName": "CustomReflectable",
+          "usr": "s:s17CustomReflectableP"
         },
         {
           "kind": "Conformance",
           "name": "_CustomPlaygroundQuickLookable",
-          "printedName": "_CustomPlaygroundQuickLookable"
+          "printedName": "_CustomPlaygroundQuickLookable",
+          "usr": "s:s30_CustomPlaygroundQuickLookableP"
         },
         {
           "kind": "Conformance",
@@ -1551,7 +1583,8 @@
                 }
               ]
             }
-          ]
+          ],
+          "usr": "s:s10SIMDScalarP"
         }
       ]
     }