diff options
Diffstat (limited to 'conformance/conformance.proto')
| -rw-r--r-- | conformance/conformance.proto | 68 |
1 files changed, 30 insertions, 38 deletions
diff --git a/conformance/conformance.proto b/conformance/conformance.proto index 7b676898..39eafdbb 100644 --- a/conformance/conformance.proto +++ b/conformance/conformance.proto @@ -71,7 +71,7 @@ message ConformanceRequest { } // Which format should the testee serialize its message to? - optional RequestedOutput requested_output = 3; + RequestedOutput requested_output = 3; } // Represents a single test case's output. @@ -103,8 +103,8 @@ message ConformanceResponse { // forms. message TestAllTypes { message NestedMessage { - optional int32 a = 1; - optional TestAllTypes corecursive = 2; + int32 a = 1; + TestAllTypes corecursive = 2; } enum NestedEnum { @@ -115,36 +115,32 @@ message TestAllTypes { } // Singular - optional int32 optional_int32 = 1; - optional int64 optional_int64 = 2; - optional uint32 optional_uint32 = 3; - optional uint64 optional_uint64 = 4; - optional sint32 optional_sint32 = 5; - optional sint64 optional_sint64 = 6; - optional fixed32 optional_fixed32 = 7; - optional fixed64 optional_fixed64 = 8; - optional sfixed32 optional_sfixed32 = 9; - optional sfixed64 optional_sfixed64 = 10; - optional float optional_float = 11; - optional double optional_double = 12; - optional bool optional_bool = 13; - optional string optional_string = 14; - optional bytes optional_bytes = 15; - - optional group OptionalGroup = 16 { - optional int32 a = 17; - } - - optional NestedMessage optional_nested_message = 18; - optional ForeignMessage optional_foreign_message = 19; - - optional NestedEnum optional_nested_enum = 21; - optional ForeignEnum optional_foreign_enum = 22; - - optional string optional_string_piece = 24 [ctype=STRING_PIECE]; - optional string optional_cord = 25 [ctype=CORD]; - - optional TestAllTypes recursive_message = 27; + int32 optional_int32 = 1; + int64 optional_int64 = 2; + uint32 optional_uint32 = 3; + uint64 optional_uint64 = 4; + sint32 optional_sint32 = 5; + sint64 optional_sint64 = 6; + fixed32 optional_fixed32 = 7; + fixed64 optional_fixed64 = 8; + sfixed32 optional_sfixed32 = 9; + sfixed64 optional_sfixed64 = 10; + float optional_float = 11; + double optional_double = 12; + bool optional_bool = 13; + string optional_string = 14; + bytes optional_bytes = 15; + + NestedMessage optional_nested_message = 18; + ForeignMessage optional_foreign_message = 19; + + NestedEnum optional_nested_enum = 21; + ForeignEnum optional_foreign_enum = 22; + + string optional_string_piece = 24 [ctype=STRING_PIECE]; + string optional_cord = 25 [ctype=CORD]; + + TestAllTypes recursive_message = 27; // Repeated repeated int32 repeated_int32 = 31; @@ -163,10 +159,6 @@ message TestAllTypes { repeated string repeated_string = 44; repeated bytes repeated_bytes = 45; - repeated group RepeatedGroup = 46 { - optional int32 a = 47; - } - repeated NestedMessage repeated_nested_message = 48; repeated ForeignMessage repeated_foreign_message = 49; @@ -206,7 +198,7 @@ message TestAllTypes { } message ForeignMessage { - optional int32 c = 1; + int32 c = 1; } enum ForeignEnum { |