@@ -50,13 +50,13 @@ void assertDigestNeq(T&& left, U&& right) {
5050SerializableTypeDefinitionEntry makeStructEntry (
5151 SerializableStructDefinition s) {
5252 SerializableTypeDefinitionEntry entry;
53- entry.definition ()->structDef_ref () = std::move (s);
53+ entry.definition ()->structDef () = std::move (s);
5454 return entry;
5555}
5656
5757SerializableTypeDefinitionEntry makeUnionEntry (SerializableUnionDefinition u) {
5858 SerializableTypeDefinitionEntry entry;
59- entry.definition ()->unionDef_ref () = std::move (u);
59+ entry.definition ()->unionDef () = std::move (u);
6060 return entry;
6161}
6262
@@ -337,7 +337,7 @@ TEST(TypeSystemDigestTest, TypeRefStructMatchesSerializable) {
337337
338338 // Build SerializableTypeDefinition
339339 SerializableTypeDefinition serializableDef;
340- serializableDef.structDef_ref () = structDef;
340+ serializableDef.structDef () = structDef;
341341
342342 // Hash both - they should produce the same digest
343343 TypeSystemHasher hasher;
@@ -362,7 +362,7 @@ TEST(TypeSystemDigestTest, TypeRefUnionMatchesSerializable) {
362362
363363 // Build SerializableTypeDefinition
364364 SerializableTypeDefinition serializableDef;
365- serializableDef.unionDef_ref () = unionDef;
365+ serializableDef.unionDef () = unionDef;
366366
367367 // Hash both - they should produce the same digest
368368 TypeSystemHasher hasher;
@@ -385,7 +385,7 @@ TEST(TypeSystemDigestTest, TypeRefEnumMatchesSerializable) {
385385
386386 // Build SerializableTypeDefinition
387387 SerializableTypeDefinition serializableDef;
388- serializableDef.enumDef_ref () = enumDef;
388+ serializableDef.enumDef () = enumDef;
389389
390390 // Hash both - they should produce the same digest
391391 TypeSystemHasher hasher;
@@ -408,7 +408,7 @@ TEST(TypeSystemDigestTest, TypeRefOpaqueAliasMatchesSerializable) {
408408
409409 // Build SerializableTypeDefinition
410410 SerializableTypeDefinition serializableDef;
411- serializableDef.opaqueAliasDef_ref () = opaqueAliasDef;
411+ serializableDef.opaqueAliasDef () = opaqueAliasDef;
412412
413413 // Hash both - they should produce the same digest
414414 TypeSystemHasher hasher;
@@ -484,7 +484,7 @@ TEST(TypeSystemDigestTest, TypeRefStructWithAnnotationsMatchesSerializable) {
484484 typeSystem->getUserDefinedTypeOrThrow (" meta.com/AnnotatedStruct" );
485485
486486 SerializableTypeDefinition serializableDef;
487- serializableDef.structDef_ref () = structDef;
487+ serializableDef.structDef () = structDef;
488488
489489 TypeSystemHasher hasher;
490490 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef));
@@ -505,7 +505,7 @@ TEST(TypeSystemDigestTest, TypeRefStructWithCustomDefaultMatchesSerializable) {
505505 typeSystem->getUserDefinedTypeOrThrow (" meta.com/StructWithDefault" );
506506
507507 SerializableTypeDefinition serializableDef;
508- serializableDef.structDef_ref () = structDef;
508+ serializableDef.structDef () = structDef;
509509
510510 TypeSystemHasher hasher;
511511 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef));
@@ -523,7 +523,7 @@ TEST(TypeSystemDigestTest, TypeRefStructSealedMatchesSerializable) {
523523 auto defRef = typeSystem->getUserDefinedTypeOrThrow (" meta.com/SealedStruct" );
524524
525525 SerializableTypeDefinition serializableDef;
526- serializableDef.structDef_ref () = sealedStructDef;
526+ serializableDef.structDef () = sealedStructDef;
527527
528528 TypeSystemHasher hasher;
529529 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef));
@@ -553,7 +553,7 @@ TEST(TypeSystemDigestTest, TypeRefStructWithManyFieldsMatchesSerializable) {
553553 typeSystem->getUserDefinedTypeOrThrow (" meta.com/ManyFieldsStruct" );
554554
555555 SerializableTypeDefinition serializableDef;
556- serializableDef.structDef_ref () = structDef;
556+ serializableDef.structDef () = structDef;
557557
558558 TypeSystemHasher hasher;
559559 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef));
@@ -577,7 +577,7 @@ TEST(TypeSystemDigestTest, TypeRefEnumWithAnnotationsMatchesSerializable) {
577577 auto defRef = typeSystem->getUserDefinedTypeOrThrow (" meta.com/AnnotatedEnum" );
578578
579579 SerializableTypeDefinition serializableDef;
580- serializableDef.enumDef_ref () = enumDef;
580+ serializableDef.enumDef () = enumDef;
581581
582582 TypeSystemHasher hasher;
583583 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef));
@@ -604,7 +604,7 @@ TEST(TypeSystemDigestTest, TypeRefEnumWithManyValuesMatchesSerializable) {
604604 typeSystem->getUserDefinedTypeOrThrow (" meta.com/ManyValuesEnum" );
605605
606606 SerializableTypeDefinition serializableDef;
607- serializableDef.enumDef_ref () = enumDef;
607+ serializableDef.enumDef () = enumDef;
608608
609609 TypeSystemHasher hasher;
610610 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef));
@@ -627,7 +627,7 @@ TEST(
627627 typeSystem->getUserDefinedTypeOrThrow (" meta.com/AnnotatedAlias" );
628628
629629 SerializableTypeDefinition serializableDef;
630- serializableDef.opaqueAliasDef_ref () = opaqueAliasDef;
630+ serializableDef.opaqueAliasDef () = opaqueAliasDef;
631631
632632 TypeSystemHasher hasher;
633633 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef));
@@ -1082,7 +1082,7 @@ TEST(TypeSystemDigestTest, FieldDefaultRecordKindsMatchSerializable) {
10821082
10831083 auto defRef = typeSystem->getUserDefinedTypeOrThrow (" meta.com/S" );
10841084 SerializableTypeDefinition serializableDef;
1085- serializableDef.structDef_ref () = structDef;
1085+ serializableDef.structDef () = structDef;
10861086
10871087 TypeSystemHasher hasher;
10881088 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef))
@@ -1202,7 +1202,7 @@ TEST(TypeSystemDigestTest, AnyTypeInStructFieldMatchesSerializable) {
12021202
12031203 auto defRef = typeSystem->getUserDefinedTypeOrThrow (" meta.com/Container" );
12041204 SerializableTypeDefinition serializableDef;
1205- serializableDef.structDef_ref () = structDef;
1205+ serializableDef.structDef () = structDef;
12061206
12071207 TypeSystemHasher hasher;
12081208 EXPECT_EQ (hasher (TypeRef::fromDefinition (defRef)), hasher (serializableDef));
@@ -1261,7 +1261,7 @@ TEST(TypeSystemDigestTest, OpaqueAliasDiffersFromTargetType) {
12611261 // So two aliases with the same target type should have the same definition
12621262 // digest This tests that the alias definition itself is hashed correctly
12631263 SerializableTypeDefinition serializableDef;
1264- serializableDef.opaqueAliasDef_ref () = aliasDef;
1264+ serializableDef.opaqueAliasDef () = aliasDef;
12651265 EXPECT_EQ (hasher (TypeRef::fromDefinition (aliasRef)), hasher (serializableDef));
12661266 EXPECT_EQ (
12671267 hasher (TypeRef::fromDefinition (accountIdRef)), hasher (serializableDef));
@@ -1289,8 +1289,8 @@ TEST(TypeSystemDigestTest, SerializableFieldWithVsWithoutDefaultDiffer) {
12891289
12901290 // Also verify via SerializableTypeDefinition
12911291 SerializableTypeDefinition defWithDefault, defWithoutDefault;
1292- defWithDefault.structDef_ref () = structWithDefault;
1293- defWithoutDefault.structDef_ref () = structWithoutDefault;
1292+ defWithDefault.structDef () = structWithDefault;
1293+ defWithoutDefault.structDef () = structWithoutDefault;
12941294
12951295 TypeSystemHasher hasher;
12961296 EXPECT_NE (hasher (defWithDefault), hasher (defWithoutDefault));
0 commit comments