diff --git a/protobuf/src/descriptor.rs b/protobuf/src/descriptor.rs
index 9aafb2f6c..afe8912a3 100644
--- a/protobuf/src/descriptor.rs
+++ b/protobuf/src/descriptor.rs
@@ -23,8 +23,8 @@
 
 ///  The protocol compiler can output a FileDescriptorSet containing the .proto
 ///  files it parses.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.FileDescriptorSet)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct FileDescriptorSet {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.FileDescriptorSet.file)
@@ -152,8 +152,8 @@ impl crate::reflect::ProtobufValue for FileDescriptorSet {
 }
 
 ///  Describes a complete .proto file.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.FileDescriptorProto)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct FileDescriptorProto {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.FileDescriptorProto.name)
@@ -634,8 +634,8 @@ impl crate::reflect::ProtobufValue for FileDescriptorProto {
 }
 
 ///  Describes a message type.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.DescriptorProto)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct DescriptorProto {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.DescriptorProto.name)
@@ -1006,8 +1006,8 @@ impl crate::reflect::ProtobufValue for DescriptorProto {
 
 /// Nested message and enums of message `DescriptorProto`
 pub mod descriptor_proto {
-    #[derive(PartialEq,Clone,Default,Debug)]
     // @@protoc_insertion_point(message:google.protobuf.DescriptorProto.ExtensionRange)
+    #[derive(PartialEq,Clone,Default,Debug)]
     pub struct ExtensionRange {
         // message fields
         // @@protoc_insertion_point(field:google.protobuf.DescriptorProto.ExtensionRange.start)
@@ -1211,8 +1211,8 @@ pub mod descriptor_proto {
     ///  Range of reserved tag numbers. Reserved tag numbers may not be used by
     ///  fields or extension ranges in the same message. Reserved ranges may
     ///  not overlap.
-    #[derive(PartialEq,Clone,Default,Debug)]
     // @@protoc_insertion_point(message:google.protobuf.DescriptorProto.ReservedRange)
+    #[derive(PartialEq,Clone,Default,Debug)]
     pub struct ReservedRange {
         // message fields
         // @@protoc_insertion_point(field:google.protobuf.DescriptorProto.ReservedRange.start)
@@ -1390,8 +1390,8 @@ pub mod descriptor_proto {
     }
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.ExtensionRangeOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct ExtensionRangeOptions {
     // message fields
     ///  The parser stores options it doesn't recognize here. See above.
@@ -1520,8 +1520,8 @@ impl crate::reflect::ProtobufValue for ExtensionRangeOptions {
 }
 
 ///  Describes a field within a message.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.FieldDescriptorProto)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct FieldDescriptorProto {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.FieldDescriptorProto.name)
@@ -2388,8 +2388,8 @@ pub mod field_descriptor_proto {
 }
 
 ///  Describes a oneof.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.OneofDescriptorProto)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct OneofDescriptorProto {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.OneofDescriptorProto.name)
@@ -2571,8 +2571,8 @@ impl crate::reflect::ProtobufValue for OneofDescriptorProto {
 }
 
 ///  Describes an enum type.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.EnumDescriptorProto)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct EnumDescriptorProto {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.EnumDescriptorProto.name)
@@ -2832,8 +2832,8 @@ pub mod enum_descriptor_proto {
     ///  Note that this is distinct from DescriptorProto.ReservedRange in that it
     ///  is inclusive such that it can appropriately represent the entire int32
     ///  domain.
-    #[derive(PartialEq,Clone,Default,Debug)]
     // @@protoc_insertion_point(message:google.protobuf.EnumDescriptorProto.EnumReservedRange)
+    #[derive(PartialEq,Clone,Default,Debug)]
     pub struct EnumReservedRange {
         // message fields
         // @@protoc_insertion_point(field:google.protobuf.EnumDescriptorProto.EnumReservedRange.start)
@@ -3012,8 +3012,8 @@ pub mod enum_descriptor_proto {
 }
 
 ///  Describes a value within an enum.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.EnumValueDescriptorProto)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct EnumValueDescriptorProto {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.EnumValueDescriptorProto.name)
@@ -3232,8 +3232,8 @@ impl crate::reflect::ProtobufValue for EnumValueDescriptorProto {
 }
 
 ///  Describes a service.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.ServiceDescriptorProto)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct ServiceDescriptorProto {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.ServiceDescriptorProto.name)
@@ -3439,8 +3439,8 @@ impl crate::reflect::ProtobufValue for ServiceDescriptorProto {
 }
 
 ///  Describes a method of a service.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.MethodDescriptorProto)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct MethodDescriptorProto {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.MethodDescriptorProto.name)
@@ -3807,8 +3807,8 @@ impl crate::reflect::ProtobufValue for MethodDescriptorProto {
     type RuntimeType = crate::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.FileOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct FileOptions {
     // message fields
     ///  Sets the Java package where classes generated from this .proto will be
@@ -4987,8 +4987,8 @@ pub mod file_options {
     }
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.MessageOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct MessageOptions {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.MessageOptions.message_set_wire_format)
@@ -5271,8 +5271,8 @@ impl crate::reflect::ProtobufValue for MessageOptions {
     type RuntimeType = crate::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.FieldOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct FieldOptions {
     // message fields
     ///  The ctype option instructs the C++ code generator to use a different
@@ -5818,8 +5818,8 @@ pub mod field_options {
     }
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.OneofOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct OneofOptions {
     // message fields
     ///  The parser stores options it doesn't recognize here. See above.
@@ -5947,8 +5947,8 @@ impl crate::reflect::ProtobufValue for OneofOptions {
     type RuntimeType = crate::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.EnumOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct EnumOptions {
     // message fields
     ///  Set this option to true to allow mapping different tag names to the same
@@ -6156,8 +6156,8 @@ impl crate::reflect::ProtobufValue for EnumOptions {
     type RuntimeType = crate::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.EnumValueOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct EnumValueOptions {
     // message fields
     ///  Is this enum value deprecated?
@@ -6326,8 +6326,8 @@ impl crate::reflect::ProtobufValue for EnumValueOptions {
     type RuntimeType = crate::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.ServiceOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct ServiceOptions {
     // message fields
     ///  Is this service deprecated?
@@ -6496,8 +6496,8 @@ impl crate::reflect::ProtobufValue for ServiceOptions {
     type RuntimeType = crate::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.MethodOptions)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct MethodOptions {
     // message fields
     ///  Is this method deprecated?
@@ -6785,8 +6785,8 @@ pub mod method_options {
 ///  options protos in descriptor objects (e.g. returned by Descriptor::options(),
 ///  or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
 ///  in them.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.UninterpretedOption)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct UninterpretedOption {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.UninterpretedOption.name)
@@ -7195,8 +7195,8 @@ pub mod uninterpreted_option {
     ///  extension (denoted with parentheses in options specs in .proto files).
     ///  E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
     ///  "foo.(bar.baz).qux".
-    #[derive(PartialEq,Clone,Default,Debug)]
     // @@protoc_insertion_point(message:google.protobuf.UninterpretedOption.NamePart)
+    #[derive(PartialEq,Clone,Default,Debug)]
     pub struct NamePart {
         // message fields
         // @@protoc_insertion_point(field:google.protobuf.UninterpretedOption.NamePart.name_part)
@@ -7399,8 +7399,8 @@ pub mod uninterpreted_option {
 
 ///  Encapsulates information about the original source file from which a
 ///  FileDescriptorProto was generated.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.SourceCodeInfo)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct SourceCodeInfo {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.SourceCodeInfo.location)
@@ -7524,8 +7524,8 @@ impl crate::reflect::ProtobufValue for SourceCodeInfo {
 
 /// Nested message and enums of message `SourceCodeInfo`
 pub mod source_code_info {
-    #[derive(PartialEq,Clone,Default,Debug)]
     // @@protoc_insertion_point(message:google.protobuf.SourceCodeInfo.Location)
+    #[derive(PartialEq,Clone,Default,Debug)]
     pub struct Location {
         // message fields
         // @@protoc_insertion_point(field:google.protobuf.SourceCodeInfo.Location.path)
@@ -7797,8 +7797,8 @@ pub mod source_code_info {
 ///  Describes the relationship between generated code and its original source
 ///  file. A GeneratedCodeInfo message is associated with only one generated
 ///  source file, but may contain references to different source .proto files.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.GeneratedCodeInfo)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct GeneratedCodeInfo {
     // message fields
     ///  An Annotation connects some span of text in generated code to an element
@@ -7924,8 +7924,8 @@ impl crate::reflect::ProtobufValue for GeneratedCodeInfo {
 
 /// Nested message and enums of message `GeneratedCodeInfo`
 pub mod generated_code_info {
-    #[derive(PartialEq,Clone,Default,Debug)]
     // @@protoc_insertion_point(message:google.protobuf.GeneratedCodeInfo.Annotation)
+    #[derive(PartialEq,Clone,Default,Debug)]
     pub struct Annotation {
         // message fields
         ///  Identifies the element in the original source .proto file. This field
diff --git a/protobuf/src/doctest_pb.rs b/protobuf/src/doctest_pb.rs
index cf2809df6..ec476bcf0 100644
--- a/protobuf/src/doctest_pb.rs
+++ b/protobuf/src/doctest_pb.rs
@@ -21,8 +21,8 @@
 
 //! Generated file from `doctest_pb.proto`
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:MyMessage)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct MyMessage {
     // special fields
     // @@protoc_insertion_point(special_field:MyMessage.special_fields)
diff --git a/protobuf/src/plugin.rs b/protobuf/src/plugin.rs
index 4a791467d..02ef0a9d2 100644
--- a/protobuf/src/plugin.rs
+++ b/protobuf/src/plugin.rs
@@ -22,8 +22,8 @@
 //! Generated file from `google/protobuf/compiler/plugin.proto`
 
 ///  The version number of protocol compiler.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.compiler.Version)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Version {
     // message fields
     // @@protoc_insertion_point(field:google.protobuf.compiler.Version.major)
@@ -294,8 +294,8 @@ impl crate::reflect::ProtobufValue for Version {
 }
 
 ///  An encoded CodeGeneratorRequest is written to the plugin's stdin.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.compiler.CodeGeneratorRequest)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct CodeGeneratorRequest {
     // message fields
     ///  The .proto files that were explicitly listed on the command-line.  The
@@ -538,8 +538,8 @@ impl crate::reflect::ProtobufValue for CodeGeneratorRequest {
 }
 
 ///  The plugin writes an encoded CodeGeneratorResponse to stdout.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.compiler.CodeGeneratorResponse)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct CodeGeneratorResponse {
     // message fields
     ///  Error message.  If non-empty, code generation failed.  The plugin process
@@ -765,8 +765,8 @@ impl crate::reflect::ProtobufValue for CodeGeneratorResponse {
 /// Nested message and enums of message `CodeGeneratorResponse`
 pub mod code_generator_response {
     ///  Represents a single generated file.
-    #[derive(PartialEq,Clone,Default,Debug)]
     // @@protoc_insertion_point(message:google.protobuf.compiler.CodeGeneratorResponse.File)
+    #[derive(PartialEq,Clone,Default,Debug)]
     pub struct File {
         // message fields
         ///  The file name, relative to the output directory.  The name must not
diff --git a/protobuf/src/well_known_types/any.rs b/protobuf/src/well_known_types/any.rs
index 4195dfe9a..446b2dda4 100644
--- a/protobuf/src/well_known_types/any.rs
+++ b/protobuf/src/well_known_types/any.rs
@@ -21,8 +21,8 @@
 
 //! Generated file from `google/protobuf/any.proto`
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Any)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Any {
     // message fields
     ///  A URL/resource name that uniquely identifies the type of the serialized
diff --git a/protobuf/src/well_known_types/api.rs b/protobuf/src/well_known_types/api.rs
index 016dd949b..9036499a6 100644
--- a/protobuf/src/well_known_types/api.rs
+++ b/protobuf/src/well_known_types/api.rs
@@ -30,8 +30,8 @@
 ///  sometimes simply referred to as "APIs" in other contexts, such as the name of
 ///  this message itself. See https://cloud.google.com/apis/design/glossary for
 ///  detailed terminology.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Api)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Api {
     // message fields
     ///  The fully qualified name of this interface, including package name
@@ -294,8 +294,8 @@ impl crate::reflect::ProtobufValue for Api {
 }
 
 ///  Method represents a method of an API interface.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Method)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Method {
     // message fields
     ///  The simple name of this method.
@@ -532,8 +532,8 @@ impl crate::reflect::ProtobufValue for Method {
     type RuntimeType = crate::reflect::rt::RuntimeTypeMessage<Self>;
 }
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Mixin)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Mixin {
     // message fields
     ///  The fully qualified name of the interface which is included.
diff --git a/protobuf/src/well_known_types/duration.rs b/protobuf/src/well_known_types/duration.rs
index 204387617..bbba89c5f 100644
--- a/protobuf/src/well_known_types/duration.rs
+++ b/protobuf/src/well_known_types/duration.rs
@@ -21,8 +21,8 @@
 
 //! Generated file from `google/protobuf/duration.proto`
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Duration)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Duration {
     // message fields
     ///  Signed seconds of the span of time. Must be from -315,576,000,000
diff --git a/protobuf/src/well_known_types/empty.rs b/protobuf/src/well_known_types/empty.rs
index 675826a3d..9b81bccc2 100644
--- a/protobuf/src/well_known_types/empty.rs
+++ b/protobuf/src/well_known_types/empty.rs
@@ -21,8 +21,8 @@
 
 //! Generated file from `google/protobuf/empty.proto`
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Empty)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Empty {
     // special fields
     // @@protoc_insertion_point(special_field:google.protobuf.Empty.special_fields)
diff --git a/protobuf/src/well_known_types/field_mask.rs b/protobuf/src/well_known_types/field_mask.rs
index 901cf7f1c..36b839547 100644
--- a/protobuf/src/well_known_types/field_mask.rs
+++ b/protobuf/src/well_known_types/field_mask.rs
@@ -21,8 +21,8 @@
 
 //! Generated file from `google/protobuf/field_mask.proto`
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.FieldMask)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct FieldMask {
     // message fields
     ///  The set of field mask paths.
diff --git a/protobuf/src/well_known_types/source_context.rs b/protobuf/src/well_known_types/source_context.rs
index 94917ab38..e435ce08e 100644
--- a/protobuf/src/well_known_types/source_context.rs
+++ b/protobuf/src/well_known_types/source_context.rs
@@ -23,8 +23,8 @@
 
 ///  `SourceContext` represents information about the source of a
 ///  protobuf element, like the file in which it is defined.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.SourceContext)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct SourceContext {
     // message fields
     ///  The path-qualified name of the .proto file that contained the associated
diff --git a/protobuf/src/well_known_types/struct_.rs b/protobuf/src/well_known_types/struct_.rs
index 95ef3e1a6..587c8e69d 100644
--- a/protobuf/src/well_known_types/struct_.rs
+++ b/protobuf/src/well_known_types/struct_.rs
@@ -29,8 +29,8 @@
 ///  with the proto support for the language.
 ///
 ///  The JSON representation for `Struct` is JSON object.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Struct)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Struct {
     // message fields
     ///  Unordered map of dynamically typed values.
@@ -178,8 +178,8 @@ impl crate::reflect::ProtobufValue for Struct {
 ///  variants. Absence of any variant indicates an error.
 ///
 ///  The JSON representation for `Value` is JSON value.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Value)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Value {
     // message oneof groups
     pub kind: ::std::option::Option<value::Kind>,
@@ -661,8 +661,8 @@ pub mod value {
 ///  `ListValue` is a wrapper around a repeated field of values.
 ///
 ///  The JSON representation for `ListValue` is JSON array.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.ListValue)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct ListValue {
     // message fields
     ///  Repeated field of dynamically typed values.
diff --git a/protobuf/src/well_known_types/timestamp.rs b/protobuf/src/well_known_types/timestamp.rs
index b3ecd2867..e67d2d2b0 100644
--- a/protobuf/src/well_known_types/timestamp.rs
+++ b/protobuf/src/well_known_types/timestamp.rs
@@ -21,8 +21,8 @@
 
 //! Generated file from `google/protobuf/timestamp.proto`
 
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Timestamp)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Timestamp {
     // message fields
     ///  Represents seconds of UTC time since Unix epoch
diff --git a/protobuf/src/well_known_types/type_.rs b/protobuf/src/well_known_types/type_.rs
index 3aa5d1b14..9288488cf 100644
--- a/protobuf/src/well_known_types/type_.rs
+++ b/protobuf/src/well_known_types/type_.rs
@@ -22,8 +22,8 @@
 //! Generated file from `google/protobuf/type.proto`
 
 ///  A protocol buffer message type.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Type)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Type {
     // message fields
     ///  The fully qualified message name.
@@ -244,8 +244,8 @@ impl crate::reflect::ProtobufValue for Type {
 }
 
 ///  A single field of a message type.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Field)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Field {
     // message fields
     ///  The field type.
@@ -766,8 +766,8 @@ pub mod field {
 }
 
 ///  Enum type definition.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Enum)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Enum {
     // message fields
     ///  Enum type name.
@@ -969,8 +969,8 @@ impl crate::reflect::ProtobufValue for Enum {
 }
 
 ///  Enum value definition.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.EnumValue)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct EnumValue {
     // message fields
     ///  Enum value name.
@@ -1133,8 +1133,8 @@ impl crate::reflect::ProtobufValue for EnumValue {
 
 ///  A protocol buffer option, which can be attached to a message, field,
 ///  enumeration, etc.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Option)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Option {
     // message fields
     ///  The option's name. For protobuf built-in options (options defined in
diff --git a/protobuf/src/well_known_types/wrappers.rs b/protobuf/src/well_known_types/wrappers.rs
index ee6d2ba34..04bead20e 100644
--- a/protobuf/src/well_known_types/wrappers.rs
+++ b/protobuf/src/well_known_types/wrappers.rs
@@ -24,8 +24,8 @@
 ///  Wrapper message for `double`.
 ///
 ///  The JSON representation for `DoubleValue` is JSON number.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.DoubleValue)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct DoubleValue {
     // message fields
     ///  The double value.
@@ -150,8 +150,8 @@ impl crate::reflect::ProtobufValue for DoubleValue {
 ///  Wrapper message for `float`.
 ///
 ///  The JSON representation for `FloatValue` is JSON number.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.FloatValue)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct FloatValue {
     // message fields
     ///  The float value.
@@ -276,8 +276,8 @@ impl crate::reflect::ProtobufValue for FloatValue {
 ///  Wrapper message for `int64`.
 ///
 ///  The JSON representation for `Int64Value` is JSON string.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Int64Value)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Int64Value {
     // message fields
     ///  The int64 value.
@@ -402,8 +402,8 @@ impl crate::reflect::ProtobufValue for Int64Value {
 ///  Wrapper message for `uint64`.
 ///
 ///  The JSON representation for `UInt64Value` is JSON string.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.UInt64Value)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct UInt64Value {
     // message fields
     ///  The uint64 value.
@@ -528,8 +528,8 @@ impl crate::reflect::ProtobufValue for UInt64Value {
 ///  Wrapper message for `int32`.
 ///
 ///  The JSON representation for `Int32Value` is JSON number.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.Int32Value)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct Int32Value {
     // message fields
     ///  The int32 value.
@@ -654,8 +654,8 @@ impl crate::reflect::ProtobufValue for Int32Value {
 ///  Wrapper message for `uint32`.
 ///
 ///  The JSON representation for `UInt32Value` is JSON number.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.UInt32Value)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct UInt32Value {
     // message fields
     ///  The uint32 value.
@@ -780,8 +780,8 @@ impl crate::reflect::ProtobufValue for UInt32Value {
 ///  Wrapper message for `bool`.
 ///
 ///  The JSON representation for `BoolValue` is JSON `true` and `false`.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.BoolValue)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct BoolValue {
     // message fields
     ///  The bool value.
@@ -906,8 +906,8 @@ impl crate::reflect::ProtobufValue for BoolValue {
 ///  Wrapper message for `string`.
 ///
 ///  The JSON representation for `StringValue` is JSON string.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.StringValue)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct StringValue {
     // message fields
     ///  The string value.
@@ -1032,8 +1032,8 @@ impl crate::reflect::ProtobufValue for StringValue {
 ///  Wrapper message for `bytes`.
 ///
 ///  The JSON representation for `BytesValue` is JSON string.
-#[derive(PartialEq,Clone,Default,Debug)]
 // @@protoc_insertion_point(message:google.protobuf.BytesValue)
+#[derive(PartialEq,Clone,Default,Debug)]
 pub struct BytesValue {
     // message fields
     ///  The bytes value.