Skip to content

Commit 3465661

Browse files
zhangskzmkruskal-google
zhangskz
and
mkruskal-google
authored
Silence warnings about extra semicolon in non-TSAN builds. (#13820)
* Silence warnings about extra semicolon in non-TSAN builds. Fixes #13787 PiperOrigin-RevId: 561528198 * fix merge conflicts * Upgrade rules_python dependency. PiperOrigin-RevId: 559226153 * actually update staleness files --------- Co-authored-by: Mike Kruskal <[email protected]>
1 parent 398a84c commit 3465661

File tree

20 files changed

+179
-130
lines changed

20 files changed

+179
-130
lines changed

‎csharp/src/Google.Protobuf.Test/testprotos.pb‎

176 Bytes
Binary file not shown.

‎csharp/src/Google.Protobuf/Compiler/Plugin.pb.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,18 @@ static PluginReflection() {
3333
"LnByb3RvYnVmLkZpbGVEZXNjcmlwdG9yUHJvdG8SRQoXc291cmNlX2ZpbGVf",
3434
"ZGVzY3JpcHRvcnMYESADKAsyJC5nb29nbGUucHJvdG9idWYuRmlsZURlc2Ny",
3535
"aXB0b3JQcm90bxI7ChBjb21waWxlcl92ZXJzaW9uGAMgASgLMiEuZ29vZ2xl",
36-
"LnByb3RvYnVmLmNvbXBpbGVyLlZlcnNpb24iwQIKFUNvZGVHZW5lcmF0b3JS",
36+
"LnByb3RvYnVmLmNvbXBpbGVyLlZlcnNpb24i4AIKFUNvZGVHZW5lcmF0b3JS",
3737
"ZXNwb25zZRINCgVlcnJvchgBIAEoCRIaChJzdXBwb3J0ZWRfZmVhdHVyZXMY",
3838
"AiABKAQSQgoEZmlsZRgPIAMoCzI0Lmdvb2dsZS5wcm90b2J1Zi5jb21waWxl",
3939
"ci5Db2RlR2VuZXJhdG9yUmVzcG9uc2UuRmlsZRp/CgRGaWxlEgwKBG5hbWUY",
4040
"ASABKAkSFwoPaW5zZXJ0aW9uX3BvaW50GAIgASgJEg8KB2NvbnRlbnQYDyAB",
4141
"KAkSPwoTZ2VuZXJhdGVkX2NvZGVfaW5mbxgQIAEoCzIiLmdvb2dsZS5wcm90",
42-
"b2J1Zi5HZW5lcmF0ZWRDb2RlSW5mbyI4CgdGZWF0dXJlEhAKDEZFQVRVUkVf",
43-
"Tk9ORRAAEhsKF0ZFQVRVUkVfUFJPVE8zX09QVElPTkFMEAFCcgocY29tLmdv",
44-
"b2dsZS5wcm90b2J1Zi5jb21waWxlckIMUGx1Z2luUHJvdG9zWilnb29nbGUu",
45-
"Z29sYW5nLm9yZy9wcm90b2J1Zi90eXBlcy9wbHVnaW5wYqoCGEdvb2dsZS5Q",
46-
"cm90b2J1Zi5Db21waWxlcg=="));
42+
"b2J1Zi5HZW5lcmF0ZWRDb2RlSW5mbyJXCgdGZWF0dXJlEhAKDEZFQVRVUkVf",
43+
"Tk9ORRAAEhsKF0ZFQVRVUkVfUFJPVE8zX09QVElPTkFMEAESHQoZRkVBVFVS",
44+
"RV9TVVBQT1JUU19FRElUSU9OUxACQnIKHGNvbS5nb29nbGUucHJvdG9idWYu",
45+
"Y29tcGlsZXJCDFBsdWdpblByb3Rvc1opZ29vZ2xlLmdvbGFuZy5vcmcvcHJv",
46+
"dG9idWYvdHlwZXMvcGx1Z2lucGKqAhhHb29nbGUuUHJvdG9idWYuQ29tcGls",
47+
"ZXI="));
4748
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
4849
new pbr::FileDescriptor[] { global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor, },
4950
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -1100,6 +1101,7 @@ public static partial class Types {
11001101
public enum Feature {
11011102
[pbr::OriginalName("FEATURE_NONE")] None = 0,
11021103
[pbr::OriginalName("FEATURE_PROTO3_OPTIONAL")] Proto3Optional = 1,
1104+
[pbr::OriginalName("FEATURE_SUPPORTS_EDITIONS")] SupportsEditions = 2,
11031105
}
11041106

11051107
/// <summary>

‎csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs‎

Lines changed: 76 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ static DescriptorReflection() {
182182
"dGl2ZV9pbnRfdmFsdWUYBSABKAMSFAoMZG91YmxlX3ZhbHVlGAYgASgBEhQK",
183183
"DHN0cmluZ192YWx1ZRgHIAEoDBIXCg9hZ2dyZWdhdGVfdmFsdWUYCCABKAka",
184184
"MwoITmFtZVBhcnQSEQoJbmFtZV9wYXJ0GAEgAigJEhQKDGlzX2V4dGVuc2lv",
185-
"bhgCIAIoCCLxCAoKRmVhdHVyZVNldBJfCg5maWVsZF9wcmVzZW5jZRgBIAEo",
185+
"bhgCIAIoCCKqCQoKRmVhdHVyZVNldBJfCg5maWVsZF9wcmVzZW5jZRgBIAEo",
186186
"DjIpLmdvb2dsZS5wcm90b2J1Zi5GZWF0dXJlU2V0LkZpZWxkUHJlc2VuY2VC",
187187
"HIgBAZgBBJgBAaIBEAoEMjAyMxIIRVhQTElDSVQSUQoJZW51bV90eXBlGAIg",
188188
"ASgOMiQuZ29vZ2xlLnByb3RvYnVmLkZlYXR1cmVTZXQuRW51bVR5cGVCGIgB",
@@ -195,33 +195,34 @@ static DescriptorReflection() {
195195
"BSABKA4yKy5nb29nbGUucHJvdG9idWYuRmVhdHVyZVNldC5NZXNzYWdlRW5j",
196196
"b2RpbmdCI4gBAZgBBJgBAaIBFwoEMjAyMxIPTEVOR1RIX1BSRUZJWEVEElkK",
197197
"C2pzb25fZm9ybWF0GAYgASgOMiYuZ29vZ2xlLnByb3RvYnVmLkZlYXR1cmVT",
198-
"ZXQuSnNvbkZvcm1hdEIciAEBmAEDmAEGmAEBogENCgQyMDIzEgVBTExPVyJc",
199-
"Cg1GaWVsZFByZXNlbmNlEhoKFkZJRUxEX1BSRVNFTkNFX1VOS05PV04QABIM",
200-
"CghFWFBMSUNJVBABEgwKCElNUExJQ0lUEAISEwoPTEVHQUNZX1JFUVVJUkVE",
201-
"EAMiNwoIRW51bVR5cGUSFQoRRU5VTV9UWVBFX1VOS05PV04QABIICgRPUEVO",
202-
"EAESCgoGQ0xPU0VEEAIiVgoVUmVwZWF0ZWRGaWVsZEVuY29kaW5nEiMKH1JF",
203-
"UEVBVEVEX0ZJRUxEX0VOQ09ESU5HX1VOS05PV04QABIKCgZQQUNLRUQQARIM",
204-
"CghFWFBBTkRFRBACIl8KFVN0cmluZ0ZpZWxkVmFsaWRhdGlvbhIjCh9TVFJJ",
205-
"TkdfRklFTERfVkFMSURBVElPTl9VTktOT1dOEAASDQoJTUFOREFUT1JZEAES",
206-
"CAoESElOVBACEggKBE5PTkUQAyJTCg9NZXNzYWdlRW5jb2RpbmcSHAoYTUVT",
207-
"U0FHRV9FTkNPRElOR19VTktOT1dOEAASEwoPTEVOR1RIX1BSRUZJWEVEEAES",
208-
"DQoJREVMSU1JVEVEEAIiSAoKSnNvbkZvcm1hdBIXChNKU09OX0ZPUk1BVF9V",
209-
"TktOT1dOEAASCQoFQUxMT1cQARIWChJMRUdBQ1lfQkVTVF9FRkZPUlQQAioG",
210-
"COgHEOkHKgYI6QcQ6gcqBgiLThCQTiLVAQoOU291cmNlQ29kZUluZm8SOgoI",
211-
"bG9jYXRpb24YASADKAsyKC5nb29nbGUucHJvdG9idWYuU291cmNlQ29kZUlu",
212-
"Zm8uTG9jYXRpb24ahgEKCExvY2F0aW9uEhAKBHBhdGgYASADKAVCAhABEhAK",
213-
"BHNwYW4YAiADKAVCAhABEhgKEGxlYWRpbmdfY29tbWVudHMYAyABKAkSGQoR",
214-
"dHJhaWxpbmdfY29tbWVudHMYBCABKAkSIQoZbGVhZGluZ19kZXRhY2hlZF9j",
215-
"b21tZW50cxgGIAMoCSKcAgoRR2VuZXJhdGVkQ29kZUluZm8SQQoKYW5ub3Rh",
216-
"dGlvbhgBIAMoCzItLmdvb2dsZS5wcm90b2J1Zi5HZW5lcmF0ZWRDb2RlSW5m",
217-
"by5Bbm5vdGF0aW9uGsMBCgpBbm5vdGF0aW9uEhAKBHBhdGgYASADKAVCAhAB",
218-
"EhMKC3NvdXJjZV9maWxlGAIgASgJEg0KBWJlZ2luGAMgASgFEgsKA2VuZBgE",
219-
"IAEoBRJICghzZW1hbnRpYxgFIAEoDjI2Lmdvb2dsZS5wcm90b2J1Zi5HZW5l",
220-
"cmF0ZWRDb2RlSW5mby5Bbm5vdGF0aW9uLlNlbWFudGljIigKCFNlbWFudGlj",
221-
"EggKBE5PTkUQABIHCgNTRVQQARIJCgVBTElBUxACQn4KE2NvbS5nb29nbGUu",
222-
"cHJvdG9idWZCEERlc2NyaXB0b3JQcm90b3NIAVotZ29vZ2xlLmdvbGFuZy5v",
223-
"cmcvcHJvdG9idWYvdHlwZXMvZGVzY3JpcHRvcnBi+AEBogIDR1BCqgIaR29v",
224-
"Z2xlLlByb3RvYnVmLlJlZmxlY3Rpb24="));
198+
"ZXQuSnNvbkZvcm1hdEIciAEBmAEDmAEGmAEBogENCgQyMDIzEgVBTExPVxI3",
199+
"CgxyYXdfZmVhdHVyZXMY5wcgASgLMhsuZ29vZ2xlLnByb3RvYnVmLkZlYXR1",
200+
"cmVTZXRCA5gBACJcCg1GaWVsZFByZXNlbmNlEhoKFkZJRUxEX1BSRVNFTkNF",
201+
"X1VOS05PV04QABIMCghFWFBMSUNJVBABEgwKCElNUExJQ0lUEAISEwoPTEVH",
202+
"QUNZX1JFUVVJUkVEEAMiNwoIRW51bVR5cGUSFQoRRU5VTV9UWVBFX1VOS05P",
203+
"V04QABIICgRPUEVOEAESCgoGQ0xPU0VEEAIiVgoVUmVwZWF0ZWRGaWVsZEVu",
204+
"Y29kaW5nEiMKH1JFUEVBVEVEX0ZJRUxEX0VOQ09ESU5HX1VOS05PV04QABIK",
205+
"CgZQQUNLRUQQARIMCghFWFBBTkRFRBACIl8KFVN0cmluZ0ZpZWxkVmFsaWRh",
206+
"dGlvbhIjCh9TVFJJTkdfRklFTERfVkFMSURBVElPTl9VTktOT1dOEAASDQoJ",
207+
"TUFOREFUT1JZEAESCAoESElOVBACEggKBE5PTkUQAyJTCg9NZXNzYWdlRW5j",
208+
"b2RpbmcSHAoYTUVTU0FHRV9FTkNPRElOR19VTktOT1dOEAASEwoPTEVOR1RI",
209+
"X1BSRUZJWEVEEAESDQoJREVMSU1JVEVEEAIiSAoKSnNvbkZvcm1hdBIXChNK",
210+
"U09OX0ZPUk1BVF9VTktOT1dOEAASCQoFQUxMT1cQARIWChJMRUdBQ1lfQkVT",
211+
"VF9FRkZPUlQQAioGCOgHEOkHKgYI6QcQ6gcqBgiLThCQTiLVAQoOU291cmNl",
212+
"Q29kZUluZm8SOgoIbG9jYXRpb24YASADKAsyKC5nb29nbGUucHJvdG9idWYu",
213+
"U291cmNlQ29kZUluZm8uTG9jYXRpb24ahgEKCExvY2F0aW9uEhAKBHBhdGgY",
214+
"ASADKAVCAhABEhAKBHNwYW4YAiADKAVCAhABEhgKEGxlYWRpbmdfY29tbWVu",
215+
"dHMYAyABKAkSGQoRdHJhaWxpbmdfY29tbWVudHMYBCABKAkSIQoZbGVhZGlu",
216+
"Z19kZXRhY2hlZF9jb21tZW50cxgGIAMoCSKcAgoRR2VuZXJhdGVkQ29kZUlu",
217+
"Zm8SQQoKYW5ub3RhdGlvbhgBIAMoCzItLmdvb2dsZS5wcm90b2J1Zi5HZW5l",
218+
"cmF0ZWRDb2RlSW5mby5Bbm5vdGF0aW9uGsMBCgpBbm5vdGF0aW9uEhAKBHBh",
219+
"dGgYASADKAVCAhABEhMKC3NvdXJjZV9maWxlGAIgASgJEg0KBWJlZ2luGAMg",
220+
"ASgFEgsKA2VuZBgEIAEoBRJICghzZW1hbnRpYxgFIAEoDjI2Lmdvb2dsZS5w",
221+
"cm90b2J1Zi5HZW5lcmF0ZWRDb2RlSW5mby5Bbm5vdGF0aW9uLlNlbWFudGlj",
222+
"IigKCFNlbWFudGljEggKBE5PTkUQABIHCgNTRVQQARIJCgVBTElBUxACQn4K",
223+
"E2NvbS5nb29nbGUucHJvdG9idWZCEERlc2NyaXB0b3JQcm90b3NIAVotZ29v",
224+
"Z2xlLmdvbGFuZy5vcmcvcHJvdG9idWYvdHlwZXMvZGVzY3JpcHRvcnBi+AEB",
225+
"ogIDR1BCqgIaR29vZ2xlLlByb3RvYnVmLlJlZmxlY3Rpb24="));
225226
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
226227
new pbr::FileDescriptor[] { },
227228
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -245,7 +246,7 @@ static DescriptorReflection() {
245246
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.ServiceOptions), global::Google.Protobuf.Reflection.ServiceOptions.Parser, new[]{ "Features", "Deprecated", "UninterpretedOption" }, null, null, null, null),
246247
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MethodOptions), global::Google.Protobuf.Reflection.MethodOptions.Parser, new[]{ "Deprecated", "IdempotencyLevel", "Features", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.MethodOptions.Types.IdempotencyLevel) }, null, null),
247248
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.UninterpretedOption), global::Google.Protobuf.Reflection.UninterpretedOption.Parser, new[]{ "Name", "IdentifierValue", "PositiveIntValue", "NegativeIntValue", "DoubleValue", "StringValue", "AggregateValue" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart), global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart.Parser, new[]{ "NamePart_", "IsExtension" }, null, null, null, null)}),
248-
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FeatureSet), global::Google.Protobuf.Reflection.FeatureSet.Parser, new[]{ "FieldPresence", "EnumType", "RepeatedFieldEncoding", "StringFieldValidation", "MessageEncoding", "JsonFormat" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.FieldPresence), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.EnumType), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.RepeatedFieldEncoding), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.StringFieldValidation), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.MessageEncoding), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.JsonFormat) }, null, null),
249+
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FeatureSet), global::Google.Protobuf.Reflection.FeatureSet.Parser, new[]{ "FieldPresence", "EnumType", "RepeatedFieldEncoding", "StringFieldValidation", "MessageEncoding", "JsonFormat", "RawFeatures" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.FieldPresence), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.EnumType), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.RepeatedFieldEncoding), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.StringFieldValidation), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.MessageEncoding), typeof(global::Google.Protobuf.Reflection.FeatureSet.Types.JsonFormat) }, null, null),
249250
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo), global::Google.Protobuf.Reflection.SourceCodeInfo.Parser, new[]{ "Location" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location), global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location.Parser, new[]{ "Path", "Span", "LeadingComments", "TrailingComments", "LeadingDetachedComments" }, null, null, null, null)}),
250251
new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.GeneratedCodeInfo), global::Google.Protobuf.Reflection.GeneratedCodeInfo.Parser, new[]{ "Annotation" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation), global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation.Parser, new[]{ "Path", "SourceFile", "Begin", "End", "Semantic" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation.Types.Semantic) }, null, null)})
251252
}));
@@ -11673,6 +11674,7 @@ public FeatureSet(FeatureSet other) : this() {
1167311674
stringFieldValidation_ = other.stringFieldValidation_;
1167411675
messageEncoding_ = other.messageEncoding_;
1167511676
jsonFormat_ = other.jsonFormat_;
11677+
rawFeatures_ = other.rawFeatures_ != null ? other.rawFeatures_.Clone() : null;
1167611678
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
1167711679
_extensions = pb::ExtensionSet.Clone(other._extensions);
1167811680
}
@@ -11845,6 +11847,18 @@ public void ClearJsonFormat() {
1184511847
_hasBits0 &= ~32;
1184611848
}
1184711849

11850+
/// <summary>Field number for the "raw_features" field.</summary>
11851+
public const int RawFeaturesFieldNumber = 999;
11852+
private global::Google.Protobuf.Reflection.FeatureSet rawFeatures_;
11853+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
11854+
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
11855+
public global::Google.Protobuf.Reflection.FeatureSet RawFeatures {
11856+
get { return rawFeatures_; }
11857+
set {
11858+
rawFeatures_ = value;
11859+
}
11860+
}
11861+
1184811862
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
1184911863
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
1185011864
public override bool Equals(object other) {
@@ -11866,6 +11880,7 @@ public bool Equals(FeatureSet other) {
1186611880
if (StringFieldValidation != other.StringFieldValidation) return false;
1186711881
if (MessageEncoding != other.MessageEncoding) return false;
1186811882
if (JsonFormat != other.JsonFormat) return false;
11883+
if (!object.Equals(RawFeatures, other.RawFeatures)) return false;
1186911884
if (!Equals(_extensions, other._extensions)) {
1187011885
return false;
1187111886
}
@@ -11882,6 +11897,7 @@ public override int GetHashCode() {
1188211897
if (HasStringFieldValidation) hash ^= StringFieldValidation.GetHashCode();
1188311898
if (HasMessageEncoding) hash ^= MessageEncoding.GetHashCode();
1188411899
if (HasJsonFormat) hash ^= JsonFormat.GetHashCode();
11900+
if (rawFeatures_ != null) hash ^= RawFeatures.GetHashCode();
1188511901
if (_extensions != null) {
1188611902
hash ^= _extensions.GetHashCode();
1188711903
}
@@ -11927,6 +11943,10 @@ public void WriteTo(pb::CodedOutputStream output) {
1192711943
output.WriteRawTag(48);
1192811944
output.WriteEnum((int) JsonFormat);
1192911945
}
11946+
if (rawFeatures_ != null) {
11947+
output.WriteRawTag(186, 62);
11948+
output.WriteMessage(RawFeatures);
11949+
}
1193011950
if (_extensions != null) {
1193111951
_extensions.WriteTo(output);
1193211952
}
@@ -11964,6 +11984,10 @@ public void WriteTo(pb::CodedOutputStream output) {
1196411984
output.WriteRawTag(48);
1196511985
output.WriteEnum((int) JsonFormat);
1196611986
}
11987+
if (rawFeatures_ != null) {
11988+
output.WriteRawTag(186, 62);
11989+
output.WriteMessage(RawFeatures);
11990+
}
1196711991
if (_extensions != null) {
1196811992
_extensions.WriteTo(ref output);
1196911993
}
@@ -11995,6 +12019,9 @@ public int CalculateSize() {
1199512019
if (HasJsonFormat) {
1199612020
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) JsonFormat);
1199712021
}
12022+
if (rawFeatures_ != null) {
12023+
size += 2 + pb::CodedOutputStream.ComputeMessageSize(RawFeatures);
12024+
}
1199812025
if (_extensions != null) {
1199912026
size += _extensions.CalculateSize();
1200012027
}
@@ -12028,6 +12055,12 @@ public void MergeFrom(FeatureSet other) {
1202812055
if (other.HasJsonFormat) {
1202912056
JsonFormat = other.JsonFormat;
1203012057
}
12058+
if (other.rawFeatures_ != null) {
12059+
if (rawFeatures_ == null) {
12060+
RawFeatures = new global::Google.Protobuf.Reflection.FeatureSet();
12061+
}
12062+
RawFeatures.MergeFrom(other.RawFeatures);
12063+
}
1203112064
pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
1203212065
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
1203312066
}
@@ -12070,6 +12103,13 @@ public void MergeFrom(pb::CodedInputStream input) {
1207012103
JsonFormat = (global::Google.Protobuf.Reflection.FeatureSet.Types.JsonFormat) input.ReadEnum();
1207112104
break;
1207212105
}
12106+
case 7994: {
12107+
if (rawFeatures_ == null) {
12108+
RawFeatures = new global::Google.Protobuf.Reflection.FeatureSet();
12109+
}
12110+
input.ReadMessage(RawFeatures);
12111+
break;
12112+
}
1207312113
}
1207412114
}
1207512115
#endif
@@ -12111,6 +12151,13 @@ public void MergeFrom(pb::CodedInputStream input) {
1211112151
JsonFormat = (global::Google.Protobuf.Reflection.FeatureSet.Types.JsonFormat) input.ReadEnum();
1211212152
break;
1211312153
}
12154+
case 7994: {
12155+
if (rawFeatures_ == null) {
12156+
RawFeatures = new global::Google.Protobuf.Reflection.FeatureSet();
12157+
}
12158+
input.ReadMessage(RawFeatures);
12159+
break;
12160+
}
1211412161
}
1211512162
}
1211612163
}

‎protobuf_deps.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ def protobuf_deps():
102102
_github_archive(
103103
name = "rules_python",
104104
repo = "https://github.com/bazelbuild/rules_python",
105-
commit = "912a5051f51581784fd64094f6bdabf93f6d698f", # 0.14.0
106-
sha256 = "a3e4b4ade7c4a52e757b16a16e94d0b2640333062180cba577d81fac087a501d",
105+
commit = "02b521fce3c7b36b05813aa986d72777cc3ee328", # 0.24.0
106+
sha256 = "f9e4f6acf82449324d56669bda4bdb28b48688ad2990d8b39fa5b93ed39c9ad1",
107107
)
108108

109109
if not native.existing_rule("rules_ruby"):

‎src/google/protobuf/any.pb.h‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/google/protobuf/api.pb.h‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/google/protobuf/compiler/cpp/message.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1824,7 +1824,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
18241824
}
18251825

18261826
// For detecting when concurrent accessor calls cause races.
1827-
format("PROTOBUF_TSAN_DECLARE_MEMBER;\n");
1827+
format("PROTOBUF_TSAN_DECLARE_MEMBER\n");
18281828

18291829
format.Outdent();
18301830
format("};\n");

0 commit comments

Comments
 (0)