Merge pull request #59968 from CodaFi/primacy-and-recency

Remove Modeling for Fully-Generic Primary Associated Type Syntax

Author: CodaFi

Diff for: unittests/Syntax/DeclSyntaxTests.cpp

@@ -652,7 +652,7 @@ TEST(DeclSyntaxTests, ProtocolMakeAPIs) {
     auto MyCollection = Factory.makeIdentifier("MyCollection", "", "");
     auto ElementName = Factory.makeIdentifier("Element", "", "");
     auto ElementParam =
-        Factory.makePrimaryAssociatedType(None, ElementName, None, None, None, None);
+        Factory.makePrimaryAssociatedType(ElementName, None);
     auto LeftAngle = Factory.makeLeftAngleToken("", "");
     auto RightAngle = Factory.makeRightAngleToken("", " ");
     auto PrimaryAssocs = PrimaryAssociatedTypeClauseSyntaxBuilder(Arena)

Diff for: utils/gyb_syntax_support/GenericNodes.py

@@ -67,20 +67,11 @@
     Node('PrimaryAssociatedTypeList', kind='SyntaxCollection',
          element='PrimaryAssociatedType'),
 
-    # primary-associated-type -> type-name
-    #                          | type-name (: type-identifier)? (= type)?
+    # primary-associated-type -> type-name ','?
     Node('PrimaryAssociatedType', kind='Syntax',
          traits=['WithTrailingComma'],
          children=[
-             Child('Attributes', kind='AttributeList',
-                   collection_element_name='Attribute', is_optional=True),
              Child('Name', kind='IdentifierToken'),
-             Child('Colon', kind='ColonToken',
-                   is_optional=True),
-             Child('InheritedType', kind='Type',
-                   is_optional=True),
-             Child('Initializer', kind='TypeInitializerClause',
-                   is_optional=True),
              Child('TrailingComma', kind='CommaToken',
                    is_optional=True),
          ]),