From 17726576c00d4509bc3552ec922de2399f6503fe Mon Sep 17 00:00:00 2001
From: zhangskz <sandyzhang@google.com>
Date: Mon, 16 Dec 2024 22:32:08 -0500
Subject: [PATCH] Automated rollback of commit
 23aada230b2478c7a07fe7612489eb8e79b9c379. (#19692)

PiperOrigin-RevId: 706827598

Co-authored-by: Protobuf Team Bot <protobuf-github-bot@google.com>
---
 src/google/protobuf/any.pb.h                  |  3 +-
 src/google/protobuf/api.pb.h                  |  9 +-
 src/google/protobuf/compiler/cpp/enum.cc      |  3 +-
 src/google/protobuf/compiler/cpp/message.cc   |  4 +-
 .../protobuf/compiler/java/java_features.pb.h |  3 +-
 src/google/protobuf/compiler/plugin.pb.h      | 12 +--
 src/google/protobuf/cpp_features.pb.h         |  3 +-
 src/google/protobuf/descriptor.pb.h           | 99 +++++++------------
 src/google/protobuf/duration.pb.h             |  3 +-
 src/google/protobuf/empty.pb.h                |  3 +-
 src/google/protobuf/field_mask.pb.h           |  3 +-
 src/google/protobuf/source_context.pb.h       |  3 +-
 src/google/protobuf/struct.pb.h               |  9 +-
 src/google/protobuf/timestamp.pb.h            |  3 +-
 src/google/protobuf/type.pb.h                 | 15 +--
 src/google/protobuf/unittest.proto            |  8 --
 src/google/protobuf/wrappers.pb.h             | 27 ++---
 17 files changed, 67 insertions(+), 143 deletions(-)

diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index fdf3c4bf0e12f..52b8a9c5af220 100644
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@@ -67,8 +67,7 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Any final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Any) */ {
  public:
   inline Any() : Any(nullptr) {}
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 51bd3e032b97d..31032dc7e0b09 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -75,8 +75,7 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Mixin final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Mixin) */ {
  public:
   inline Mixin() : Mixin(nullptr) {}
@@ -290,8 +289,7 @@ class PROTOBUF_EXPORT Mixin final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Method final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Method) */ {
  public:
   inline Method() : Method(nullptr) {}
@@ -578,8 +576,7 @@ class PROTOBUF_EXPORT Method final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Api final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Api) */ {
  public:
   inline Api() : Api(nullptr) {}
diff --git a/src/google/protobuf/compiler/cpp/enum.cc b/src/google/protobuf/compiler/cpp/enum.cc
index 969c657d7988b..ba56b4bb5af42 100644
--- a/src/google/protobuf/compiler/cpp/enum.cc
+++ b/src/google/protobuf/compiler/cpp/enum.cc
@@ -44,7 +44,6 @@ absl::flat_hash_map<absl::string_view, std::string> EnumVars(
     const EnumValueDescriptor* min, const EnumValueDescriptor* max) {
   auto classname = ClassName(enum_, false);
   return {
-      {"DEPRECATED", enum_->options().deprecated() ? "[[deprecated]]" : ""},
       {"Enum", std::string(enum_->name())},
       {"Enum_", ResolveKeyword(enum_->name())},
       {"Msg_Enum", classname},
@@ -163,7 +162,7 @@ void EnumGenerator::GenerateDefinition(io::Printer* p) {
            }},
       },
       R"cc(
-        enum $DEPRECATED $$Msg_Enum_annotated$ : int {
+        enum $Msg_Enum_annotated$ : int {
           $values$,
           $open_enum_sentinels$,
         };
diff --git a/src/google/protobuf/compiler/cpp/message.cc b/src/google/protobuf/compiler/cpp/message.cc
index 10604f44de324..874b7212b17a4 100644
--- a/src/google/protobuf/compiler/cpp/message.cc
+++ b/src/google/protobuf/compiler/cpp/message.cc
@@ -502,7 +502,6 @@ std::vector<Sub> ClassVars(const Descriptor* desc, Options opts) {
       {"Msg", ClassName(desc, false)},
       {"pkg::Msg", QualifiedClassName(desc, opts)},
       {"pkg.Msg", desc->full_name()},
-      {"deprecated", desc->options().deprecated() ? "[[deprecated]]" : ""},
 
       // Old-style names, to be removed once all usages are gone in this and
       // other files.
@@ -2058,8 +2057,7 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
                   )cc");
         }}},
       R"cc(
-        class $dllexport_decl $$deprecated $$classname$ final
-            : public $superclass$
+        class $dllexport_decl $$classname$ final : public $superclass$
         /* @@protoc_insertion_point(class_definition:$full_name$) */ {
          public:
           inline $classname$() : $classname$(nullptr) {}
diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h
index 4200bc454b5c8..5c59062db579b 100644
--- a/src/google/protobuf/compiler/java/java_features.pb.h
+++ b/src/google/protobuf/compiler/java/java_features.pb.h
@@ -100,8 +100,7 @@ inline bool JavaFeatures_Utf8Validation_Parse(absl::string_view name, JavaFeatur
 
 // -------------------------------------------------------------------
 
-class PROTOC_EXPORT JavaFeatures final
-    : public ::google::protobuf::Message
+class PROTOC_EXPORT JavaFeatures final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:pb.JavaFeatures) */ {
  public:
   inline JavaFeatures() : JavaFeatures(nullptr) {}
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
index 1fecfd65ec8e3..c5e96a9d2d124 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -117,8 +117,7 @@ inline bool CodeGeneratorResponse_Feature_Parse(absl::string_view name, CodeGene
 
 // -------------------------------------------------------------------
 
-class PROTOC_EXPORT Version final
-    : public ::google::protobuf::Message
+class PROTOC_EXPORT Version final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.compiler.Version) */ {
  public:
   inline Version() : Version(nullptr) {}
@@ -355,8 +354,7 @@ class PROTOC_EXPORT Version final
 };
 // -------------------------------------------------------------------
 
-class PROTOC_EXPORT CodeGeneratorResponse_File final
-    : public ::google::protobuf::Message
+class PROTOC_EXPORT CodeGeneratorResponse_File final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.compiler.CodeGeneratorResponse.File) */ {
  public:
   inline CodeGeneratorResponse_File() : CodeGeneratorResponse_File(nullptr) {}
@@ -609,8 +607,7 @@ class PROTOC_EXPORT CodeGeneratorResponse_File final
 };
 // -------------------------------------------------------------------
 
-class PROTOC_EXPORT CodeGeneratorResponse final
-    : public ::google::protobuf::Message
+class PROTOC_EXPORT CodeGeneratorResponse final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.compiler.CodeGeneratorResponse) */ {
  public:
   inline CodeGeneratorResponse() : CodeGeneratorResponse(nullptr) {}
@@ -887,8 +884,7 @@ class PROTOC_EXPORT CodeGeneratorResponse final
 };
 // -------------------------------------------------------------------
 
-class PROTOC_EXPORT CodeGeneratorRequest final
-    : public ::google::protobuf::Message
+class PROTOC_EXPORT CodeGeneratorRequest final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.compiler.CodeGeneratorRequest) */ {
  public:
   inline CodeGeneratorRequest() : CodeGeneratorRequest(nullptr) {}
diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h
index 7d93be70a611a..85f23312beccf 100644
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@@ -101,8 +101,7 @@ inline bool CppFeatures_StringType_Parse(absl::string_view name, CppFeatures_Str
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT CppFeatures final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT CppFeatures final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:pb.CppFeatures) */ {
  public:
   inline CppFeatures() : CppFeatures(nullptr) {}
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index 79dc2d6a2358e..ee33ad3d1f9e1 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -703,8 +703,7 @@ inline bool Edition_Parse(absl::string_view name, Edition* value) {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT UninterpretedOption_NamePart final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT UninterpretedOption_NamePart final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.UninterpretedOption.NamePart) */ {
  public:
   inline UninterpretedOption_NamePart() : UninterpretedOption_NamePart(nullptr) {}
@@ -920,8 +919,7 @@ class PROTOBUF_EXPORT UninterpretedOption_NamePart final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT SourceCodeInfo_Location final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT SourceCodeInfo_Location final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.SourceCodeInfo.Location) */ {
  public:
   inline SourceCodeInfo_Location() : SourceCodeInfo_Location(nullptr) {}
@@ -1204,8 +1202,7 @@ class PROTOBUF_EXPORT SourceCodeInfo_Location final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.GeneratedCodeInfo.Annotation) */ {
  public:
   inline GeneratedCodeInfo_Annotation() : GeneratedCodeInfo_Annotation(nullptr) {}
@@ -1483,8 +1480,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FieldOptions_FeatureSupport final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FieldOptions_FeatureSupport final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FieldOptions.FeatureSupport) */ {
  public:
   inline FieldOptions_FeatureSupport() : FieldOptions_FeatureSupport(nullptr) {}
@@ -1721,8 +1717,7 @@ class PROTOBUF_EXPORT FieldOptions_FeatureSupport final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FieldOptions_EditionDefault final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FieldOptions_EditionDefault final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FieldOptions.EditionDefault) */ {
  public:
   inline FieldOptions_EditionDefault() : FieldOptions_EditionDefault(nullptr) {}
@@ -1933,8 +1928,7 @@ class PROTOBUF_EXPORT FieldOptions_EditionDefault final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FeatureSet final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FeatureSet final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FeatureSet) */ {
  public:
   inline FeatureSet() : FeatureSet(nullptr) {}
@@ -2497,8 +2491,7 @@ class PROTOBUF_EXPORT FeatureSet final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.ExtensionRangeOptions.Declaration) */ {
  public:
   inline ExtensionRangeOptions_Declaration() : ExtensionRangeOptions_Declaration(nullptr) {}
@@ -2754,8 +2747,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions_Declaration final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.EnumDescriptorProto.EnumReservedRange) */ {
  public:
   inline EnumDescriptorProto_EnumReservedRange() : EnumDescriptorProto_EnumReservedRange(nullptr) {}
@@ -2960,8 +2952,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT DescriptorProto_ReservedRange final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT DescriptorProto_ReservedRange final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto.ReservedRange) */ {
  public:
   inline DescriptorProto_ReservedRange() : DescriptorProto_ReservedRange(nullptr) {}
@@ -3166,8 +3157,7 @@ class PROTOBUF_EXPORT DescriptorProto_ReservedRange final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT UninterpretedOption final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT UninterpretedOption final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.UninterpretedOption) */ {
  public:
   inline UninterpretedOption() : UninterpretedOption(nullptr) {}
@@ -3467,8 +3457,7 @@ class PROTOBUF_EXPORT UninterpretedOption final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT SourceCodeInfo final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT SourceCodeInfo final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.SourceCodeInfo) */ {
  public:
   inline SourceCodeInfo() : SourceCodeInfo(nullptr) {}
@@ -3851,8 +3840,7 @@ class PROTOBUF_EXPORT SourceCodeInfo final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT GeneratedCodeInfo final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT GeneratedCodeInfo final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.GeneratedCodeInfo) */ {
  public:
   inline GeneratedCodeInfo() : GeneratedCodeInfo(nullptr) {}
@@ -4050,8 +4038,7 @@ class PROTOBUF_EXPORT GeneratedCodeInfo final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault) */ {
  public:
   inline FeatureSetDefaults_FeatureSetEditionDefault() : FeatureSetDefaults_FeatureSetEditionDefault(nullptr) {}
@@ -4282,8 +4269,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults_FeatureSetEditionDefault final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT ServiceOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT ServiceOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.ServiceOptions) */ {
  public:
   inline ServiceOptions() : ServiceOptions(nullptr) {}
@@ -4696,8 +4682,7 @@ class PROTOBUF_EXPORT ServiceOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT OneofOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT OneofOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.OneofOptions) */ {
  public:
   inline OneofOptions() : OneofOptions(nullptr) {}
@@ -5097,8 +5082,7 @@ class PROTOBUF_EXPORT OneofOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT MethodOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT MethodOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.MethodOptions) */ {
  public:
   inline MethodOptions() : MethodOptions(nullptr) {}
@@ -5544,8 +5528,7 @@ class PROTOBUF_EXPORT MethodOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT MessageOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT MessageOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.MessageOptions) */ {
  public:
   inline MessageOptions() : MessageOptions(nullptr) {}
@@ -6010,8 +5993,7 @@ class PROTOBUF_EXPORT MessageOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FileOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FileOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FileOptions) */ {
  public:
   inline FileOptions() : FileOptions(nullptr) {}
@@ -6738,8 +6720,7 @@ class PROTOBUF_EXPORT FileOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FieldOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FieldOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FieldOptions) */ {
  public:
   inline FieldOptions() : FieldOptions(nullptr) {}
@@ -7402,8 +7383,7 @@ class PROTOBUF_EXPORT FieldOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FeatureSetDefaults final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FeatureSetDefaults final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FeatureSetDefaults) */ {
  public:
   inline FeatureSetDefaults() : FeatureSetDefaults(nullptr) {}
@@ -7633,8 +7613,7 @@ class PROTOBUF_EXPORT FeatureSetDefaults final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT ExtensionRangeOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.ExtensionRangeOptions) */ {
  public:
   inline ExtensionRangeOptions() : ExtensionRangeOptions(nullptr) {}
@@ -8086,8 +8065,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT EnumValueOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT EnumValueOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValueOptions) */ {
  public:
   inline EnumValueOptions() : EnumValueOptions(nullptr) {}
@@ -8530,8 +8508,7 @@ class PROTOBUF_EXPORT EnumValueOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT EnumOptions final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT EnumOptions final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.EnumOptions) */ {
  public:
   inline EnumOptions() : EnumOptions(nullptr) {}
@@ -8970,8 +8947,7 @@ class PROTOBUF_EXPORT EnumOptions final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT OneofDescriptorProto final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT OneofDescriptorProto final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.OneofDescriptorProto) */ {
  public:
   inline OneofDescriptorProto() : OneofDescriptorProto(nullptr) {}
@@ -9191,8 +9167,7 @@ class PROTOBUF_EXPORT OneofDescriptorProto final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT MethodDescriptorProto final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT MethodDescriptorProto final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.MethodDescriptorProto) */ {
  public:
   inline MethodDescriptorProto() : MethodDescriptorProto(nullptr) {}
@@ -9476,8 +9451,7 @@ class PROTOBUF_EXPORT MethodDescriptorProto final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FieldDescriptorProto final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FieldDescriptorProto final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FieldDescriptorProto) */ {
  public:
   inline FieldDescriptorProto() : FieldDescriptorProto(nullptr) {}
@@ -9893,8 +9867,7 @@ class PROTOBUF_EXPORT FieldDescriptorProto final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT EnumValueDescriptorProto final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT EnumValueDescriptorProto final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValueDescriptorProto) */ {
  public:
   inline EnumValueDescriptorProto() : EnumValueDescriptorProto(nullptr) {}
@@ -10127,8 +10100,7 @@ class PROTOBUF_EXPORT EnumValueDescriptorProto final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto.ExtensionRange) */ {
  public:
   inline DescriptorProto_ExtensionRange() : DescriptorProto_ExtensionRange(nullptr) {}
@@ -10355,8 +10327,7 @@ class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT ServiceDescriptorProto final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT ServiceDescriptorProto final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.ServiceDescriptorProto) */ {
  public:
   inline ServiceDescriptorProto() : ServiceDescriptorProto(nullptr) {}
@@ -10595,8 +10566,7 @@ class PROTOBUF_EXPORT ServiceDescriptorProto final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT EnumDescriptorProto final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT EnumDescriptorProto final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.EnumDescriptorProto) */ {
  public:
   inline EnumDescriptorProto() : EnumDescriptorProto(nullptr) {}
@@ -10879,8 +10849,7 @@ class PROTOBUF_EXPORT EnumDescriptorProto final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT DescriptorProto final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT DescriptorProto final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto) */ {
  public:
   inline DescriptorProto() : DescriptorProto(nullptr) {}
@@ -11259,8 +11228,7 @@ class PROTOBUF_EXPORT DescriptorProto final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FileDescriptorProto final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FileDescriptorProto final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FileDescriptorProto) */ {
  public:
   inline FileDescriptorProto() : FileDescriptorProto(nullptr) {}
@@ -11688,8 +11656,7 @@ class PROTOBUF_EXPORT FileDescriptorProto final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FileDescriptorSet final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FileDescriptorSet final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FileDescriptorSet) */ {
  public:
   inline FileDescriptorSet() : FileDescriptorSet(nullptr) {}
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index e882a5cf83318..077730f2485fd 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -67,8 +67,7 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Duration final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Duration) */ {
  public:
   inline Duration() : Duration(nullptr) {}
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index 2210949ce57bd..072f4a963fbc0 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@@ -68,8 +68,7 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Empty final
-    : public ::google::protobuf::internal::ZeroFieldsBase
+class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFieldsBase
 /* @@protoc_insertion_point(class_definition:google.protobuf.Empty) */ {
  public:
   inline Empty() : Empty(nullptr) {}
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index 806b5037b35a7..1154ad3b63354 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -67,8 +67,7 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FieldMask final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FieldMask) */ {
  public:
   inline FieldMask() : FieldMask(nullptr) {}
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
index 7c2c02818f988..d2758fa5dff71 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@@ -67,8 +67,7 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT SourceContext final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.SourceContext) */ {
  public:
   inline SourceContext() : SourceContext(nullptr) {}
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 61dcb479fdae4..0fda4da7a67e0 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -112,8 +112,7 @@ inline bool NullValue_Parse(absl::string_view name, NullValue* value) {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT ListValue final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.ListValue) */ {
  public:
   inline ListValue() : ListValue(nullptr) {}
@@ -310,8 +309,7 @@ class PROTOBUF_EXPORT ListValue final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Struct final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Struct) */ {
  public:
   inline Struct() : Struct(nullptr) {}
@@ -548,8 +546,7 @@ class Struct_FieldsEntry_DoNotUse final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Value final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Value) */ {
  public:
   inline Value() : Value(nullptr) {}
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index 3ea6aebf646bf..12fecf20ce106 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -67,8 +67,7 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Timestamp final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Timestamp) */ {
  public:
   inline Timestamp() : Timestamp(nullptr) {}
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 08f75a09757f7..19ea165158cea 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -201,8 +201,7 @@ inline bool Syntax_Parse(absl::string_view name, Syntax* value) {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Option final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Option) */ {
  public:
   inline Option() : Option(nullptr) {}
@@ -416,8 +415,7 @@ class PROTOBUF_EXPORT Option final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Field final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Field final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Field) */ {
  public:
   inline Field() : Field(nullptr) {}
@@ -803,8 +801,7 @@ class PROTOBUF_EXPORT Field final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT EnumValue final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT EnumValue final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValue) */ {
  public:
   inline EnumValue() : EnumValue(nullptr) {}
@@ -1031,8 +1028,7 @@ class PROTOBUF_EXPORT EnumValue final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Type final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Type final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Type) */ {
  public:
   inline Type() : Type(nullptr) {}
@@ -1338,8 +1334,7 @@ class PROTOBUF_EXPORT Type final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Enum final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Enum final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Enum) */ {
  public:
   inline Enum() : Enum(nullptr) {}
diff --git a/src/google/protobuf/unittest.proto b/src/google/protobuf/unittest.proto
index 14cf08e0961ce..a1734fc052269 100644
--- a/src/google/protobuf/unittest.proto
+++ b/src/google/protobuf/unittest.proto
@@ -309,14 +309,6 @@ enum ForeignEnum {
   FOREIGN_LARGE = 123456; // Large enough to escape the Boxed Integer cache.
 }
 
-enum TestDeprecatedEnum {
-  option deprecated = true;
-
-  TEST_DEPRECATED_ENUM_UNSPECIFIED = 0;
-  TEST_DEPRECATED_ENUM_VALUE1 = 1;
-  TEST_DEPRECATED_ENUM_VALUE2 = 2;
-}
-
 message TestReservedFields {
   reserved 2, 15, 9 to 11;
 
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index 94356bda3dc97..a147edce5ce30 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -91,8 +91,7 @@ namespace protobuf {
 
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT UInt64Value final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT UInt64Value final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.UInt64Value) */ {
  public:
   inline UInt64Value() : UInt64Value(nullptr) {}
@@ -282,8 +281,7 @@ class PROTOBUF_EXPORT UInt64Value final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT UInt32Value final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT UInt32Value final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.UInt32Value) */ {
  public:
   inline UInt32Value() : UInt32Value(nullptr) {}
@@ -473,8 +471,7 @@ class PROTOBUF_EXPORT UInt32Value final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT StringValue final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT StringValue final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.StringValue) */ {
  public:
   inline StringValue() : StringValue(nullptr) {}
@@ -670,8 +667,7 @@ class PROTOBUF_EXPORT StringValue final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Int64Value final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Int64Value final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Int64Value) */ {
  public:
   inline Int64Value() : Int64Value(nullptr) {}
@@ -861,8 +857,7 @@ class PROTOBUF_EXPORT Int64Value final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT Int32Value final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT Int32Value final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.Int32Value) */ {
  public:
   inline Int32Value() : Int32Value(nullptr) {}
@@ -1052,8 +1047,7 @@ class PROTOBUF_EXPORT Int32Value final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT FloatValue final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT FloatValue final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.FloatValue) */ {
  public:
   inline FloatValue() : FloatValue(nullptr) {}
@@ -1243,8 +1237,7 @@ class PROTOBUF_EXPORT FloatValue final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT DoubleValue final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT DoubleValue final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.DoubleValue) */ {
  public:
   inline DoubleValue() : DoubleValue(nullptr) {}
@@ -1434,8 +1427,7 @@ class PROTOBUF_EXPORT DoubleValue final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT BytesValue final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT BytesValue final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.BytesValue) */ {
  public:
   inline BytesValue() : BytesValue(nullptr) {}
@@ -1631,8 +1623,7 @@ class PROTOBUF_EXPORT BytesValue final
 };
 // -------------------------------------------------------------------
 
-class PROTOBUF_EXPORT BoolValue final
-    : public ::google::protobuf::Message
+class PROTOBUF_EXPORT BoolValue final : public ::google::protobuf::Message
 /* @@protoc_insertion_point(class_definition:google.protobuf.BoolValue) */ {
  public:
   inline BoolValue() : BoolValue(nullptr) {}