Pin the dependencies of the Rust code gen tools (p4lang#502)

In the previous commit, only the version of `protoc-gen-prost/tonic` was
pinned. However, Cargo would still ignore the lock file and use the
latest version of dependencies for `protoc-gen-prost/tonic`. This meant
that any new release of dependencies (such as `prost-build`) could
result in differences in the generated code.

This commit addresses the issue by adding `--locked` to the `cargo
install` command, ensuring Cargo respects the lock file when installing
code generation tools.

The Rust code has been regenerated using this updated configuration.

Signed-off-by: Campbell He <[email protected]>

Author: duskmoon314

codegen/Dockerfile

@@ -28,7 +28,7 @@ RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81.0 --profile minimal; \
     . $HOME/.cargo/env; \
-    cargo install protoc-gen-prost@0.4.0 protoc-gen-prost-crate@0.4.1 protoc-gen-tonic@0.4.1
+    cargo install --locked protoc-gen-prost@0.4.0 protoc-gen-prost-crate@0.4.1 protoc-gen-tonic@0.4.1
 
 ENV PATH="${PATH}:/root/.cargo/bin"
 

rust/src/google.rpc.rs

@@ -7,6 +7,7 @@
 ///
 /// You can find out more about this error model and how to work with it in the
 /// [API Design Guide](<https://cloud.google.com/apis/design/errors>).
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Status {
     /// The status code, which should be an enum value of

rust/src/p4.config.v1.rs

@@ -34,6 +34,7 @@
 /// message and refer to the types by name in the P4DataTypeSpec message. We also
 /// support annotations for these type specs which can be useful, e.g. to
 /// identify well-known headers (such as ipv4).
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4TypeInfo {
     #[prost(map="string, message", tag="1")]
@@ -52,14 +53,16 @@ pub struct P4TypeInfo {
     pub new_types: ::std::collections::HashMap<::prost::alloc::string::String, P4NewTypeSpec>,
 }
 /// Describes a P4_16 type.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4DataTypeSpec {
     #[prost(oneof="p4_data_type_spec::TypeSpec", tags="1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12")]
     pub type_spec: ::core::option::Option<p4_data_type_spec::TypeSpec>,
 }
 /// Nested message and enum types in `P4DataTypeSpec`.
 pub mod p4_data_type_spec {
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum TypeSpec {
         #[prost(message, tag="1")]
         Bitstring(super::P4BitstringLikeTypeSpec),
@@ -87,19 +90,23 @@ pub mod p4_data_type_spec {
         NewType(super::P4NamedType),
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4NamedType {
     #[prost(string, tag="1")]
     pub name: ::prost::alloc::string::String,
 }
 /// Empty message as no type information needed, just used as a placeholder in
 /// the oneof to identify boolean types.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct P4BoolType {
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct P4ErrorType {
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4BitstringLikeTypeSpec {
     /// Useful to identify well-known types, such as IP address or Ethernet MAC
@@ -117,7 +124,8 @@ pub struct P4BitstringLikeTypeSpec {
 }
 /// Nested message and enum types in `P4BitstringLikeTypeSpec`.
 pub mod p4_bitstring_like_type_spec {
-    #[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
     pub enum TypeSpec {
         /// bit<W>
         #[prost(message, tag="1")]
@@ -130,28 +138,33 @@ pub mod p4_bitstring_like_type_spec {
         Varbit(super::P4VarbitTypeSpec),
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct P4BitTypeSpec {
     #[prost(int32, tag="1")]
     pub bitwidth: i32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct P4IntTypeSpec {
     #[prost(int32, tag="1")]
     pub bitwidth: i32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct P4VarbitTypeSpec {
     #[prost(int32, tag="1")]
     pub max_bitwidth: i32,
 }
 /// From the P4_16 spec: "A tuple is similar to a struct, in that it holds
 /// multiple values. Unlike a struct type, tuples have no named fields."
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4TupleTypeSpec {
     #[prost(message, repeated, tag="1")]
     pub members: ::prost::alloc::vec::Vec<P4DataTypeSpec>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4StructTypeSpec {
     #[prost(message, repeated, tag="1")]
@@ -167,14 +180,16 @@ pub struct P4StructTypeSpec {
 }
 /// Nested message and enum types in `P4StructTypeSpec`.
 pub mod p4_struct_type_spec {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Member {
         #[prost(string, tag="1")]
         pub name: ::prost::alloc::string::String,
         #[prost(message, optional, tag="2")]
         pub type_spec: ::core::option::Option<super::P4DataTypeSpec>,
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4HeaderTypeSpec {
     #[prost(message, repeated, tag="1")]
@@ -190,14 +205,16 @@ pub struct P4HeaderTypeSpec {
 }
 /// Nested message and enum types in `P4HeaderTypeSpec`.
 pub mod p4_header_type_spec {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Member {
         #[prost(string, tag="1")]
         pub name: ::prost::alloc::string::String,
         #[prost(message, optional, tag="2")]
         pub type_spec: ::core::option::Option<super::P4BitstringLikeTypeSpec>,
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4HeaderUnionTypeSpec {
     #[prost(message, repeated, tag="1")]
@@ -213,48 +230,55 @@ pub struct P4HeaderUnionTypeSpec {
 }
 /// Nested message and enum types in `P4HeaderUnionTypeSpec`.
 pub mod p4_header_union_type_spec {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Member {
         #[prost(string, tag="1")]
         pub name: ::prost::alloc::string::String,
         #[prost(message, optional, tag="2")]
         pub header: ::core::option::Option<super::P4NamedType>,
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4HeaderStackTypeSpec {
     #[prost(message, optional, tag="1")]
     pub header: ::core::option::Option<P4NamedType>,
     #[prost(int32, tag="2")]
     pub size: i32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4HeaderUnionStackTypeSpec {
     #[prost(message, optional, tag="1")]
     pub header_union: ::core::option::Option<P4NamedType>,
     #[prost(int32, tag="2")]
     pub size: i32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct KeyValuePair {
     #[prost(string, tag="1")]
     pub key: ::prost::alloc::string::String,
     #[prost(message, optional, tag="2")]
     pub value: ::core::option::Option<Expression>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct KeyValuePairList {
     #[prost(message, repeated, tag="1")]
     pub kv_pairs: ::prost::alloc::vec::Vec<KeyValuePair>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Expression {
     #[prost(oneof="expression::Value", tags="1, 2, 3")]
     pub value: ::core::option::Option<expression::Value>,
 }
 /// Nested message and enum types in `Expression`.
 pub mod expression {
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Value {
         #[prost(string, tag="1")]
         StringValue(::prost::alloc::string::String),
@@ -264,11 +288,13 @@ pub mod expression {
         BoolValue(bool),
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExpressionList {
     #[prost(message, repeated, tag="1")]
     pub expressions: ::prost::alloc::vec::Vec<Expression>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct StructuredAnnotation {
     #[prost(string, tag="1")]
@@ -281,7 +307,8 @@ pub struct StructuredAnnotation {
 }
 /// Nested message and enum types in `StructuredAnnotation`.
 pub mod structured_annotation {
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Body {
         #[prost(message, tag="2")]
         ExpressionList(super::ExpressionList),
@@ -290,6 +317,7 @@ pub mod structured_annotation {
     }
 }
 /// Location of code relative to a given source file.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SourceLocation {
     /// Path to the source file (absolute or relative to the working directory).
@@ -303,6 +331,7 @@ pub struct SourceLocation {
 }
 /// For "safe" enums with no underlying representation and no member integer
 /// values.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4EnumTypeSpec {
     #[prost(message, repeated, tag="1")]
@@ -318,7 +347,8 @@ pub struct P4EnumTypeSpec {
 }
 /// Nested message and enum types in `P4EnumTypeSpec`.
 pub mod p4_enum_type_spec {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Member {
         #[prost(string, tag="1")]
         pub name: ::prost::alloc::string::String,
@@ -335,6 +365,7 @@ pub mod p4_enum_type_spec {
 /// For serializable (or "unsafe") enums, which have an underlying type. Note
 /// that as per the P4_16 specification, the underlying representation can only
 /// be a bit<W> type.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4SerializableEnumTypeSpec {
     #[prost(message, optional, tag="1")]
@@ -352,7 +383,8 @@ pub struct P4SerializableEnumTypeSpec {
 }
 /// Nested message and enum types in `P4SerializableEnumTypeSpec`.
 pub mod p4_serializable_enum_type_spec {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Member {
         #[prost(string, tag="1")]
         pub name: ::prost::alloc::string::String,
@@ -370,11 +402,13 @@ pub mod p4_serializable_enum_type_spec {
 }
 /// Similar to an enum, but there is always one and only one instance per P4
 /// program.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4ErrorTypeSpec {
     #[prost(string, repeated, tag="1")]
     pub members: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4NewTypeTranslation {
     /// the URI uniquely identifies the translation in order to enable the
@@ -390,12 +424,14 @@ pub struct P4NewTypeTranslation {
 }
 /// Nested message and enum types in `P4NewTypeTranslation`.
 pub mod p4_new_type_translation {
-    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct SdnString {
     }
     /// The object is either represented as an unsigned integer with a bitwidth of
     /// `sdn_bitwidth`, or as a string.
-    #[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
     pub enum SdnType {
         #[prost(int32, tag="2")]
         SdnBitwidth(i32),
@@ -404,6 +440,7 @@ pub mod p4_new_type_translation {
     }
 }
 /// New types introduced with the "type" keyword
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4NewTypeSpec {
     /// for other annotations (not @p4runtime_translation)
@@ -420,7 +457,8 @@ pub struct P4NewTypeSpec {
 }
 /// Nested message and enum types in `P4NewTypeSpec`.
 pub mod p4_new_type_spec {
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Representation {
         /// if no @p4runtime_translation annotation present
         #[prost(message, tag="1")]
@@ -430,6 +468,7 @@ pub mod p4_new_type_spec {
         TranslatedType(super::P4NewTypeTranslation),
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct P4Info {
     #[prost(message, optional, tag="1")]
@@ -461,6 +500,7 @@ pub struct P4Info {
     #[prost(message, optional, tag="200")]
     pub type_info: ::core::option::Option<P4TypeInfo>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Documentation {
     /// A brief description of something, e.g. one sentence
@@ -473,6 +513,7 @@ pub struct Documentation {
 }
 /// Used to describe the required properties of the underlying platform.
 /// Added in v1.4.0
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct PlatformProperties {
     /// The minimum number of multicast entries (i.e. multicast groups) that the
@@ -491,6 +532,7 @@ pub struct PlatformProperties {
 }
 /// Top-level package documentation describing the forwarding pipeline config
 /// Can be used to manage multiple P4 packages.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct PkgInfo {
     /// a definitive name for this configuration, e.g. switch.p4_v1.0
@@ -534,6 +576,7 @@ pub struct PkgInfo {
 }
 /// wrapping the enum in a message to avoid name collisions in C++, where "enum
 /// values are siblings of their type, not children of it"
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct P4Ids {
 }
@@ -619,6 +662,7 @@ pub mod p4_ids {
         }
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Preamble {
     /// ids share the same number-space; e.g. table ids cannot overlap with counter
@@ -657,6 +701,7 @@ pub struct Preamble {
     pub structured_annotations: ::prost::alloc::vec::Vec<StructuredAnnotation>,
 }
 /// used to group all extern instances of the same type in one message
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Extern {
     /// the extern_type_id is unique for a given architecture and must be in the
@@ -668,6 +713,7 @@ pub struct Extern {
     #[prost(message, repeated, tag="3")]
     pub instances: ::prost::alloc::vec::Vec<ExternInstance>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ExternInstance {
     #[prost(message, optional, tag="1")]
@@ -677,6 +723,7 @@ pub struct ExternInstance {
     #[prost(message, optional, tag="2")]
     pub info: ::core::option::Option<::pbjson_types::Any>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MatchField {
     #[prost(uint32, tag="1")]
@@ -742,7 +789,8 @@ pub mod match_field {
             }
         }
     }
-    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Oneof)]
     pub enum Match {
         #[prost(enumeration="MatchType", tag="5")]
         MatchType(i32),
@@ -757,6 +805,7 @@ pub mod match_field {
 /// Arguments are matched to the id of the respective action parameter.
 /// TableActionCalls may be used as the default action call of a table implementation.
 /// Added in 1.4.0.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TableActionCall {
     #[prost(uint32, tag="1")]
@@ -766,14 +815,16 @@ pub struct TableActionCall {
 }
 /// Nested message and enum types in `TableActionCall`.
 pub mod table_action_call {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Argument {
         #[prost(uint32, tag="2")]
         pub param_id: u32,
         #[prost(bytes="vec", tag="3")]
         pub value: ::prost::alloc::vec::Vec<u8>,
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Table {
     #[prost(message, optional, tag="1")]
@@ -861,6 +912,7 @@ pub mod table {
     }
 }
 /// used to list all possible actions in a Table
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionRef {
     #[prost(uint32, tag="1")]
@@ -908,6 +960,7 @@ pub mod action_ref {
         }
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Action {
     #[prost(message, optional, tag="1")]
@@ -917,7 +970,8 @@ pub struct Action {
 }
 /// Nested message and enum types in `Action`.
 pub mod action {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Param {
         #[prost(uint32, tag="1")]
         pub id: u32,
@@ -941,6 +995,7 @@ pub mod action {
         pub structured_annotations: ::prost::alloc::vec::Vec<super::StructuredAnnotation>,
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ActionProfile {
     #[prost(message, optional, tag="1")]
@@ -970,21 +1025,24 @@ pub mod action_profile {
     /// weights that can be present across all selector groups and within a
     /// single selector group respectively.
     /// Added in v1.4.0
-    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct SumOfWeights {
     }
     /// indicates that `size` and `max_group_size` represent the maximum number
     /// of members that can be present across all selector groups and within a
     /// single selector group respectively.
     /// Added in v1.4.0
-    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
     pub struct SumOfMembers {
         /// the maximum weight of each individual member in a group.
         #[prost(int32, tag="1")]
         pub max_member_weight: i32,
     }
     /// specifies the semantics of `size` and `max_group_size` above
-    #[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, Copy, PartialEq, ::prost::Oneof)]
     pub enum SelectorSizeSemantics {
         /// group size is the sum of the group's weights.
         /// Added in v1.4.0
@@ -996,6 +1054,7 @@ pub mod action_profile {
         SumOfMembers(SumOfMembers),
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct CounterSpec {
     #[prost(enumeration="counter_spec::Unit", tag="1")]
@@ -1038,6 +1097,7 @@ pub mod counter_spec {
         }
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Counter {
     #[prost(message, optional, tag="1")]
@@ -1051,6 +1111,7 @@ pub struct Counter {
     #[prost(message, optional, tag="4")]
     pub index_type_name: ::core::option::Option<P4NamedType>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DirectCounter {
     #[prost(message, optional, tag="1")]
@@ -1061,6 +1122,7 @@ pub struct DirectCounter {
     #[prost(uint32, tag="3")]
     pub direct_table_id: u32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct MeterSpec {
     #[prost(enumeration="meter_spec::Unit", tag="1")]
@@ -1147,6 +1209,7 @@ pub mod meter_spec {
         }
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Meter {
     #[prost(message, optional, tag="1")]
@@ -1160,6 +1223,7 @@ pub struct Meter {
     #[prost(message, optional, tag="4")]
     pub index_type_name: ::core::option::Option<P4NamedType>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct DirectMeter {
     #[prost(message, optional, tag="1")]
@@ -1176,6 +1240,7 @@ pub struct DirectMeter {
 /// respectively. There can be at most one header each with these annotations.
 /// This message captures the info contained within these special headers,
 /// and used in p4runtime.proto to supply the metadata.
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ControllerPacketMetadata {
     /// preamble.name and preamble.id will specify header type ("packet_out" or
@@ -1189,7 +1254,8 @@ pub struct ControllerPacketMetadata {
 }
 /// Nested message and enum types in `ControllerPacketMetadata`.
 pub mod controller_packet_metadata {
-    #[derive(Clone, PartialEq, ::prost::Message)]
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Metadata {
         #[prost(uint32, tag="1")]
         pub id: u32,
@@ -1212,6 +1278,7 @@ pub mod controller_packet_metadata {
         pub structured_annotations: ::prost::alloc::vec::Vec<super::StructuredAnnotation>,
     }
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ValueSet {
     #[prost(message, optional, tag="1")]
@@ -1222,6 +1289,7 @@ pub struct ValueSet {
     #[prost(int32, tag="3")]
     pub size: i32,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Register {
     #[prost(message, optional, tag="1")]
@@ -1234,6 +1302,7 @@ pub struct Register {
     #[prost(message, optional, tag="4")]
     pub index_type_name: ::core::option::Option<P4NamedType>,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Digest {
     #[prost(message, optional, tag="1")]

rust/src/p4.v1.rs

@@ -23,8 +23,8 @@ pub mod p4_runtime_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -49,7 +49,7 @@ pub mod p4_runtime_client {
             >,
             <T as tonic::codegen::Service<
                 http::Request<tonic::body::BoxBody>,
-            >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
+            >>::Error: Into<StdError> + Send + Sync,
         {
             P4RuntimeClient::new(InterceptedService::new(inner, interceptor))
         }
@@ -239,7 +239,7 @@ pub mod p4_runtime_server {
     use tonic::codegen::*;
     /// Generated trait containing gRPC methods that should be implemented for use with P4RuntimeServer.
     #[async_trait]
-    pub trait P4Runtime: std::marker::Send + std::marker::Sync + 'static {
+    pub trait P4Runtime: Send + Sync + 'static {
         async fn write(
             &self,
             request: tonic::Request<super::WriteRequest>,
@@ -248,7 +248,7 @@ pub mod p4_runtime_server {
         type ReadStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::ReadResponse, tonic::Status>,
             >
-            + std::marker::Send
+            + Send
             + 'static;
         async fn read(
             &self,
@@ -272,7 +272,7 @@ pub mod p4_runtime_server {
         type StreamChannelStream: tonic::codegen::tokio_stream::Stream<
                 Item = std::result::Result<super::StreamMessageResponse, tonic::Status>,
             >
-            + std::marker::Send
+            + Send
             + 'static;
         async fn stream_channel(
             &self,
@@ -290,14 +290,14 @@ pub mod p4_runtime_server {
         >;
     }
     #[derive(Debug)]
-    pub struct P4RuntimeServer<T> {
+    pub struct P4RuntimeServer<T: P4Runtime> {
         inner: Arc<T>,
         accept_compression_encodings: EnabledCompressionEncodings,
         send_compression_encodings: EnabledCompressionEncodings,
         max_decoding_message_size: Option<usize>,
         max_encoding_message_size: Option<usize>,
     }
-    impl<T> P4RuntimeServer<T> {
+    impl<T: P4Runtime> P4RuntimeServer<T> {
         pub fn new(inner: T) -> Self {
             Self::from_arc(Arc::new(inner))
         }
@@ -351,8 +351,8 @@ pub mod p4_runtime_server {
     impl<T, B> tonic::codegen::Service<http::Request<B>> for P4RuntimeServer<T>
     where
         T: P4Runtime,
-        B: Body + std::marker::Send + 'static,
-        B::Error: Into<StdError> + std::marker::Send + 'static,
+        B: Body + Send + 'static,
+        B::Error: Into<StdError> + Send + 'static,
     {
         type Response = http::Response<tonic::body::BoxBody>;
         type Error = std::convert::Infallible;
@@ -669,7 +669,7 @@ pub mod p4_runtime_server {
             }
         }
     }
-    impl<T> Clone for P4RuntimeServer<T> {
+    impl<T: P4Runtime> Clone for P4RuntimeServer<T> {
         fn clone(&self) -> Self {
             let inner = self.inner.clone();
             Self {
@@ -681,9 +681,7 @@ pub mod p4_runtime_server {
             }
         }
     }
-    /// Generated gRPC service name
-    pub const SERVICE_NAME: &str = "p4.v1.P4Runtime";
-    impl<T> tonic::server::NamedService for P4RuntimeServer<T> {
-        const NAME: &'static str = SERVICE_NAME;
+    impl<T: P4Runtime> tonic::server::NamedService for P4RuntimeServer<T> {
+        const NAME: &'static str = "p4.v1.P4Runtime";
     }
 }