From 6a034930a5a85a51a8713f9c127ade6340203cfc Mon Sep 17 00:00:00 2001 From: Josh Humphries Date: Fri, 30 Sep 2022 16:11:47 -0400 Subject: [PATCH 1/2] update protoc to 21.7; also adds go 1.19 to CI --- .circleci/config.yml | 13 ++++++++++--- internal/testprotos/desc_test1.pb.go | 3 ++- internal/testprotos/desc_test2.pb.go | 4 +++- internal/testprotos/desc_test_comments.pb.go | 4 +++- .../testprotos/desc_test_comments.protoset | Bin 61075 -> 61532 bytes internal/testprotos/desc_test_complex.pb.go | 3 ++- .../desc_test_complex_source_info.protoset | Bin 69354 -> 69875 bytes internal/testprotos/desc_test_defaults.pb.go | 2 +- .../testprotos/desc_test_field_types.pb.go | 2 +- internal/testprotos/desc_test_oneof.pb.go | 3 ++- internal/testprotos/desc_test_options.pb.go | 2 +- internal/testprotos/desc_test_proto3.pb.go | 2 +- internal/testprotos/desc_test_value.pb.go | 2 +- .../testprotos/desc_test_wellknowntypes.pb.go | 2 +- internal/testprotos/descriptor.protoset | Bin 49869 -> 50390 bytes internal/testprotos/grpc/dummy.pb.go | 2 +- internal/testprotos/grpc/dummy_grpc.pb.go | 2 +- internal/testprotos/grpc/test.pb.go | 2 +- internal/testprotos/grpc/test_grpc.pb.go | 2 +- internal/testprotos/make_protos.sh | 2 +- .../testprotos/nopkg/desc_test_nopkg.pb.go | 2 +- .../nopkg/desc_test_nopkg_new.pb.go | 2 +- internal/testprotos/pkg/desc_test_pkg.pb.go | 2 +- .../desc_test_proto3_optional.protoset | Bin 50490 -> 51011 bytes 24 files changed, 36 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eab17864..29ad84e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,6 +56,12 @@ jobs: working_directory: ~/repo docker: - image: cimg/go:1.18 + steps: *simple_job_steps + + build-1-19: + working_directory: ~/repo + docker: + - image: cimg/go:1.19 steps: - checkout - restore_cache: @@ -77,10 +83,10 @@ jobs: #- store_test_results: # path: /tmp/test-reports - build-1-18-u: + build-1-19-u: working_directory: ~/repo docker: - - image: cimg/go:1.18 + - image: cimg/go:1.19 steps: - checkout - run: @@ -102,4 +108,5 @@ workflows: - build-1-17 - build-windows - build-1-18 - - build-1-18-u + - build-1-19 + - build-1-19-u diff --git a/internal/testprotos/desc_test1.pb.go b/internal/testprotos/desc_test1.pb.go index e715e3f1..eeea8fb4 100644 --- a/internal/testprotos/desc_test1.pb.go +++ b/internal/testprotos/desc_test1.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test1.proto package testprotos @@ -236,6 +236,7 @@ type AnotherTestMessage struct { // Comment for atmoo // // Types that are assignable to Atmoo: + // // *AnotherTestMessage_Str // *AnotherTestMessage_Int Atmoo isAnotherTestMessage_Atmoo `protobuf_oneof:"atmoo"` diff --git a/internal/testprotos/desc_test2.pb.go b/internal/testprotos/desc_test2.pb.go index 1732fb9f..d4242b39 100644 --- a/internal/testprotos/desc_test2.pb.go +++ b/internal/testprotos/desc_test2.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test2.proto package testprotos @@ -30,6 +30,7 @@ type Frobnitz struct { A *TestMessage `protobuf:"bytes,1,opt,name=a" json:"a,omitempty"` B *AnotherTestMessage `protobuf:"bytes,2,opt,name=b" json:"b,omitempty"` // Types that are assignable to Abc: + // // *Frobnitz_C1 // *Frobnitz_C2 Abc isFrobnitz_Abc `protobuf_oneof:"abc"` @@ -38,6 +39,7 @@ type Frobnitz struct { // Deprecated: Do not use. F []string `protobuf:"bytes,7,rep,name=f" json:"f,omitempty"` // Types that are assignable to Def: + // // *Frobnitz_G1 // *Frobnitz_G2 // *Frobnitz_G3 diff --git a/internal/testprotos/desc_test_comments.pb.go b/internal/testprotos/desc_test_comments.pb.go index 2eab293d..f34d6827 100644 --- a/internal/testprotos/desc_test_comments.pb.go +++ b/internal/testprotos/desc_test_comments.pb.go @@ -10,7 +10,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test_comments.proto // And now the package declaration @@ -137,12 +137,14 @@ type Request struct { // can be this or that // // Types that are assignable to Abc: + // // *Request_This // *Request_That Abc isRequest_Abc `protobuf_oneof:"abc"` // can be these or those // // Types that are assignable to Xyz: + // // *Request_These // *Request_Those Xyz isRequest_Xyz `protobuf_oneof:"xyz"` diff --git a/internal/testprotos/desc_test_comments.protoset b/internal/testprotos/desc_test_comments.protoset index af2c9a444171b6cfaae99d0a58076791957dbd47..d7ecb346d6f78866577c3a43f3c6a0be70721856 100644 GIT binary patch delta 10122 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 G_WuC)q)P_? delta 9570 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 HC2#vbj+m{O diff --git a/internal/testprotos/desc_test_defaults.pb.go b/internal/testprotos/desc_test_defaults.pb.go index bbe3cb8b..985f6fea 100644 --- a/internal/testprotos/desc_test_defaults.pb.go +++ b/internal/testprotos/desc_test_defaults.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test_defaults.proto package testprotos diff --git a/internal/testprotos/desc_test_field_types.pb.go b/internal/testprotos/desc_test_field_types.pb.go index 90fd3deb..a58e244b 100644 --- a/internal/testprotos/desc_test_field_types.pb.go +++ b/internal/testprotos/desc_test_field_types.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test_field_types.proto package testprotos diff --git a/internal/testprotos/desc_test_oneof.pb.go b/internal/testprotos/desc_test_oneof.pb.go index f80592ec..25160679 100644 --- a/internal/testprotos/desc_test_oneof.pb.go +++ b/internal/testprotos/desc_test_oneof.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test_oneof.proto package testprotos @@ -26,6 +26,7 @@ type OneOfMessage struct { unknownFields protoimpl.UnknownFields // Types that are assignable to Value: + // // *OneOfMessage_BinaryValue // *OneOfMessage_StringValue // *OneOfMessage_BooleanValue diff --git a/internal/testprotos/desc_test_options.pb.go b/internal/testprotos/desc_test_options.pb.go index 1db563e8..bdee22d7 100644 --- a/internal/testprotos/desc_test_options.pb.go +++ b/internal/testprotos/desc_test_options.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test_options.proto package testprotos diff --git a/internal/testprotos/desc_test_proto3.pb.go b/internal/testprotos/desc_test_proto3.pb.go index f9a01f3a..607b8aee 100644 --- a/internal/testprotos/desc_test_proto3.pb.go +++ b/internal/testprotos/desc_test_proto3.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test_proto3.proto package testprotos diff --git a/internal/testprotos/desc_test_value.pb.go b/internal/testprotos/desc_test_value.pb.go index f095ef45..e723b13f 100644 --- a/internal/testprotos/desc_test_value.pb.go +++ b/internal/testprotos/desc_test_value.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test_value.proto package testprotos diff --git a/internal/testprotos/desc_test_wellknowntypes.pb.go b/internal/testprotos/desc_test_wellknowntypes.pb.go index b239d84c..a5287a8e 100644 --- a/internal/testprotos/desc_test_wellknowntypes.pb.go +++ b/internal/testprotos/desc_test_wellknowntypes.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: desc_test_wellknowntypes.proto package testprotos diff --git a/internal/testprotos/descriptor.protoset b/internal/testprotos/descriptor.protoset index 281e9e151438b966b1e1f054391ddca6e7bf661e..81e35bb34d4c843b7f6aeca91252a7c14e9a2363 100644 GIT binary patch delta 10117 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 DvNuRA delta 9562 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 diff --git a/internal/testprotos/grpc/dummy.pb.go b/internal/testprotos/grpc/dummy.pb.go index d6737bae..726eadc4 100644 --- a/internal/testprotos/grpc/dummy.pb.go +++ b/internal/testprotos/grpc/dummy.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: grpc/dummy.proto package grpc diff --git a/internal/testprotos/grpc/dummy_grpc.pb.go b/internal/testprotos/grpc/dummy_grpc.pb.go index 72f05641..34b9cf6d 100644 --- a/internal/testprotos/grpc/dummy_grpc.pb.go +++ b/internal/testprotos/grpc/dummy_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.19.0 +// - protoc v3.21.7 // source: grpc/dummy.proto package grpc diff --git a/internal/testprotos/grpc/test.pb.go b/internal/testprotos/grpc/test.pb.go index d3ae513e..46e55228 100644 --- a/internal/testprotos/grpc/test.pb.go +++ b/internal/testprotos/grpc/test.pb.go @@ -22,7 +22,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: grpc/test.proto package grpc diff --git a/internal/testprotos/grpc/test_grpc.pb.go b/internal/testprotos/grpc/test_grpc.pb.go index 123cddfb..5fe7dee9 100644 --- a/internal/testprotos/grpc/test_grpc.pb.go +++ b/internal/testprotos/grpc/test_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.19.0 +// - protoc v3.21.7 // source: grpc/test.proto package grpc diff --git a/internal/testprotos/make_protos.sh b/internal/testprotos/make_protos.sh index 02218010..6ff7bf68 100755 --- a/internal/testprotos/make_protos.sh +++ b/internal/testprotos/make_protos.sh @@ -4,7 +4,7 @@ set -e cd $(dirname $0) -PROTOC_VERSION="3.19.0" +PROTOC_VERSION="21.7" PROTOC_OS="$(uname -s)" PROTOC_ARCH="$(uname -m)" case "${PROTOC_OS}" in diff --git a/internal/testprotos/nopkg/desc_test_nopkg.pb.go b/internal/testprotos/nopkg/desc_test_nopkg.pb.go index f21b2077..25cee769 100644 --- a/internal/testprotos/nopkg/desc_test_nopkg.pb.go +++ b/internal/testprotos/nopkg/desc_test_nopkg.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: nopkg/desc_test_nopkg.proto package nopkg diff --git a/internal/testprotos/nopkg/desc_test_nopkg_new.pb.go b/internal/testprotos/nopkg/desc_test_nopkg_new.pb.go index 2b14ac3b..0fbb244a 100644 --- a/internal/testprotos/nopkg/desc_test_nopkg_new.pb.go +++ b/internal/testprotos/nopkg/desc_test_nopkg_new.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: nopkg/desc_test_nopkg_new.proto package nopkg diff --git a/internal/testprotos/pkg/desc_test_pkg.pb.go b/internal/testprotos/pkg/desc_test_pkg.pb.go index d99f4c47..b9798a01 100644 --- a/internal/testprotos/pkg/desc_test_pkg.pb.go +++ b/internal/testprotos/pkg/desc_test_pkg.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.19.0 +// protoc v3.21.7 // source: pkg/desc_test_pkg.proto package pkg diff --git a/internal/testprotos/proto3_optional/desc_test_proto3_optional.protoset b/internal/testprotos/proto3_optional/desc_test_proto3_optional.protoset index 5a3d8a42e113a992acd250932a691aed923a2403..b46af01be9fbb19e87ec8e86da55e26044670af9 100644 GIT binary patch delta 10119 zcmaJ{3vg9Mn$GFdeeTV3_hh!V zw#t(Gb^rbSkN&&+?>^bR)ZYJwZM(;oylZzCuoXPGP;g}2csFl;-Sf$YnmIMes%L8} zez9Oso^Oqc-Ye!*)HWs`&kcJYPVXwr%XYsw%-o14MrN%}A1irpfORh2a>r>mv7EV_ zbLM#bpv8t4Elj_9pKU$p=D31dxoma~6a-`W23iEYAqLt6ONY6OEJ+#h_~GEvcbdx& zTg)&-z;M`#CG?O87!F(c#Rh`murnOue4^BxHz!;gisYC>TDmyuq3w z3WiUtTYNVzP0056ad@RWv*8V(u_YTmAGcxyO)r>^TZ4=@*tT}7N@-&AFjC9GbdlMT@10f@OKU z$70HUAeacKOaugdk8u_d^gWh0KxzX7eUEi>k!C{YCF87M7MK7HlLcol8E4DTEv2=$ zfS|fW-j0N&j^})BW&M3{;lUB9udV1{$?uS*-xy1Qzz?YS0b%Jk#!^7ge`72K1pPP0 zQiq}Qip9oDH-NwdXqd>-D^_fn>`kFtN)I1xq(ODX8h5KUih2B+#gwqa7^naZ6=n4` zE2iRwUNBv=2Hv8X7?`eELrdLvXbCuWmgl^}STnPWI+*`>Mcq%6etj_D;o-sE-@lQ1 zg}H;>V%H%#io_zuOG@MZjJnF&`HeNtC&#;Po*PlUFaq82umQ1I#B#i_0fsDM1%tu{ zn6iisF3xCxz+%P+XEX%qhrDTM2}v!GF78iCaazm@24qNSP8Tzz#}-;m4!OH5h(7$A zDa%+ULN+3_jK$Ofga|m6v68VmLN*Oy<8O0oB?0_u2`)ZdSKbm5Agy@|(_4bWI0#yp z-Vy*o(87>b6OmRC&k0!8>R`-4? z`jzA%t@a2_Z!2TU7a%YJ8YYTYE7Lnq3f)pVU#)&XP_?ommFp3Pv}$8)l#Bxqr~nNW zrBxe?sWppUFtxE_m4kp_YGWfty2Igf)N|Ibto6()8sJY)HdZ#&%uY7?6~Vzr3Q}uW z^cHD(lwz>f!~h8D0F^pGSiaW801)cdniv2=-C7faDA}@(v2oIHATR+MCR$qSSj?Bb zDRfKep(BknsMfJDW3^F;K__D)bSK3C&`?nfI$7*y(+j3fRy5Q=FmL@xy;eZ3-D^{x^jTzY5F%aRw}&#f-Qi?76zuxArooa z%)AmK45rP@A4*J*feP?##>#ZB4JtrGMa%DP78_)GLG?DfSA|!uc>3`N zW^D`U1vQ5B0`_eS=>_Pwh4cdS+d_H)`fWu2PA-zb^_)*x*2n+&#P~?!Qx+|7zoMyf zY1U5!e?9Z-@)JfY+MxA>2{0hEo?xEZwgI8_1jDx7L)*4X;Xj%F`BRNn`N@!iX8UAF zL9>05c`BDN1QaLP=rQiEZApRY?oJPVdXqJ?JEWj#?l!)=a+P1pRZ#}c<{0-E}BY{Dc1L4S_j zKHbg53FI=H%A9lTj%n^6RSb|Cz3DB_R$EW^h8ie0dP5DgHTSZFi2>zCFB`44dbv{p zjw{y+u~`G&J;i;P9N;(_uQ2xKpuXav{3|R{;7%tyxI7831|L;?ukws!Op%V+LkLj8Y5Q_WQAhiGh;d37wX(o*lwlADCO4vS{w3DuiD!7`{^D3*X z@@6}u!GZo}TOW8XbD*Kw*82z`G&I{ohPt03JeVm^wx;uwKVqrYkb;WfR$DJx$bh2N z&SX{u6s>k9vm!9E)y`yAgcxlYNgI_*X}8K|X4awz2A~NBmCCEMo)if~(JDKk_98$i zT4j$KqazuWTw|vg2t}*xyC!QzsHEHMOw_581~iJYp{Ol%C>wg(LWii5ZcBw8WkXS0 z=utKlwS^v`%wBCXV}%PvfJPCO+p9xGRBo@f6J~m;++J;uRFxv;5PDYIV^pRL0EVK~ z_MP{-m(|u2^LR&awYqm^N2nkM1s$P+7!-8ai6R}77!-8aC91r4Squs~Y=5HZ1%HP< zc7mIdQxo@iS1{veFF(~4(#JvH71GB+-(~CV+GTOjciF?t{KP@uWsgwXHF`ncWly}* zU7^g+@%YA|?75XwHirB;;NKV~XAbx`+Me07a=^cl=3$03FxTT-g5KvID&GwHhbtW z_a$jV!sFY6Lvw#wzC9#JfM9z_kO0B<(1rvEwv!EeRT%O;zAIQ#_rZ5}g$(&%*cCG5 zgJGAgi&B^6gJGAATiNdwgXi(RHXC2GCwQZ7a`3P9e^(A@GR_0l-jK=z)n3~(JBSCW zz4q8!-F=Fxz~lRamU;g&Wq-&}0EYb`Ljf4}hw&%?!+wg#-^zFtdi=wn<>xO={V*gb z#6I+)9W&=&AqYOShup5St`Gzt+IQXKzG}HPrv-AzMk(}*pr>VO(9$q1b;!<9^@S_w zBn4FWcR*~chwPgMxiK1v6@J8KxoW*<<6J&s$8waCY#P`fVxWX^92_yvIcjGG+>$i3 zVvgF;0q$o44#nhYeJcHA;|ccEDdQ4aVdg2b4gfLel$}s@s2*dZ4yCdM5bNNSt&b)^ ztbAwM1eXF`5D{?FKn+cY5^|7Yw;DuN&Y{~7y^`%N$S z&)D}(ch4(+_J&Z6ERsET(C>jgaLy8f<0t{=BG2^f<5Lo z6)r@*$7TgG>M@FXj~$CENg4GJrm|_iB&NMTM!Rf}ovWT6fc_VhvglQ^66JfEnC$Jb zLuh)}J2IjO&ug6BQncLhe_Wkxs!lfe_+R?{1qpjHI@HpLF{)r*70# zlBKu=*B~3ldVFc%zBppsQl4>-2K0xpLc$?>z_MW0i$iZ+77m~ara#002_KbK@XaMR3gkI3JaJ_&4VQ34-0-8yB;S*liwzmK1k(j`2tl)a_0AU!Q zT0DTzzJg=%&>Dz)PAkv4rq=*%>#aOm=x(4oB2G1Kd-{u)%B)noF$#?^s-5fmC?LkP z^L+JG0SKeoIc_wx1OSmj?R>DR4grxu?R>;Il!M@>>TC^XUEEgEoVeETNZcKQ@(bN$ zz&g(Jih|THOH%ly-YR4dyjaI`a%Evj4H(+Vb&V#mYKY2eOg3OdC(Q|!qSOHVE6#7q z2oMDtRQ)Ceqy*}>6BG_7P6C_KLtma{m2V2;A@64q7JF$IXgLf zKNC_iXD5&3;C+m|wkV{(MVb`_#}}8C;+LvwWe;roEk{*5T8m=no}jpSZ0VlhbIJ92M-G4gaTiTy#&H97GmXJd;F|^ZtM@DG8yb?8O?An}M!&K;S@|3U>u4eSvllca{l=z-WW`*+YJNja-A`SAUPVJA zevJ41C#!23{katj{MuwimEQ!ShKj~&aMsN6E9$EJ7pjwW_~F;oJzr6qs;T-5x|&AU zpHov;QCqt}QYNeX`SYN*qOuZp;E~LK^3my!j+%Yjq=^&nnQ+&{iMNlw*Z1$QtC(Gz z^ubqCRnb%fdHg4x!RvNy6^&DqM%QP!pMfGpSZ_gbxdna66NN@v25X>602?#@CBJ!$ z>BWqH$?>lE4(;=Cy5yhc?CzrVmLI;I%a`^4C#0$WBc|h32pg;G=hs%b5I`(uC;j=2 z2nK@JkW{X{P}5ZHs~7xAzUKIT~^$q^KWCQ-0TTxe;bbU-%V|`s1 z4dmY}ve|@#E_|oMXwW`)n(N1C_=jkm<|unqDCsfaG}n&-=tVS6bKKTXt7w4geDLz? ze|&~6Sm#3>^dfLR)Ik@l^IR9mae2Wy&-KX%2p#9SKKTHl<2=X7cb^P6R%=i2yEn?8 zp|1=*p$fWT^@J+uhSd{JD&4Sp_&{~c#F+yXJ-kTO3V=}2!^_6FbSA`UQTO6Z_`!D~ zP|+Kzh(LF*IT0WR6}{#}0ECKOb0Sd5{;fO_QgJ#FzBMNT5QYJ&69EuQ^;AyMdCdLKnikAUy7EAd(@B5ToNPc~>JPyrA)PHbo^yj|y&^1Cr%_FR zgANz+Fo*V`K05WL;wOCUGd=>s$3EjDAjb6>9|7TGpYf5d4GV+E*8ljC9CC4?(1#un zMgb}p0b$rep%1-W&si+8Rtr`5(N$rwz{Ac@U{@~LwL}E56&2-6gicU2LeCPRmn$HK zED;IyjtU5qmWW%1xc@~dm`mGtOR#yxf6r_Q8R(Q~2^nZxZV@{DFaiuMLZ=@fa-&7) z^aDgTv<2T(6-;#dkk>76_zkx6cQ27lAzuz)`Cp>49 z$l9&_ru*O~fg8r>^mvybzticnZC_Y3)5az=LQ&c{4u~;n<2WE}N(+6D2ZZBkq3`j4 za6Bz=k0-|y&yq3D2d84zO*7?%NI(*ff$ zAY49RTn2>82gv1%luP+kQ63WP--6fHU6^)ALfPwDaS`7H(fOX!J`dIMXj2Nx9j|DC&RQ%+F z%Q-68F`?ctfsu%4Q0E^YX62~R-(>)y`lu*YMKd5Ga8&3gRX{}Gm~hl%3m_tJOym!b z$yv`Q#m6b#gT#7g^6^jyE%M`L<{<_h$IZ+GLdS74^YjYw8D@UgZJ(J*&zF-9s3si{ zdOo8`UuI*g_dMsM$oe|{@9URZ1t$f*ynaL_vqzsMPYd>^^n$KD%br_bA1vE2GKGIj zb!7wz7;;*;6e%31>Ko-5!AoT*B}S~!pgthV2AFq7x7L0D|kRC{*>FcazNNvjP?UTFP3F=Hg=TyEi*h7efj%=%Ubf0*H`|&<|RG zFy^8t8=;NCWb_E8-VZ&wy#pF!=+560GLg0(;i+;8!eHtVcv^;ADcAydN$3xVK=2FD zP|?l#lF)ZQ^n&V=$XCyFfO0H8AgTyq=w+e5aC`D<3uu_ASsD5~tf68UCk=;{0`$^~TDZ-buvGZ8?;bURgW zy`fc9!SxDHeH?@|sCorH4xX@(^93kxMAn~!f{mXiZqT;AFdvgyK#8$AeSPDiXlk>g znb8Qnn;o4HfFR!N6sjv7Ac!|R_=rclMFB0EEe^ZksB1AWq_;R&B1TK-oU0Ky8e&0mkifurbm?kPX;?_Bq94-30!=L^UA)_BkbE++$1|2$F;8 zkG4N)r4IJjMoE3JzcxzigZ;HpVjt|Ujkddk{k2(9Xgf&S-im8&Xt?U|(M2oqcMWiy z?txF#&u^$qPOIP0v6IV<=U2N&4#viVK=^+BJi4n@)Z%_LpYCt8F@3rFDUwT1-80up zfh`OXt)Huo-fzfXT0vKx!r_^S(4x8OU=7iJLlVH(96lx^K+6aXAtx=QYyCNCDP404 z%jA%hWEeJpOznfY)dQIW@Jx zOCQ`b9la{7G@g?7^@yH-*&xRk4v}G%4Y1+$2>x2+1+4%Imj~BASaARH{zQ~W%lkV+ ziL^YT|D1-1C~=lYa4>vf!h(iX!LEP)k2_ZNXQK33)t`ydXH`W14Gl5TUc4&(`+f7+ F{{Z*>N`(Lb delta 9570 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 H|1kSMi Date: Mon, 3 Oct 2022 12:23:46 -0400 Subject: [PATCH 2/2] regen printer output for latest descriptor.proto --- .../testfiles/descriptor-compact.proto | 27 +++++++++++------ .../testfiles/descriptor-custom-sort.proto | 28 +++++++++++------ .../testfiles/descriptor-default.proto | 28 +++++++++++------ .../descriptor-multiline-style-comments.proto | 30 +++++++++++++------ .../descriptor-no-trailing-comments.proto | 28 +++++++++++------ .../descriptor-only-doc-comments.proto | 28 +++++++++++------ ...-sorted-AND-multiline-style-comments.proto | 30 +++++++++++++------ .../testfiles/descriptor-sorted.proto | 28 +++++++++++------ .../descriptor-trailing-on-next-line.proto | 28 +++++++++++------ 9 files changed, 174 insertions(+), 81 deletions(-) diff --git a/desc/protoprint/testfiles/descriptor-compact.proto b/desc/protoprint/testfiles/descriptor-compact.proto index 600587e5..e28e0f6d 100644 --- a/desc/protoprint/testfiles/descriptor-compact.proto +++ b/desc/protoprint/testfiles/descriptor-compact.proto @@ -166,7 +166,6 @@ message FieldDescriptorProto { // For booleans, "true" or "false". // For strings, contains the default text contents (not escaped in any way). // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? optional string default_value = 7; // If set, gives the index of a oneof in the containing type's oneof_decl // list. This field is a member of that oneof. @@ -501,7 +500,17 @@ message FieldOptions { // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. + // + // As of 2021, lazy does no correctness checks on the byte stream during + // parsing. This may lead to crashes if and when an invalid byte stream is + // finally parsed upon access. + // + // TODO(b/211906113): Enable validation on lazy fields. optional bool lazy = 5 [default = false]; + // unverified_lazy does no correctness checks on the byte stream. This should + // only be used where lazy with verification is prohibitive for performance + // reasons. + optional bool unverified_lazy = 15 [default = false]; // Is this field deprecated? // Depending on the target platform, this can emit Deprecated annotations // for accessors, or it will be completely ignored; in the very least, this @@ -590,8 +599,8 @@ message UninterpretedOption { // The name of the uninterpreted option. Each string represents a segment in // a dot-separated name. is_extension is true iff a segment represents an // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". + // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + // "foo.(bar.baz).moo". message NamePart { required string name_part = 1; required bool is_extension = 2; @@ -660,8 +669,8 @@ message SourceCodeInfo { // location. // // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: + // the root FileDescriptorProto to the place where the definition occurs. + // For example, this path: // [ 4, 3, 2, 7, 1 ] // refers to: // file.message_type(3) // 4, 3 @@ -713,13 +722,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. diff --git a/desc/protoprint/testfiles/descriptor-custom-sort.proto b/desc/protoprint/testfiles/descriptor-custom-sort.proto index f8432e2f..840144f1 100644 --- a/desc/protoprint/testfiles/descriptor-custom-sort.proto +++ b/desc/protoprint/testfiles/descriptor-custom-sort.proto @@ -48,8 +48,8 @@ message UninterpretedOption { // The name of the uninterpreted option. Each string represents a segment in // a dot-separated name. is_extension is true iff a segment represents an // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". + // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + // "foo.(bar.baz).moo". message NamePart { required string name_part = 1; @@ -93,8 +93,8 @@ message SourceCodeInfo { // location. // // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: + // the root FileDescriptorProto to the place where the definition occurs. + // For example, this path: // [ 4, 3, 2, 7, 1 ] // refers to: // file.message_type(3) // 4, 3 @@ -143,13 +143,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. @@ -618,6 +618,11 @@ message FieldOptions { // For Google-internal migration only. Do not use. optional bool weak = 10 [default = false]; + // unverified_lazy does no correctness checks on the byte stream. This should + // only be used where lazy with verification is prohibitive for performance + // reasons. + optional bool unverified_lazy = 15 [default = false]; + // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -656,6 +661,12 @@ message FieldOptions { // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. + // + // As of 2021, lazy does no correctness checks on the byte stream during + // parsing. This may lead to crashes if and when an invalid byte stream is + // finally parsed upon access. + // + // TODO(b/211906113): Enable validation on lazy fields. optional bool lazy = 5 [default = false]; // The jstype option determines the JavaScript type used for values of the @@ -804,7 +815,6 @@ message FieldDescriptorProto { // For booleans, "true" or "false". // For strings, contains the default text contents (not escaped in any way). // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? optional string default_value = 7; } diff --git a/desc/protoprint/testfiles/descriptor-default.proto b/desc/protoprint/testfiles/descriptor-default.proto index 73abc8d2..819ae4a5 100644 --- a/desc/protoprint/testfiles/descriptor-default.proto +++ b/desc/protoprint/testfiles/descriptor-default.proto @@ -234,7 +234,6 @@ message FieldDescriptorProto { // For booleans, "true" or "false". // For strings, contains the default text contents (not escaped in any way). // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? optional string default_value = 7; // If set, gives the index of a oneof in the containing type's oneof_decl @@ -640,8 +639,19 @@ message FieldOptions { // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. + // + // As of 2021, lazy does no correctness checks on the byte stream during + // parsing. This may lead to crashes if and when an invalid byte stream is + // finally parsed upon access. + // + // TODO(b/211906113): Enable validation on lazy fields. optional bool lazy = 5 [default = false]; + // unverified_lazy does no correctness checks on the byte stream. This should + // only be used where lazy with verification is prohibitive for performance + // reasons. + optional bool unverified_lazy = 15 [default = false]; + // Is this field deprecated? // Depending on the target platform, this can emit Deprecated annotations // for accessors, or it will be completely ignored; in the very least, this @@ -757,8 +767,8 @@ message UninterpretedOption { // The name of the uninterpreted option. Each string represents a segment in // a dot-separated name. is_extension is true iff a segment represents an // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". + // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + // "foo.(bar.baz).moo". message NamePart { required string name_part = 1; @@ -838,8 +848,8 @@ message SourceCodeInfo { // location. // // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: + // the root FileDescriptorProto to the place where the definition occurs. + // For example, this path: // [ 4, 3, 2, 7, 1 ] // refers to: // file.message_type(3) // 4, 3 @@ -893,13 +903,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. diff --git a/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto b/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto index 2665f059..14549a3b 100644 --- a/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto +++ b/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto @@ -267,7 +267,6 @@ message FieldDescriptorProto { * For booleans, "true" or "false". * For strings, contains the default text contents (not escaped in any way). * For bytes, contains the C escaped value. All bytes >= 128 are escaped. - * TODO(kenton): Base-64 encode? */ optional string default_value = 7; @@ -737,9 +736,22 @@ message FieldOptions { * implementation must either *always* check its required fields, or *never* * check its required fields, regardless of whether or not the message has * been parsed. + * + * As of 2021, lazy does no correctness checks on the byte stream during + * parsing. This may lead to crashes if and when an invalid byte stream is + * finally parsed upon access. + * + * TODO(b/211906113): Enable validation on lazy fields. */ optional bool lazy = 5 [default = false]; + /* + * unverified_lazy does no correctness checks on the byte stream. This should + * only be used where lazy with verification is prohibitive for performance + * reasons. + */ + optional bool unverified_lazy = 15 [default = false]; + /* * Is this field deprecated? * Depending on the target platform, this can emit Deprecated annotations @@ -876,8 +888,8 @@ message UninterpretedOption { * The name of the uninterpreted option. Each string represents a segment in * a dot-separated name. is_extension is true iff a segment represents an * extension (denoted with parentheses in options specs in .proto files). - * E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - * "foo.(bar.baz).qux". + * E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + * "foo.(bar.baz).moo". */ message NamePart { required string name_part = 1; @@ -967,8 +979,8 @@ message SourceCodeInfo { * location. * * Each element is a field number or an index. They form a path from - * the root FileDescriptorProto to the place where the definition. For - * example, this path: + * the root FileDescriptorProto to the place where the definition occurs. + * For example, this path: * [ 4, 3, 2, 7, 1 ] * refers to: * file.message_type(3) // 4, 3 @@ -1025,13 +1037,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. diff --git a/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto b/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto index 82d5fec6..c47f16d4 100644 --- a/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto +++ b/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto @@ -234,7 +234,6 @@ message FieldDescriptorProto { // For booleans, "true" or "false". // For strings, contains the default text contents (not escaped in any way). // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? optional string default_value = 7; // If set, gives the index of a oneof in the containing type's oneof_decl @@ -640,8 +639,19 @@ message FieldOptions { // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. + // + // As of 2021, lazy does no correctness checks on the byte stream during + // parsing. This may lead to crashes if and when an invalid byte stream is + // finally parsed upon access. + // + // TODO(b/211906113): Enable validation on lazy fields. optional bool lazy = 5 [default = false]; + // unverified_lazy does no correctness checks on the byte stream. This should + // only be used where lazy with verification is prohibitive for performance + // reasons. + optional bool unverified_lazy = 15 [default = false]; + // Is this field deprecated? // Depending on the target platform, this can emit Deprecated annotations // for accessors, or it will be completely ignored; in the very least, this @@ -757,8 +767,8 @@ message UninterpretedOption { // The name of the uninterpreted option. Each string represents a segment in // a dot-separated name. is_extension is true iff a segment represents an // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". + // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + // "foo.(bar.baz).moo". message NamePart { required string name_part = 1; @@ -838,8 +848,8 @@ message SourceCodeInfo { // location. // // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: + // the root FileDescriptorProto to the place where the definition occurs. + // For example, this path: // [ 4, 3, 2, 7, 1 ] // refers to: // file.message_type(3) // 4, 3 @@ -893,13 +903,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. diff --git a/desc/protoprint/testfiles/descriptor-only-doc-comments.proto b/desc/protoprint/testfiles/descriptor-only-doc-comments.proto index 588130c2..c4df52fa 100644 --- a/desc/protoprint/testfiles/descriptor-only-doc-comments.proto +++ b/desc/protoprint/testfiles/descriptor-only-doc-comments.proto @@ -194,7 +194,6 @@ message FieldDescriptorProto { // For booleans, "true" or "false". // For strings, contains the default text contents (not escaped in any way). // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? optional string default_value = 7; // If set, gives the index of a oneof in the containing type's oneof_decl @@ -568,8 +567,19 @@ message FieldOptions { // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. + // + // As of 2021, lazy does no correctness checks on the byte stream during + // parsing. This may lead to crashes if and when an invalid byte stream is + // finally parsed upon access. + // + // TODO(b/211906113): Enable validation on lazy fields. optional bool lazy = 5 [default = false]; + // unverified_lazy does no correctness checks on the byte stream. This should + // only be used where lazy with verification is prohibitive for performance + // reasons. + optional bool unverified_lazy = 15 [default = false]; + // Is this field deprecated? // Depending on the target platform, this can emit Deprecated annotations // for accessors, or it will be completely ignored; in the very least, this @@ -675,8 +685,8 @@ message UninterpretedOption { // The name of the uninterpreted option. Each string represents a segment in // a dot-separated name. is_extension is true iff a segment represents an // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". + // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + // "foo.(bar.baz).moo". message NamePart { required string name_part = 1; @@ -753,8 +763,8 @@ message SourceCodeInfo { // location. // // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: + // the root FileDescriptorProto to the place where the definition occurs. + // For example, this path: // [ 4, 3, 2, 7, 1 ] // refers to: // file.message_type(3) // 4, 3 @@ -808,13 +818,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. diff --git a/desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto b/desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto index 24159173..eb335d99 100644 --- a/desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto +++ b/desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto @@ -232,7 +232,6 @@ message FieldDescriptorProto { * For booleans, "true" or "false". * For strings, contains the default text contents (not escaped in any way). * For bytes, contains the C escaped value. All bytes >= 128 are escaped. - * TODO(kenton): Base-64 encode? */ optional string default_value = 7; @@ -399,6 +398,12 @@ message FieldOptions { * implementation must either *always* check its required fields, or *never* * check its required fields, regardless of whether or not the message has * been parsed. + * + * As of 2021, lazy does no correctness checks on the byte stream during + * parsing. This may lead to crashes if and when an invalid byte stream is + * finally parsed upon access. + * + * TODO(b/211906113): Enable validation on lazy fields. */ optional bool lazy = 5 [default = false]; @@ -420,6 +425,13 @@ message FieldOptions { /* For Google-internal migration only. Do not use. */ optional bool weak = 10 [default = false]; + /* + * unverified_lazy does no correctness checks on the byte stream. This should + * only be used where lazy with verification is prohibitive for performance + * reasons. + */ + optional bool unverified_lazy = 15 [default = false]; + /* The parser stores options it doesn't recognize here. See above. */ repeated UninterpretedOption uninterpreted_option = 999; @@ -961,8 +973,8 @@ message SourceCodeInfo { * location. * * Each element is a field number or an index. They form a path from - * the root FileDescriptorProto to the place where the definition. For - * example, this path: + * the root FileDescriptorProto to the place where the definition occurs. + * For example, this path: * [ 4, 3, 2, 7, 1 ] * refers to: * file.message_type(3) // 4, 3 @@ -1019,13 +1031,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. @@ -1078,8 +1090,8 @@ message UninterpretedOption { * The name of the uninterpreted option. Each string represents a segment in * a dot-separated name. is_extension is true iff a segment represents an * extension (denoted with parentheses in options specs in .proto files). - * E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - * "foo.(bar.baz).qux". + * E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + * "foo.(bar.baz).moo". */ message NamePart { required string name_part = 1; diff --git a/desc/protoprint/testfiles/descriptor-sorted.proto b/desc/protoprint/testfiles/descriptor-sorted.proto index ccd65cfd..6fa1f058 100644 --- a/desc/protoprint/testfiles/descriptor-sorted.proto +++ b/desc/protoprint/testfiles/descriptor-sorted.proto @@ -165,7 +165,6 @@ message FieldDescriptorProto { // For booleans, "true" or "false". // For strings, contains the default text contents (not escaped in any way). // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? optional string default_value = 7; optional FieldOptions options = 8; @@ -310,6 +309,12 @@ message FieldOptions { // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. + // + // As of 2021, lazy does no correctness checks on the byte stream during + // parsing. This may lead to crashes if and when an invalid byte stream is + // finally parsed upon access. + // + // TODO(b/211906113): Enable validation on lazy fields. optional bool lazy = 5 [default = false]; // The jstype option determines the JavaScript type used for values of the @@ -328,6 +333,11 @@ message FieldOptions { // For Google-internal migration only. Do not use. optional bool weak = 10 [default = false]; + // unverified_lazy does no correctness checks on the byte stream. This should + // only be used where lazy with verification is prohibitive for performance + // reasons. + optional bool unverified_lazy = 15 [default = false]; + // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -745,8 +755,8 @@ message SourceCodeInfo { // location. // // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: + // the root FileDescriptorProto to the place where the definition occurs. + // For example, this path: // [ 4, 3, 2, 7, 1 ] // refers to: // file.message_type(3) // 4, 3 @@ -800,13 +810,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2. @@ -854,8 +864,8 @@ message UninterpretedOption { // The name of the uninterpreted option. Each string represents a segment in // a dot-separated name. is_extension is true iff a segment represents an // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". + // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + // "foo.(bar.baz).moo". message NamePart { required string name_part = 1; diff --git a/desc/protoprint/testfiles/descriptor-trailing-on-next-line.proto b/desc/protoprint/testfiles/descriptor-trailing-on-next-line.proto index 1740a38e..808d687d 100644 --- a/desc/protoprint/testfiles/descriptor-trailing-on-next-line.proto +++ b/desc/protoprint/testfiles/descriptor-trailing-on-next-line.proto @@ -243,7 +243,6 @@ message FieldDescriptorProto { // For booleans, "true" or "false". // For strings, contains the default text contents (not escaped in any way). // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? optional string default_value = 7; // If set, gives the index of a oneof in the containing type's oneof_decl @@ -654,8 +653,19 @@ message FieldOptions { // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. + // + // As of 2021, lazy does no correctness checks on the byte stream during + // parsing. This may lead to crashes if and when an invalid byte stream is + // finally parsed upon access. + // + // TODO(b/211906113): Enable validation on lazy fields. optional bool lazy = 5 [default = false]; + // unverified_lazy does no correctness checks on the byte stream. This should + // only be used where lazy with verification is prohibitive for performance + // reasons. + optional bool unverified_lazy = 15 [default = false]; + // Is this field deprecated? // Depending on the target platform, this can emit Deprecated annotations // for accessors, or it will be completely ignored; in the very least, this @@ -773,8 +783,8 @@ message UninterpretedOption { // The name of the uninterpreted option. Each string represents a segment in // a dot-separated name. is_extension is true iff a segment represents an // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". + // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents + // "foo.(bar.baz).moo". message NamePart { required string name_part = 1; @@ -854,8 +864,8 @@ message SourceCodeInfo { // location. // // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: + // the root FileDescriptorProto to the place where the definition occurs. + // For example, this path: // [ 4, 3, 2, 7, 1 ] // refers to: // file.message_type(3) // 4, 3 @@ -909,13 +919,13 @@ message SourceCodeInfo { // // Comment attached to baz. // // Another line attached to baz. // - // // Comment attached to qux. + // // Comment attached to moo. // // - // // Another line attached to qux. - // optional double qux = 4; + // // Another line attached to moo. + // optional double moo = 4; // // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from + // // to moo or corge because there are blank lines separating it from // // both. // // // Detached comment for corge paragraph 2.