Skip to content

Commit b840102

Browse files
protobuf-github-botpull[bot]
protobuf-github-bot
authored and
pull[bot]
committed
Internal change
PiperOrigin-RevId: 693516053
1 parent 64443af commit b840102

File tree

6 files changed

+39
-55
lines changed

6 files changed

+39
-55
lines changed

‎csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/google/protobuf/compiler/cpp/test_bad_identifiers.proto‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ message TestConflictingSymbolNames {
125125
}
126126
message BadKnownNamesFieldsNoStandardDescriptor {
127127
option no_standard_descriptor_accessor = true;
128+
128129
optional int32 descriptor = 3;
129130
}
130131
message BadKnownNamesTypes {
@@ -139,14 +140,14 @@ message TestConflictingSymbolNames {
139140
message Clear {}
140141
message IsInitialized {}
141142
}
142-
message BadKnownNamesValues { // NO_PROTO3
143-
extensions 1 to 100; // NO_PROTO3
144-
extend BadKnownNamesValues { // NO_PROTO3
145-
optional int32 unknown_fields = 1; // NO_PROTO3
143+
message BadKnownNamesValues { // NO_PROTO3
144+
extensions 1 to 100; // NO_PROTO3
145+
extend BadKnownNamesValues { // NO_PROTO3
146+
optional int32 unknown_fields = 1; // NO_PROTO3
146147
optional int32 mutable_unknown_fields = 2; // NO_PROTO3
147-
optional int32 descriptor = 3; // NO_PROTO3
148-
optional int32 default_instance = 4; // NO_PROTO3
149-
optional int32 swap = 5; // NO_PROTO3
148+
optional int32 descriptor = 3; // NO_PROTO3
149+
optional int32 default_instance = 4; // NO_PROTO3
150+
optional int32 swap = 5; // NO_PROTO3
150151
} // NO_PROTO3
151152
} // NO_PROTO3
152153

@@ -169,7 +170,8 @@ message TestConflictingSymbolNames {
169170
// For clashing local variables in Serialize and ByteSize calculation.
170171
optional string target = 38;
171172

172-
extensions 1000 to max [verification = UNVERIFIED]; // NO_PROTO3
173+
extensions 1000 to max
174+
[verification = UNVERIFIED]; // NO_PROTO3
173175
}
174176

175177
// Special names as above, but at file scope.
@@ -185,11 +187,11 @@ message Clear {}
185187
message IsInitialized {}
186188

187189
extend TestConflictingSymbolNames.BadKnownNamesValues { // NO_PROTO3
188-
optional int32 unknown_fields = 11; // NO_PROTO3
189-
optional int32 mutable_unknown_fields = 12; // NO_PROTO3
190-
optional int32 descriptor = 13; // NO_PROTO3
191-
optional int32 default_instance = 14; // NO_PROTO3
192-
optional int32 swap = 15; // NO_PROTO3
190+
optional int32 unknown_fields = 11; // NO_PROTO3
191+
optional int32 mutable_unknown_fields = 12; // NO_PROTO3
192+
optional int32 descriptor = 13; // NO_PROTO3
193+
optional int32 default_instance = 14; // NO_PROTO3
194+
optional int32 swap = 15; // NO_PROTO3
193195
} // NO_PROTO3
194196

195197
message TestConflictingSymbolNamesExtension { // NO_PROTO3

‎src/google/protobuf/only_one_enum_test.proto‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ enum OnlyOneEnum {
1212
ONLY_ONE_ENUM_DEFAULT = 0;
1313
ONLY_ONE_ENUM_VALID = 10;
1414
}
15-

‎src/google/protobuf/unittest_proto3_arena_lite.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ message TestAllTypes {
112112
repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
113113
repeated string repeated_cord = 55 [ctype = CORD];
114114

115-
repeated NestedMessage repeated_lazy_message = 57 ;
115+
repeated NestedMessage repeated_lazy_message = 57;
116116

117117
oneof oneof_field {
118118
uint32 oneof_uint32 = 111;

‎src/google/protobuf/unittest_proto3_lite.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ message TestAllTypes {
111111
repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
112112
repeated string repeated_cord = 55 [ctype = CORD];
113113

114-
repeated NestedMessage repeated_lazy_message = 57 ;
114+
repeated NestedMessage repeated_lazy_message = 57;
115115

116116
oneof oneof_field {
117117
uint32 oneof_uint32 = 111;

‎src/google/protobuf/unittest_well_known_types.proto‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ syntax = "proto3";
99

1010
package protobuf_unittest;
1111

12-
option csharp_namespace = "Google.Protobuf.TestProtos";
13-
option java_multiple_files = true;
14-
option java_package = "com.google.protobuf.test";
15-
1612
import "google/protobuf/any.proto";
1713
import "google/protobuf/api.proto";
1814
import "google/protobuf/duration.proto";
@@ -24,6 +20,10 @@ import "google/protobuf/timestamp.proto";
2420
import "google/protobuf/type.proto";
2521
import "google/protobuf/wrappers.proto";
2622

23+
option csharp_namespace = "Google.Protobuf.TestProtos";
24+
option java_multiple_files = true;
25+
option java_package = "com.google.protobuf.test";
26+
2727
// Test that we can include all well-known types.
2828
// Each wrapper type is included separately, as languages
2929
// map handle different wrappers in different ways.
@@ -100,22 +100,22 @@ message OneofWellKnownTypes {
100100
// need to worry about the value part of the map being the
101101
// well-known types, as messages can't be map keys.
102102
message MapWellKnownTypes {
103-
map<int32,google.protobuf.Any> any_field = 1;
104-
map<int32,google.protobuf.Api> api_field = 2;
105-
map<int32,google.protobuf.Duration> duration_field = 3;
106-
map<int32,google.protobuf.Empty> empty_field = 4;
107-
map<int32,google.protobuf.FieldMask> field_mask_field = 5;
108-
map<int32,google.protobuf.SourceContext> source_context_field = 6;
109-
map<int32,google.protobuf.Struct> struct_field = 7;
110-
map<int32,google.protobuf.Timestamp> timestamp_field = 8;
111-
map<int32,google.protobuf.Type> type_field = 9;
112-
map<int32,google.protobuf.DoubleValue> double_field = 10;
113-
map<int32,google.protobuf.FloatValue> float_field = 11;
114-
map<int32,google.protobuf.Int64Value> int64_field = 12;
115-
map<int32,google.protobuf.UInt64Value> uint64_field = 13;
116-
map<int32,google.protobuf.Int32Value> int32_field = 14;
117-
map<int32,google.protobuf.UInt32Value> uint32_field = 15;
118-
map<int32,google.protobuf.BoolValue> bool_field = 16;
119-
map<int32,google.protobuf.StringValue> string_field = 17;
120-
map<int32,google.protobuf.BytesValue> bytes_field = 18;
103+
map<int32, google.protobuf.Any> any_field = 1;
104+
map<int32, google.protobuf.Api> api_field = 2;
105+
map<int32, google.protobuf.Duration> duration_field = 3;
106+
map<int32, google.protobuf.Empty> empty_field = 4;
107+
map<int32, google.protobuf.FieldMask> field_mask_field = 5;
108+
map<int32, google.protobuf.SourceContext> source_context_field = 6;
109+
map<int32, google.protobuf.Struct> struct_field = 7;
110+
map<int32, google.protobuf.Timestamp> timestamp_field = 8;
111+
map<int32, google.protobuf.Type> type_field = 9;
112+
map<int32, google.protobuf.DoubleValue> double_field = 10;
113+
map<int32, google.protobuf.FloatValue> float_field = 11;
114+
map<int32, google.protobuf.Int64Value> int64_field = 12;
115+
map<int32, google.protobuf.UInt64Value> uint64_field = 13;
116+
map<int32, google.protobuf.Int32Value> int32_field = 14;
117+
map<int32, google.protobuf.UInt32Value> uint32_field = 15;
118+
map<int32, google.protobuf.BoolValue> bool_field = 16;
119+
map<int32, google.protobuf.StringValue> string_field = 17;
120+
map<int32, google.protobuf.BytesValue> bytes_field = 18;
121121
}

0 commit comments

Comments
 (0)