Internal change

PiperOrigin-RevId: 693516053

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

@@ -1,17 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-#endregion
-
-namespace Google.Protobuf.Reflection;
-
-internal sealed partial class FeatureSetDescriptor
-{
-    // Canonical serialized form of the edition defaults, generated by embed_edition_defaults.
-    private const string DefaultsBase64 =
-        "ChMYhAciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH";
-}

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

@@ -125,6 +125,7 @@ message TestConflictingSymbolNames {
   }
   message BadKnownNamesFieldsNoStandardDescriptor {
     option no_standard_descriptor_accessor = true;
+
     optional int32 descriptor = 3;
   }
   message BadKnownNamesTypes {
@@ -139,14 +140,14 @@ message TestConflictingSymbolNames {
     message Clear {}
     message IsInitialized {}
   }
-  message BadKnownNamesValues {  // NO_PROTO3
-    extensions 1 to 100;  // NO_PROTO3
-    extend BadKnownNamesValues {  // NO_PROTO3
-      optional int32 unknown_fields = 1;  // NO_PROTO3
+  message BadKnownNamesValues {                   // NO_PROTO3
+    extensions 1 to 100;                          // NO_PROTO3
+    extend BadKnownNamesValues {                  // NO_PROTO3
+      optional int32 unknown_fields = 1;          // NO_PROTO3
       optional int32 mutable_unknown_fields = 2;  // NO_PROTO3
-      optional int32 descriptor = 3;  // NO_PROTO3
-      optional int32 default_instance = 4;  // NO_PROTO3
-      optional int32 swap = 5;  // NO_PROTO3
+      optional int32 descriptor = 3;              // NO_PROTO3
+      optional int32 default_instance = 4;        // NO_PROTO3
+      optional int32 swap = 5;                    // NO_PROTO3
     }  // NO_PROTO3
   }  // NO_PROTO3
 
@@ -169,7 +170,8 @@ message TestConflictingSymbolNames {
   // For clashing local variables in Serialize and ByteSize calculation.
   optional string target = 38;
 
-  extensions 1000 to max [verification = UNVERIFIED];  // NO_PROTO3
+  extensions 1000 to max
+  [verification = UNVERIFIED];  // NO_PROTO3
 }
 
 // Special names as above, but at file scope.
@@ -185,11 +187,11 @@ message Clear {}
 message IsInitialized {}
 
 extend TestConflictingSymbolNames.BadKnownNamesValues {  // NO_PROTO3
-  optional int32 unknown_fields = 11;          // NO_PROTO3
-  optional int32 mutable_unknown_fields = 12;  // NO_PROTO3
-  optional int32 descriptor = 13;              // NO_PROTO3
-  optional int32 default_instance = 14;        // NO_PROTO3
-  optional int32 swap = 15;                    // NO_PROTO3
+  optional int32 unknown_fields = 11;                    // NO_PROTO3
+  optional int32 mutable_unknown_fields = 12;            // NO_PROTO3
+  optional int32 descriptor = 13;                        // NO_PROTO3
+  optional int32 default_instance = 14;                  // NO_PROTO3
+  optional int32 swap = 15;                              // NO_PROTO3
 }  // NO_PROTO3
 
 message TestConflictingSymbolNamesExtension {                      // NO_PROTO3

src/google/protobuf/only_one_enum_test.proto

@@ -12,4 +12,3 @@ enum OnlyOneEnum {
   ONLY_ONE_ENUM_DEFAULT = 0;
   ONLY_ONE_ENUM_VALID = 10;
 }
-

src/google/protobuf/unittest_proto3_arena_lite.proto

@@ -112,7 +112,7 @@ message TestAllTypes {
   repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
   repeated string repeated_cord = 55 [ctype = CORD];
 
-  repeated NestedMessage repeated_lazy_message = 57 ;
+  repeated NestedMessage repeated_lazy_message = 57;
 
   oneof oneof_field {
     uint32 oneof_uint32 = 111;

src/google/protobuf/unittest_proto3_lite.proto

@@ -111,7 +111,7 @@ message TestAllTypes {
   repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
   repeated string repeated_cord = 55 [ctype = CORD];
 
-  repeated NestedMessage repeated_lazy_message = 57 ;
+  repeated NestedMessage repeated_lazy_message = 57;
 
   oneof oneof_field {
     uint32 oneof_uint32 = 111;

src/google/protobuf/unittest_well_known_types.proto

@@ -9,10 +9,6 @@ syntax = "proto3";
 
 package protobuf_unittest;
 
-option csharp_namespace = "Google.Protobuf.TestProtos";
-option java_multiple_files = true;
-option java_package = "com.google.protobuf.test";
-
 import "google/protobuf/any.proto";
 import "google/protobuf/api.proto";
 import "google/protobuf/duration.proto";
@@ -24,6 +20,10 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/type.proto";
 import "google/protobuf/wrappers.proto";
 
+option csharp_namespace = "Google.Protobuf.TestProtos";
+option java_multiple_files = true;
+option java_package = "com.google.protobuf.test";
+
 // Test that we can include all well-known types.
 // Each wrapper type is included separately, as languages
 // map handle different wrappers in different ways.
@@ -100,22 +100,22 @@ message OneofWellKnownTypes {
 // need to worry about the value part of the map being the
 // well-known types, as messages can't be map keys.
 message MapWellKnownTypes {
-  map<int32,google.protobuf.Any> any_field = 1;
-  map<int32,google.protobuf.Api> api_field = 2;
-  map<int32,google.protobuf.Duration> duration_field = 3;
-  map<int32,google.protobuf.Empty> empty_field = 4;
-  map<int32,google.protobuf.FieldMask> field_mask_field = 5;
-  map<int32,google.protobuf.SourceContext> source_context_field = 6;
-  map<int32,google.protobuf.Struct> struct_field = 7;
-  map<int32,google.protobuf.Timestamp> timestamp_field = 8;
-  map<int32,google.protobuf.Type> type_field = 9;
-  map<int32,google.protobuf.DoubleValue> double_field = 10;
-  map<int32,google.protobuf.FloatValue> float_field = 11;
-  map<int32,google.protobuf.Int64Value> int64_field = 12;
-  map<int32,google.protobuf.UInt64Value> uint64_field = 13;
-  map<int32,google.protobuf.Int32Value> int32_field = 14;
-  map<int32,google.protobuf.UInt32Value> uint32_field = 15;
-  map<int32,google.protobuf.BoolValue> bool_field = 16;
-  map<int32,google.protobuf.StringValue> string_field = 17;
-  map<int32,google.protobuf.BytesValue> bytes_field = 18;
+  map<int32, google.protobuf.Any> any_field = 1;
+  map<int32, google.protobuf.Api> api_field = 2;
+  map<int32, google.protobuf.Duration> duration_field = 3;
+  map<int32, google.protobuf.Empty> empty_field = 4;
+  map<int32, google.protobuf.FieldMask> field_mask_field = 5;
+  map<int32, google.protobuf.SourceContext> source_context_field = 6;
+  map<int32, google.protobuf.Struct> struct_field = 7;
+  map<int32, google.protobuf.Timestamp> timestamp_field = 8;
+  map<int32, google.protobuf.Type> type_field = 9;
+  map<int32, google.protobuf.DoubleValue> double_field = 10;
+  map<int32, google.protobuf.FloatValue> float_field = 11;
+  map<int32, google.protobuf.Int64Value> int64_field = 12;
+  map<int32, google.protobuf.UInt64Value> uint64_field = 13;
+  map<int32, google.protobuf.Int32Value> int32_field = 14;
+  map<int32, google.protobuf.UInt32Value> uint32_field = 15;
+  map<int32, google.protobuf.BoolValue> bool_field = 16;
+  map<int32, google.protobuf.StringValue> string_field = 17;
+  map<int32, google.protobuf.BytesValue> bytes_field = 18;
 }