Skip to content

Commit b99994d

Browse files
habermanhaberman
committed
Sync from Piper @304070343
PROTOBUF_SYNC_PIPER
1 parent dec4939 commit b99994d

File tree

229 files changed

+9341
-6644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+9341
-6644
lines changed

‎benchmarks/datasets/google_message2/benchmark_message2.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

31+
// LINT: ALLOW_GROUPS
32+
3133
// Benchmark messages for proto2.
3234

3335
syntax = "proto2";

‎benchmarks/datasets/google_message3/benchmark_message3.proto

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,19 @@
2828
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

31+
// LINT: ALLOW_GROUPS
32+
3133
syntax = "proto2";
3234

35+
package benchmarks.google_message3;
36+
3337
import "datasets/google_message3/benchmark_message3_1.proto";
3438
import "datasets/google_message3/benchmark_message3_2.proto";
3539
import "datasets/google_message3/benchmark_message3_3.proto";
3640
import "datasets/google_message3/benchmark_message3_4.proto";
3741
import "datasets/google_message3/benchmark_message3_5.proto";
3842
import "datasets/google_message3/benchmark_message3_7.proto";
3943
import "datasets/google_message3/benchmark_message3_8.proto";
40-
package benchmarks.google_message3;
4144

4245
option cc_enable_arenas = true;
4346
option java_package = "com.google.protobuf.benchmarks";

‎benchmarks/datasets/google_message3/benchmark_message3_1.proto

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@
2828
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

31+
// LINT: ALLOW_GROUPS
32+
3133
syntax = "proto2";
3234

35+
package benchmarks.google_message3;
36+
3337
import "datasets/google_message3/benchmark_message3_2.proto";
3438
import "datasets/google_message3/benchmark_message3_3.proto";
3539
import "datasets/google_message3/benchmark_message3_5.proto";
3640
import "datasets/google_message3/benchmark_message3_7.proto";
3741
import "datasets/google_message3/benchmark_message3_8.proto";
38-
package benchmarks.google_message3;
3942

4043
option cc_enable_arenas = true;
4144
option java_package = "com.google.protobuf.benchmarks";
@@ -130,15 +133,13 @@ message Message36876 {
130133
optional int32 field37047 = 115;
131134
optional int32 field37048 = 157;
132135
}
133-
repeated group Message36878 = 168 {
134-
}
136+
repeated group Message36878 = 168 {}
135137
repeated group Message36879 = 55 {
136138
required string field37050 = 56;
137139
optional int32 field37051 = 69;
138140
}
139141
repeated .benchmarks.google_message3.UnusedEmptyMessage field36984 = 78;
140-
optional group Message36880 = 137 {
141-
}
142+
optional group Message36880 = 137 {}
142143
optional uint64 field36986 = 59;
143144
optional bytes field36987 = 121;
144145
optional .benchmarks.google_message3.UnusedEmptyMessage field36988 = 2;
@@ -154,11 +155,9 @@ message Message36876 {
154155
optional int32 field36998 = 47;
155156
optional int32 field36999 = 48;
156157
optional .benchmarks.google_message3.UnusedEmptyMessage field37000 = 68;
157-
repeated group Message36881 = 23 {
158-
}
158+
repeated group Message36881 = 23 {}
159159
optional .benchmarks.google_message3.Message4144 field37002 = 125;
160-
repeated group Message36882 = 35 {
161-
}
160+
repeated group Message36882 = 35 {}
162161
optional .benchmarks.google_message3.UnusedEmptyMessage field37004 = 49;
163162
optional .benchmarks.google_message3.Message18921 field37005 = 52;
164163
optional .benchmarks.google_message3.Message36858 field37006 = 46;
@@ -171,20 +170,15 @@ message Message36876 {
171170
optional .benchmarks.google_message3.Message0 field37013 = 143;
172171
optional .benchmarks.google_message3.UnusedEmptyMessage field37014 = 53;
173172
optional .benchmarks.google_message3.Message36869 field37015 = 15;
174-
optional group Message36883 = 3 {
175-
}
176-
repeated group Message36884 = 16 {
177-
}
178-
repeated group Message36885 = 27 {
179-
}
180-
optional group Message36886 = 32 {
181-
}
173+
optional group Message36883 = 3 {}
174+
repeated group Message36884 = 16 {}
175+
repeated group Message36885 = 27 {}
176+
optional group Message36886 = 32 {}
182177
repeated .benchmarks.google_message3.UnusedEnum field37020 = 71;
183178
repeated int32 field37021 = 70;
184179
optional .benchmarks.google_message3.UnusedEmptyMessage field37022 = 66;
185180
optional .benchmarks.google_message3.Message13090 field37023 = 67;
186-
optional group Message36887 = 62 {
187-
}
181+
optional group Message36887 = 62 {}
188182
repeated .benchmarks.google_message3.Message10155 field37025 = 50;
189183
repeated .benchmarks.google_message3.Message11874 field37026 = 151;
190184
optional string field37027 = 12;
@@ -232,8 +226,7 @@ message Message36876 {
232226
optional int32 field37118 = 160;
233227
repeated string field37119 = 161;
234228
}
235-
repeated group Message36910 = 119 {
236-
}
229+
repeated group Message36910 = 119 {}
237230
optional group Message36911 = 126 {
238231
optional .benchmarks.google_message3.UnusedEmptyMessage field37121 = 127;
239232
optional .benchmarks.google_message3.Message35538 field37122 = 130;
@@ -247,11 +240,9 @@ message Message36876 {
247240
optional .benchmarks.google_message3.UnusedEmptyMessage field37042 = 155;
248241
}
249242

250-
message Message1328 {
251-
}
243+
message Message1328 {}
252244

253-
message Message6850 {
254-
}
245+
message Message6850 {}
255246

256247
message Message6863 {
257248
optional .benchmarks.google_message3.Enum6858 field6931 = 1;
@@ -289,8 +280,7 @@ message Message6863 {
289280
optional bool field6963 = 34;
290281
}
291282

292-
message Message6871 {
293-
}
283+
message Message6871 {}
294284

295285
message Message7547 {
296286
required bytes field7549 = 1;
@@ -312,8 +302,7 @@ message Message7648 {
312302
optional bool field7680 = 12;
313303
}
314304

315-
message Message7865 {
316-
}
305+
message Message7865 {}
317306

318307
message Message7928 {
319308
optional string field7940 = 1;

‎benchmarks/datasets/google_message3/benchmark_message3_2.proto

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@
2828
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

31+
// LINT: ALLOW_GROUPS
32+
3133
syntax = "proto2";
3234

35+
package benchmarks.google_message3;
36+
3337
import "datasets/google_message3/benchmark_message3_3.proto";
3438
import "datasets/google_message3/benchmark_message3_4.proto";
3539
import "datasets/google_message3/benchmark_message3_5.proto";
3640
import "datasets/google_message3/benchmark_message3_7.proto";
3741
import "datasets/google_message3/benchmark_message3_8.proto";
38-
package benchmarks.google_message3;
3942

4043
option cc_enable_arenas = true;
4144
option java_package = "com.google.protobuf.benchmarks";
@@ -55,7 +58,9 @@ message Message24345 {
5558
optional string field24536 = 3;
5659
optional string field24537 = 4;
5760
optional .benchmarks.google_message3.UnusedEnum field24538 = 23;
58-
optional string field24539 = 5;
61+
62+
// LINT: ALLOW_GROUPS
63+
5964
required string field24540 = 6;
6065
optional string field24541 = 7;
6166
optional string field24542 = 8;
@@ -109,8 +114,7 @@ message Message24391 {
109114
repeated string field24655 = 6;
110115
}
111116

112-
message Message27454 {
113-
}
117+
message Message27454 {}
114118

115119
message Message27357 {
116120
optional string field27410 = 1;
@@ -192,8 +196,7 @@ message Message36869 {
192196
}
193197

194198
message Message33968 {
195-
repeated group Message33969 = 1 {
196-
}
199+
repeated group Message33969 = 1 {}
197200
repeated .benchmarks.google_message3.Message33958 field33989 = 3;
198201
optional .benchmarks.google_message3.UnusedEmptyMessage field33990 = 106;
199202
optional bool field33991 = 108;
@@ -268,8 +271,7 @@ message Message35573 {
268271
optional string field35696 = 1000;
269272
optional string field35697 = 1004;
270273
optional int32 field35698 = 1003;
271-
repeated group Message35574 = 1012 {
272-
}
274+
repeated group Message35574 = 1012 {}
273275
optional int64 field35700 = 1011;
274276
optional int64 field35701 = 1005;
275277
optional int64 field35702 = 1006;

‎benchmarks/datasets/google_message3/benchmark_message3_3.proto

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,16 @@
2828
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

31+
// LINT: ALLOW_GROUPS
32+
3133
syntax = "proto2";
3234

35+
package benchmarks.google_message3;
36+
3337
import "datasets/google_message3/benchmark_message3_4.proto";
3438
import "datasets/google_message3/benchmark_message3_5.proto";
3539
import "datasets/google_message3/benchmark_message3_7.proto";
3640
import "datasets/google_message3/benchmark_message3_8.proto";
37-
package benchmarks.google_message3;
3841

3942
option cc_enable_arenas = true;
4043
option java_package = "com.google.protobuf.benchmarks";
@@ -96,8 +99,7 @@ message Message2356 {
9699
optional bytes field2410 = 124;
97100
}
98101
optional string field2389 = 120;
99-
optional group Message2358 = 107 {
100-
}
102+
optional group Message2358 = 107 {}
101103
repeated group Message2359 = 40 {
102104
optional string field2413 = 41;
103105
optional string field2414 = 42;
@@ -438,8 +440,7 @@ message Message16724 {
438440
optional bool field16773 = 13;
439441
}
440442

441-
message Message17728 {
442-
}
443+
message Message17728 {}
443444

444445
message Message24356 {
445446
optional string field24559 = 1;

‎benchmarks/datasets/google_message3/benchmark_message3_4.proto

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,21 @@
2828
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2929
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

31+
// LINT: ALLOW_GROUPS
32+
3133
syntax = "proto2";
3234

35+
package benchmarks.google_message3;
36+
3337
import "datasets/google_message3/benchmark_message3_5.proto";
3438
import "datasets/google_message3/benchmark_message3_6.proto";
3539
import "datasets/google_message3/benchmark_message3_7.proto";
3640
import "datasets/google_message3/benchmark_message3_8.proto";
37-
package benchmarks.google_message3;
3841

3942
option cc_enable_arenas = true;
4043
option java_package = "com.google.protobuf.benchmarks";
4144

42-
message Message24346 {
43-
}
45+
message Message24346 {}
4446

4547
message Message24401 {
4648
optional .benchmarks.google_message3.Message24400 field24679 = 1;
@@ -219,12 +221,9 @@ message Message13083 {
219221
optional float field13099 = 45;
220222
optional uint64 field13100 = 46;
221223
optional float field13101 = 47;
222-
optional group Message13085 = 16 {
223-
}
224-
repeated group Message13086 = 23 {
225-
}
226-
repeated group Message13087 = 29 {
227-
}
224+
optional group Message13085 = 16 {}
225+
repeated group Message13086 = 23 {}
226+
repeated group Message13087 = 29 {}
228227
optional .benchmarks.google_message3.UnusedEmptyMessage field13105 = 43;
229228
}
230229

@@ -292,12 +291,10 @@ message Message16816 {
292291
optional float field16826 = 1;
293292
optional .benchmarks.google_message3.Enum16819 field16827 = 2;
294293
optional float field16828 = 3;
295-
repeated group Message16817 = 4 {
296-
}
294+
repeated group Message16817 = 4 {}
297295
optional bool field16830 = 7;
298296
optional bool field16831 = 8;
299-
repeated group Message16818 = 12 {
300-
}
297+
repeated group Message16818 = 12 {}
301298
optional string field16833 = 10;
302299
optional bool field16834 = 13;
303300
optional bool field16835 = 14;
@@ -338,11 +335,9 @@ message Message1374 {
338335
optional string field1376 = 2;
339336
}
340337

341-
message Message18943 {
342-
}
338+
message Message18943 {}
343339

344-
message Message18944 {
345-
}
340+
message Message18944 {}
346341

347342
message Message18856 {
348343
optional string field18857 = 1;
@@ -466,8 +461,7 @@ message Message8475 {
466461
optional int64 field8482 = 2;
467462
}
468463

469-
message Message12559 {
470-
}
464+
message Message12559 {}
471465

472466
message Message12817 {
473467
optional int32 field12826 = 1;

0 commit comments

Comments
 (0)