From b0dda5793ba473d8d58bb375e54cb022a06f0fbc Mon Sep 17 00:00:00 2001 From: MuZhou233 Date: Thu, 11 Jul 2024 23:03:36 +0000 Subject: [PATCH] chore: apply auto code generation --- src/buf.validate.priv.serde.rs | 16 +- src/buf.validate.rs | 480 +++--- src/buf.validate.serde.rs | 534 ++++--- src/errors.serde.rs | 12 +- src/librarian.mapper.v1.serde.rs | 272 ++-- src/librarian.mapper.v1.tonic.rs | 56 +- src/librarian.miner.v1.serde.rs | 33 +- src/librarian.miner.v1.tonic.rs | 12 +- src/librarian.porter.v1.serde.rs | 169 +- src/librarian.porter.v1.tonic.rs | 62 +- src/librarian.searcher.v1.serde.rs | 107 +- src/librarian.searcher.v1.tonic.rs | 30 +- src/librarian.sephirah.v1.serde.rs | 2365 ++++++++++++++-------------- src/librarian.sephirah.v1.tonic.rs | 691 ++++++-- src/librarian.v1.serde.rs | 317 ++-- 15 files changed, 2870 insertions(+), 2286 deletions(-) diff --git a/src/buf.validate.priv.serde.rs b/src/buf.validate.priv.serde.rs index 5dd0b73b..263fe62c 100644 --- a/src/buf.validate.priv.serde.rs +++ b/src/buf.validate.priv.serde.rs @@ -85,32 +85,32 @@ impl<'de> serde::Deserialize<'de> for Constraint { formatter.write_str("struct buf.validate.r#priv.Constraint") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut message__ = None; let mut expression__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = Some(map.next_value()?); + id__ = Some(map_.next_value()?); } GeneratedField::Message => { if message__.is_some() { return Err(serde::de::Error::duplicate_field("message")); } - message__ = Some(map.next_value()?); + message__ = Some(map_.next_value()?); } GeneratedField::Expression => { if expression__.is_some() { return Err(serde::de::Error::duplicate_field("expression")); } - expression__ = Some(map.next_value()?); + expression__ = Some(map_.next_value()?); } } } @@ -192,18 +192,18 @@ impl<'de> serde::Deserialize<'de> for FieldConstraints { formatter.write_str("struct buf.validate.r#priv.FieldConstraints") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut cel__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Cel => { if cel__.is_some() { return Err(serde::de::Error::duplicate_field("cel")); } - cel__ = Some(map.next_value()?); + cel__ = Some(map_.next_value()?); } } } diff --git a/src/buf.validate.rs b/src/buf.validate.rs index da28e702..80c99763 100644 --- a/src/buf.validate.rs +++ b/src/buf.validate.rs @@ -122,7 +122,7 @@ pub struct OneofConstraints { /// message MyMessage { /// oneof value { /// // The field `a` or `b` must be set. - /// option [(buf.validate.oneof).required = true] + /// option \[(buf.validate.oneof).required = true\] /// optional string a = 1; /// optional string b = 2; /// } @@ -159,7 +159,7 @@ pub struct FieldConstraints { /// ```proto /// message MyMessage { /// // The field `value` must not be set. - /// optional MyOtherMessage value = 1 [(buf.validate.field).skipped = true]; + /// optional MyOtherMessage value = 1 \[(buf.validate.field).skipped = true\]; /// } /// ``` #[prost(bool, tag="24")] @@ -171,7 +171,7 @@ pub struct FieldConstraints { /// ```proto /// message MyMessage { /// // The field `value` must be set. - /// optional MyOtherMessage value = 1 [(buf.validate.field).required = true]; + /// optional MyOtherMessage value = 1 \[(buf.validate.field).required = true\]; /// } /// ``` #[prost(bool, tag="25")] @@ -183,7 +183,7 @@ pub struct FieldConstraints { /// ```proto /// message MyRepeated { /// // The field `value` validation rules should be evaluated only if the field isn't empty. - /// repeated string value = 1 [(buf.validate.field).ignore_empty = true]; + /// repeated string value = 1 \[(buf.validate.field).ignore_empty = true\]; /// } /// ``` #[prost(bool, tag="26")] @@ -254,7 +254,7 @@ pub struct FloatRules { /// ```proto /// message MyFloat { /// // value must equal 42.0 - /// float value = 1 [(buf.validate.field).float.const = 42.0]; + /// float value = 1 \[(buf.validate.field).float.const = 42.0\]; /// } /// ``` #[prost(float, optional, tag="1")] @@ -266,7 +266,7 @@ pub struct FloatRules { /// ```proto /// message MyFloat { /// // value must be less than 10.0 - /// float value = 1 [(buf.validate.field).float.lt = 10.0]; + /// float value = 1 \[(buf.validate.field).float.lt = 10.0\]; /// } /// ``` #[prost(float, optional, tag="2")] @@ -278,7 +278,7 @@ pub struct FloatRules { /// ```proto /// message MyFloat { /// // value must be less than or equal to 10.0 - /// float value = 1 [(buf.validate.field).float.lte = 10.0]; + /// float value = 1 \[(buf.validate.field).float.lte = 10.0\]; /// } /// ``` #[prost(float, optional, tag="3")] @@ -292,13 +292,13 @@ pub struct FloatRules { /// ```proto /// message MyFloat { /// // value must be greater than 5.0 \[float.gt\] - /// float value = 1 [(buf.validate.field).float.gt = 5.0]; + /// float value = 1 \[(buf.validate.field).float.gt = 5.0\]; /// /// // value must be greater than 5 and less than 10.0 \[float.gt_lt\] - /// float other_value = 2 [(buf.validate.field).float = { gt: 5.0, lt: 10.0 }]; + /// float other_value = 2 \[(buf.validate.field).float = { gt: 5.0, lt: 10.0 }\]; /// /// // value must be greater than 10 or less than 5.0 \[float.gt_lt_exclusive\] - /// float another_value = 3 [(buf.validate.field).float = { gt: 10.0, lt: 5.0 }]; + /// float another_value = 3 \[(buf.validate.field).float = { gt: 10.0, lt: 5.0 }\]; /// } /// ``` #[prost(float, optional, tag="4")] @@ -312,13 +312,13 @@ pub struct FloatRules { /// ```proto /// message MyFloat { /// // value must be greater than or equal to 5.0 \[float.gte\] - /// float value = 1 [(buf.validate.field).float.gte = 5.0]; + /// float value = 1 \[(buf.validate.field).float.gte = 5.0\]; /// /// // value must be greater than or equal to 5.0 and less than 10.0 \[float.gte_lt\] - /// float other_value = 2 [(buf.validate.field).float = { gte: 5.0, lt: 10.0 }]; + /// float other_value = 2 \[(buf.validate.field).float = { gte: 5.0, lt: 10.0 }\]; /// /// // value must be greater than or equal to 10.0 or less than 5.0 \[float.gte_lt_exclusive\] - /// float another_value = 3 [(buf.validate.field).float = { gte: 10.0, lt: 5.0 }]; + /// float another_value = 3 \[(buf.validate.field).float = { gte: 10.0, lt: 5.0 }\]; /// } /// ``` #[prost(float, optional, tag="5")] @@ -329,8 +329,8 @@ pub struct FloatRules { /// /// ```proto /// message MyFloat { - /// // value must be in list [1.0, 2.0, 3.0] - /// repeated float value = 1 (buf.validate.field).float = { in: [1.0, 2.0, 3.0] }; + /// // value must be in list \[1.0, 2.0, 3.0\] + /// repeated float value = 1 (buf.validate.field).float = { in: \[1.0, 2.0, 3.0\] }; /// } /// ``` #[prost(float, repeated, packed="false", tag="6")] @@ -341,8 +341,8 @@ pub struct FloatRules { /// /// ```proto /// message MyFloat { - /// // value must not be in list [1.0, 2.0, 3.0] - /// repeated float value = 1 (buf.validate.field).float = { not_in: [1.0, 2.0, 3.0] }; + /// // value must not be in list \[1.0, 2.0, 3.0\] + /// repeated float value = 1 (buf.validate.field).float = { not_in: \[1.0, 2.0, 3.0\] }; /// } /// ``` #[prost(float, repeated, packed="false", tag="7")] @@ -359,7 +359,7 @@ pub struct DoubleRules { /// ```proto /// message MyDouble { /// // value must equal 42.0 - /// double value = 1 [(buf.validate.field).double.const = 42.0]; + /// double value = 1 \[(buf.validate.field).double.const = 42.0\]; /// } /// ``` #[prost(double, optional, tag="1")] @@ -371,7 +371,7 @@ pub struct DoubleRules { /// ```proto /// message MyDouble { /// // value must be less than 10.0 - /// double value = 1 [(buf.validate.field).double.lt = 10.0]; + /// double value = 1 \[(buf.validate.field).double.lt = 10.0\]; /// } /// ``` #[prost(double, optional, tag="2")] @@ -383,7 +383,7 @@ pub struct DoubleRules { /// ```proto /// message MyDouble { /// // value must be less than or equal to 10.0 - /// double value = 1 [(buf.validate.field).double.lte = 10.0]; + /// double value = 1 \[(buf.validate.field).double.lte = 10.0\]; /// } /// ``` #[prost(double, optional, tag="3")] @@ -397,13 +397,13 @@ pub struct DoubleRules { /// ```proto /// message MyDouble { /// // value must be greater than 5.0 \[double.gt\] - /// double value = 1 [(buf.validate.field).double.gt = 5.0]; + /// double value = 1 \[(buf.validate.field).double.gt = 5.0\]; /// /// // value must be greater than 5 and less than 10.0 \[double.gt_lt\] - /// double other_value = 2 [(buf.validate.field).double = { gt: 5.0, lt: 10.0 }]; + /// double other_value = 2 \[(buf.validate.field).double = { gt: 5.0, lt: 10.0 }\]; /// /// // value must be greater than 10 or less than 5.0 \[double.gt_lt_exclusive\] - /// double another_value = 3 [(buf.validate.field).double = { gt: 10.0, lt: 5.0 }]; + /// double another_value = 3 \[(buf.validate.field).double = { gt: 10.0, lt: 5.0 }\]; /// } /// ``` #[prost(double, optional, tag="4")] @@ -417,13 +417,13 @@ pub struct DoubleRules { /// ```proto /// message MyDouble { /// // value must be greater than or equal to 5.0 \[double.gte\] - /// double value = 1 [(buf.validate.field).double.gte = 5.0]; + /// double value = 1 \[(buf.validate.field).double.gte = 5.0\]; /// /// // value must be greater than or equal to 5.0 and less than 10.0 \[double.gte_lt\] - /// double other_value = 2 [(buf.validate.field).double = { gte: 5.0, lt: 10.0 }]; + /// double other_value = 2 \[(buf.validate.field).double = { gte: 5.0, lt: 10.0 }\]; /// /// // value must be greater than or equal to 10.0 or less than 5.0 \[double.gte_lt_exclusive\] - /// double another_value = 3 [(buf.validate.field).double = { gte: 10.0, lt: 5.0 }]; + /// double another_value = 3 \[(buf.validate.field).double = { gte: 10.0, lt: 5.0 }\]; /// } /// ``` #[prost(double, optional, tag="5")] @@ -434,8 +434,8 @@ pub struct DoubleRules { /// /// ```proto /// message MyDouble { - /// // value must be in list [1.0, 2.0, 3.0] - /// repeated double value = 1 (buf.validate.field).double = { in: [1.0, 2.0, 3.0] }; + /// // value must be in list \[1.0, 2.0, 3.0\] + /// repeated double value = 1 (buf.validate.field).double = { in: \[1.0, 2.0, 3.0\] }; /// } /// ``` #[prost(double, repeated, packed="false", tag="6")] @@ -446,8 +446,8 @@ pub struct DoubleRules { /// /// ```proto /// message MyDouble { - /// // value must not be in list [1.0, 2.0, 3.0] - /// repeated double value = 1 (buf.validate.field).double = { not_in: [1.0, 2.0, 3.0] }; + /// // value must not be in list \[1.0, 2.0, 3.0\] + /// repeated double value = 1 (buf.validate.field).double = { not_in: \[1.0, 2.0, 3.0\] }; /// } /// ``` #[prost(double, repeated, packed="false", tag="7")] @@ -464,7 +464,7 @@ pub struct Int32Rules { /// ```proto /// message MyInt32 { /// // value must equal 42 - /// int32 value = 1 [(buf.validate.field).int32.const = 42]; + /// int32 value = 1 \[(buf.validate.field).int32.const = 42\]; /// } /// ``` #[prost(int32, optional, tag="1")] @@ -476,7 +476,7 @@ pub struct Int32Rules { /// ```proto /// message MyInt32 { /// // value must be less than 10 - /// int32 value = 1 [(buf.validate.field).int32.lt = 10]; + /// int32 value = 1 \[(buf.validate.field).int32.lt = 10\]; /// } /// ``` #[prost(int32, optional, tag="2")] @@ -488,7 +488,7 @@ pub struct Int32Rules { /// ```proto /// message MyInt32 { /// // value must be less than or equal to 10 - /// int32 value = 1 [(buf.validate.field).int32.lte = 10]; + /// int32 value = 1 \[(buf.validate.field).int32.lte = 10\]; /// } /// ``` #[prost(int32, optional, tag="3")] @@ -502,13 +502,13 @@ pub struct Int32Rules { /// ```proto /// message MyInt32 { /// // value must be greater than 5 \[int32.gt\] - /// int32 value = 1 [(buf.validate.field).int32.gt = 5]; + /// int32 value = 1 \[(buf.validate.field).int32.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[int32.gt_lt\] - /// int32 other_value = 2 [(buf.validate.field).int32 = { gt: 5, lt: 10 }]; + /// int32 other_value = 2 \[(buf.validate.field).int32 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[int32.gt_lt_exclusive\] - /// int32 another_value = 3 [(buf.validate.field).int32 = { gt: 10, lt: 5 }]; + /// int32 another_value = 3 \[(buf.validate.field).int32 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(int32, optional, tag="4")] @@ -522,13 +522,13 @@ pub struct Int32Rules { /// ```proto /// message MyInt32 { /// // value must be greater than or equal to 5 \[int32.gte\] - /// int32 value = 1 [(buf.validate.field).int32.gte = 5]; + /// int32 value = 1 \[(buf.validate.field).int32.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[int32.gte_lt\] - /// int32 other_value = 2 [(buf.validate.field).int32 = { gte: 5, lt: 10 }]; + /// int32 other_value = 2 \[(buf.validate.field).int32 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[int32.gte_lt_exclusive\] - /// int32 another_value = 3 [(buf.validate.field).int32 = { gte: 10, lt: 5 }]; + /// int32 another_value = 3 \[(buf.validate.field).int32 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(int32, optional, tag="5")] @@ -539,8 +539,8 @@ pub struct Int32Rules { /// /// ```proto /// message MyInt32 { - /// // value must be in list [1, 2, 3] - /// repeated int32 value = 1 (buf.validate.field).int32 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated int32 value = 1 (buf.validate.field).int32 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(int32, repeated, packed="false", tag="6")] @@ -551,8 +551,8 @@ pub struct Int32Rules { /// /// ```proto /// message MyInt32 { - /// // value must not be in list [1, 2, 3] - /// repeated int32 value = 1 (buf.validate.field).int32 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated int32 value = 1 (buf.validate.field).int32 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(int32, repeated, packed="false", tag="7")] @@ -569,7 +569,7 @@ pub struct Int64Rules { /// ```proto /// message MyInt64 { /// // value must equal 42 - /// int64 value = 1 [(buf.validate.field).int64.const = 42]; + /// int64 value = 1 \[(buf.validate.field).int64.const = 42\]; /// } /// ``` #[prost(int64, optional, tag="1")] @@ -581,7 +581,7 @@ pub struct Int64Rules { /// ```proto /// message MyInt64 { /// // value must be less than 10 - /// int64 value = 1 [(buf.validate.field).int64.lt = 10]; + /// int64 value = 1 \[(buf.validate.field).int64.lt = 10\]; /// } /// ``` #[prost(int64, optional, tag="2")] @@ -593,7 +593,7 @@ pub struct Int64Rules { /// ```proto /// message MyInt64 { /// // value must be less than or equal to 10 - /// int64 value = 1 [(buf.validate.field).int64.lte = 10]; + /// int64 value = 1 \[(buf.validate.field).int64.lte = 10\]; /// } /// ``` #[prost(int64, optional, tag="3")] @@ -607,13 +607,13 @@ pub struct Int64Rules { /// ```proto /// message MyInt64 { /// // value must be greater than 5 \[int64.gt\] - /// int64 value = 1 [(buf.validate.field).int64.gt = 5]; + /// int64 value = 1 \[(buf.validate.field).int64.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[int64.gt_lt\] - /// int64 other_value = 2 [(buf.validate.field).int64 = { gt: 5, lt: 10 }]; + /// int64 other_value = 2 \[(buf.validate.field).int64 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[int64.gt_lt_exclusive\] - /// int64 another_value = 3 [(buf.validate.field).int64 = { gt: 10, lt: 5 }]; + /// int64 another_value = 3 \[(buf.validate.field).int64 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(int64, optional, tag="4")] @@ -627,13 +627,13 @@ pub struct Int64Rules { /// ```proto /// message MyInt64 { /// // value must be greater than or equal to 5 \[int64.gte\] - /// int64 value = 1 [(buf.validate.field).int64.gte = 5]; + /// int64 value = 1 \[(buf.validate.field).int64.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[int64.gte_lt\] - /// int64 other_value = 2 [(buf.validate.field).int64 = { gte: 5, lt: 10 }]; + /// int64 other_value = 2 \[(buf.validate.field).int64 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[int64.gte_lt_exclusive\] - /// int64 another_value = 3 [(buf.validate.field).int64 = { gte: 10, lt: 5 }]; + /// int64 another_value = 3 \[(buf.validate.field).int64 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(int64, optional, tag="5")] @@ -644,8 +644,8 @@ pub struct Int64Rules { /// /// ```proto /// message MyInt64 { - /// // value must be in list [1, 2, 3] - /// repeated int64 value = 1 (buf.validate.field).int64 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated int64 value = 1 (buf.validate.field).int64 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(int64, repeated, packed="false", tag="6")] @@ -656,8 +656,8 @@ pub struct Int64Rules { /// /// ```proto /// message MyInt64 { - /// // value must not be in list [1, 2, 3] - /// repeated int64 value = 1 (buf.validate.field).int64 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated int64 value = 1 (buf.validate.field).int64 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(int64, repeated, packed="false", tag="7")] @@ -674,7 +674,7 @@ pub struct UInt32Rules { /// ```proto /// message MyUInt32 { /// // value must equal 42 - /// uint32 value = 1 [(buf.validate.field).uint32.const = 42]; + /// uint32 value = 1 \[(buf.validate.field).uint32.const = 42\]; /// } /// ``` #[prost(uint32, optional, tag="1")] @@ -686,7 +686,7 @@ pub struct UInt32Rules { /// ```proto /// message MyUInt32 { /// // value must be less than 10 - /// uint32 value = 1 [(buf.validate.field).uint32.lt = 10]; + /// uint32 value = 1 \[(buf.validate.field).uint32.lt = 10\]; /// } /// ``` #[prost(uint32, optional, tag="2")] @@ -698,7 +698,7 @@ pub struct UInt32Rules { /// ```proto /// message MyUInt32 { /// // value must be less than or equal to 10 - /// uint32 value = 1 [(buf.validate.field).uint32.lte = 10]; + /// uint32 value = 1 \[(buf.validate.field).uint32.lte = 10\]; /// } /// ``` #[prost(uint32, optional, tag="3")] @@ -712,13 +712,13 @@ pub struct UInt32Rules { /// ```proto /// message MyUInt32 { /// // value must be greater than 5 \[uint32.gt\] - /// uint32 value = 1 [(buf.validate.field).uint32.gt = 5]; + /// uint32 value = 1 \[(buf.validate.field).uint32.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[uint32.gt_lt\] - /// uint32 other_value = 2 [(buf.validate.field).uint32 = { gt: 5, lt: 10 }]; + /// uint32 other_value = 2 \[(buf.validate.field).uint32 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[uint32.gt_lt_exclusive\] - /// uint32 another_value = 3 [(buf.validate.field).uint32 = { gt: 10, lt: 5 }]; + /// uint32 another_value = 3 \[(buf.validate.field).uint32 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(uint32, optional, tag="4")] @@ -732,13 +732,13 @@ pub struct UInt32Rules { /// ```proto /// message MyUInt32 { /// // value must be greater than or equal to 5 \[uint32.gte\] - /// uint32 value = 1 [(buf.validate.field).uint32.gte = 5]; + /// uint32 value = 1 \[(buf.validate.field).uint32.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[uint32.gte_lt\] - /// uint32 other_value = 2 [(buf.validate.field).uint32 = { gte: 5, lt: 10 }]; + /// uint32 other_value = 2 \[(buf.validate.field).uint32 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[uint32.gte_lt_exclusive\] - /// uint32 another_value = 3 [(buf.validate.field).uint32 = { gte: 10, lt: 5 }]; + /// uint32 another_value = 3 \[(buf.validate.field).uint32 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(uint32, optional, tag="5")] @@ -749,8 +749,8 @@ pub struct UInt32Rules { /// /// ```proto /// message MyUInt32 { - /// // value must be in list [1, 2, 3] - /// repeated uint32 value = 1 (buf.validate.field).uint32 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated uint32 value = 1 (buf.validate.field).uint32 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(uint32, repeated, packed="false", tag="6")] @@ -761,8 +761,8 @@ pub struct UInt32Rules { /// /// ```proto /// message MyUInt32 { - /// // value must not be in list [1, 2, 3] - /// repeated uint32 value = 1 (buf.validate.field).uint32 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated uint32 value = 1 (buf.validate.field).uint32 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(uint32, repeated, packed="false", tag="7")] @@ -779,7 +779,7 @@ pub struct UInt64Rules { /// ```proto /// message MyUInt64 { /// // value must equal 42 - /// uint64 value = 1 [(buf.validate.field).uint64.const = 42]; + /// uint64 value = 1 \[(buf.validate.field).uint64.const = 42\]; /// } /// ``` #[prost(uint64, optional, tag="1")] @@ -791,7 +791,7 @@ pub struct UInt64Rules { /// ```proto /// message MyUInt64 { /// // value must be less than 10 - /// uint64 value = 1 [(buf.validate.field).uint64.lt = 10]; + /// uint64 value = 1 \[(buf.validate.field).uint64.lt = 10\]; /// } /// ``` #[prost(uint64, optional, tag="2")] @@ -803,7 +803,7 @@ pub struct UInt64Rules { /// ```proto /// message MyUInt64 { /// // value must be less than or equal to 10 - /// uint64 value = 1 [(buf.validate.field).uint64.lte = 10]; + /// uint64 value = 1 \[(buf.validate.field).uint64.lte = 10\]; /// } /// ``` #[prost(uint64, optional, tag="3")] @@ -817,13 +817,13 @@ pub struct UInt64Rules { /// ```proto /// message MyUInt64 { /// // value must be greater than 5 \[uint64.gt\] - /// uint64 value = 1 [(buf.validate.field).uint64.gt = 5]; + /// uint64 value = 1 \[(buf.validate.field).uint64.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[uint64.gt_lt\] - /// uint64 other_value = 2 [(buf.validate.field).uint64 = { gt: 5, lt: 10 }]; + /// uint64 other_value = 2 \[(buf.validate.field).uint64 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[uint64.gt_lt_exclusive\] - /// uint64 another_value = 3 [(buf.validate.field).uint64 = { gt: 10, lt: 5 }]; + /// uint64 another_value = 3 \[(buf.validate.field).uint64 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(uint64, optional, tag="4")] @@ -837,13 +837,13 @@ pub struct UInt64Rules { /// ```proto /// message MyUInt64 { /// // value must be greater than or equal to 5 \[uint64.gte\] - /// uint64 value = 1 [(buf.validate.field).uint64.gte = 5]; + /// uint64 value = 1 \[(buf.validate.field).uint64.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[uint64.gte_lt\] - /// uint64 other_value = 2 [(buf.validate.field).uint64 = { gte: 5, lt: 10 }]; + /// uint64 other_value = 2 \[(buf.validate.field).uint64 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[uint64.gte_lt_exclusive\] - /// uint64 another_value = 3 [(buf.validate.field).uint64 = { gte: 10, lt: 5 }]; + /// uint64 another_value = 3 \[(buf.validate.field).uint64 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(uint64, optional, tag="5")] @@ -854,8 +854,8 @@ pub struct UInt64Rules { /// /// ```proto /// message MyUInt64 { - /// // value must be in list [1, 2, 3] - /// repeated uint64 value = 1 (buf.validate.field).uint64 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated uint64 value = 1 (buf.validate.field).uint64 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(uint64, repeated, packed="false", tag="6")] @@ -866,8 +866,8 @@ pub struct UInt64Rules { /// /// ```proto /// message MyUInt64 { - /// // value must not be in list [1, 2, 3] - /// repeated uint64 value = 1 (buf.validate.field).uint64 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated uint64 value = 1 (buf.validate.field).uint64 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(uint64, repeated, packed="false", tag="7")] @@ -883,7 +883,7 @@ pub struct SInt32Rules { /// ```proto /// message MySInt32 { /// // value must equal 42 - /// sint32 value = 1 [(buf.validate.field).sint32.const = 42]; + /// sint32 value = 1 \[(buf.validate.field).sint32.const = 42\]; /// } /// ``` #[prost(sint32, optional, tag="1")] @@ -895,7 +895,7 @@ pub struct SInt32Rules { /// ```proto /// message MySInt32 { /// // value must be less than 10 - /// sint32 value = 1 [(buf.validate.field).sint32.lt = 10]; + /// sint32 value = 1 \[(buf.validate.field).sint32.lt = 10\]; /// } /// ``` #[prost(sint32, optional, tag="2")] @@ -907,7 +907,7 @@ pub struct SInt32Rules { /// ```proto /// message MySInt32 { /// // value must be less than or equal to 10 - /// sint32 value = 1 [(buf.validate.field).sint32.lte = 10]; + /// sint32 value = 1 \[(buf.validate.field).sint32.lte = 10\]; /// } /// ``` #[prost(sint32, optional, tag="3")] @@ -921,13 +921,13 @@ pub struct SInt32Rules { /// ```proto /// message MySInt32 { /// // value must be greater than 5 \[sint32.gt\] - /// sint32 value = 1 [(buf.validate.field).sint32.gt = 5]; + /// sint32 value = 1 \[(buf.validate.field).sint32.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[sint32.gt_lt\] - /// sint32 other_value = 2 [(buf.validate.field).sint32 = { gt: 5, lt: 10 }]; + /// sint32 other_value = 2 \[(buf.validate.field).sint32 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[sint32.gt_lt_exclusive\] - /// sint32 another_value = 3 [(buf.validate.field).sint32 = { gt: 10, lt: 5 }]; + /// sint32 another_value = 3 \[(buf.validate.field).sint32 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(sint32, optional, tag="4")] @@ -941,13 +941,13 @@ pub struct SInt32Rules { /// ```proto /// message MySInt32 { /// // value must be greater than or equal to 5 \[sint32.gte\] - /// sint32 value = 1 [(buf.validate.field).sint32.gte = 5]; + /// sint32 value = 1 \[(buf.validate.field).sint32.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[sint32.gte_lt\] - /// sint32 other_value = 2 [(buf.validate.field).sint32 = { gte: 5, lt: 10 }]; + /// sint32 other_value = 2 \[(buf.validate.field).sint32 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[sint32.gte_lt_exclusive\] - /// sint32 another_value = 3 [(buf.validate.field).sint32 = { gte: 10, lt: 5 }]; + /// sint32 another_value = 3 \[(buf.validate.field).sint32 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(sint32, optional, tag="5")] @@ -958,8 +958,8 @@ pub struct SInt32Rules { /// /// ```proto /// message MySInt32 { - /// // value must be in list [1, 2, 3] - /// repeated sint32 value = 1 (buf.validate.field).sint32 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated sint32 value = 1 (buf.validate.field).sint32 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(sint32, repeated, packed="false", tag="6")] @@ -970,8 +970,8 @@ pub struct SInt32Rules { /// /// ```proto /// message MySInt32 { - /// // value must not be in list [1, 2, 3] - /// repeated sint32 value = 1 (buf.validate.field).sint32 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated sint32 value = 1 (buf.validate.field).sint32 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(sint32, repeated, packed="false", tag="7")] @@ -987,7 +987,7 @@ pub struct SInt64Rules { /// ```proto /// message MySInt64 { /// // value must equal 42 - /// sint64 value = 1 [(buf.validate.field).sint64.const = 42]; + /// sint64 value = 1 \[(buf.validate.field).sint64.const = 42\]; /// } /// ``` #[prost(sint64, optional, tag="1")] @@ -999,7 +999,7 @@ pub struct SInt64Rules { /// ```proto /// message MySInt64 { /// // value must be less than 10 - /// sint64 value = 1 [(buf.validate.field).sint64.lt = 10]; + /// sint64 value = 1 \[(buf.validate.field).sint64.lt = 10\]; /// } /// ``` #[prost(sint64, optional, tag="2")] @@ -1011,7 +1011,7 @@ pub struct SInt64Rules { /// ```proto /// message MySInt64 { /// // value must be less than or equal to 10 - /// sint64 value = 1 [(buf.validate.field).sint64.lte = 10]; + /// sint64 value = 1 \[(buf.validate.field).sint64.lte = 10\]; /// } /// ``` #[prost(sint64, optional, tag="3")] @@ -1025,13 +1025,13 @@ pub struct SInt64Rules { /// ```proto /// message MySInt64 { /// // value must be greater than 5 \[sint64.gt\] - /// sint64 value = 1 [(buf.validate.field).sint64.gt = 5]; + /// sint64 value = 1 \[(buf.validate.field).sint64.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[sint64.gt_lt\] - /// sint64 other_value = 2 [(buf.validate.field).sint64 = { gt: 5, lt: 10 }]; + /// sint64 other_value = 2 \[(buf.validate.field).sint64 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[sint64.gt_lt_exclusive\] - /// sint64 another_value = 3 [(buf.validate.field).sint64 = { gt: 10, lt: 5 }]; + /// sint64 another_value = 3 \[(buf.validate.field).sint64 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(sint64, optional, tag="4")] @@ -1045,13 +1045,13 @@ pub struct SInt64Rules { /// ```proto /// message MySInt64 { /// // value must be greater than or equal to 5 \[sint64.gte\] - /// sint64 value = 1 [(buf.validate.field).sint64.gte = 5]; + /// sint64 value = 1 \[(buf.validate.field).sint64.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[sint64.gte_lt\] - /// sint64 other_value = 2 [(buf.validate.field).sint64 = { gte: 5, lt: 10 }]; + /// sint64 other_value = 2 \[(buf.validate.field).sint64 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[sint64.gte_lt_exclusive\] - /// sint64 another_value = 3 [(buf.validate.field).sint64 = { gte: 10, lt: 5 }]; + /// sint64 another_value = 3 \[(buf.validate.field).sint64 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(sint64, optional, tag="5")] @@ -1062,8 +1062,8 @@ pub struct SInt64Rules { /// /// ```proto /// message MySInt64 { - /// // value must be in list [1, 2, 3] - /// repeated sint64 value = 1 (buf.validate.field).sint64 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated sint64 value = 1 (buf.validate.field).sint64 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(sint64, repeated, packed="false", tag="6")] @@ -1074,8 +1074,8 @@ pub struct SInt64Rules { /// /// ```proto /// message MySInt64 { - /// // value must not be in list [1, 2, 3] - /// repeated sint64 value = 1 (buf.validate.field).sint64 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated sint64 value = 1 (buf.validate.field).sint64 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(sint64, repeated, packed="false", tag="7")] @@ -1091,7 +1091,7 @@ pub struct Fixed32Rules { /// ```proto /// message MyFixed32 { /// // value must equal 42 - /// fixed32 value = 1 [(buf.validate.field).fixed32.const = 42]; + /// fixed32 value = 1 \[(buf.validate.field).fixed32.const = 42\]; /// } /// ``` #[prost(fixed32, optional, tag="1")] @@ -1103,7 +1103,7 @@ pub struct Fixed32Rules { /// ```proto /// message MyFixed32 { /// // value must be less than 10 - /// fixed32 value = 1 [(buf.validate.field).fixed32.lt = 10]; + /// fixed32 value = 1 \[(buf.validate.field).fixed32.lt = 10\]; /// } /// ``` #[prost(fixed32, optional, tag="2")] @@ -1115,7 +1115,7 @@ pub struct Fixed32Rules { /// ```proto /// message MyFixed32 { /// // value must be less than or equal to 10 - /// fixed32 value = 1 [(buf.validate.field).fixed32.lte = 10]; + /// fixed32 value = 1 \[(buf.validate.field).fixed32.lte = 10\]; /// } /// ``` #[prost(fixed32, optional, tag="3")] @@ -1129,13 +1129,13 @@ pub struct Fixed32Rules { /// ```proto /// message MyFixed32 { /// // value must be greater than 5 \[fixed32.gt\] - /// fixed32 value = 1 [(buf.validate.field).fixed32.gt = 5]; + /// fixed32 value = 1 \[(buf.validate.field).fixed32.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[fixed32.gt_lt\] - /// fixed32 other_value = 2 [(buf.validate.field).fixed32 = { gt: 5, lt: 10 }]; + /// fixed32 other_value = 2 \[(buf.validate.field).fixed32 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[fixed32.gt_lt_exclusive\] - /// fixed32 another_value = 3 [(buf.validate.field).fixed32 = { gt: 10, lt: 5 }]; + /// fixed32 another_value = 3 \[(buf.validate.field).fixed32 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(fixed32, optional, tag="4")] @@ -1149,13 +1149,13 @@ pub struct Fixed32Rules { /// ```proto /// message MyFixed32 { /// // value must be greater than or equal to 5 \[fixed32.gte\] - /// fixed32 value = 1 [(buf.validate.field).fixed32.gte = 5]; + /// fixed32 value = 1 \[(buf.validate.field).fixed32.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[fixed32.gte_lt\] - /// fixed32 other_value = 2 [(buf.validate.field).fixed32 = { gte: 5, lt: 10 }]; + /// fixed32 other_value = 2 \[(buf.validate.field).fixed32 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[fixed32.gte_lt_exclusive\] - /// fixed32 another_value = 3 [(buf.validate.field).fixed32 = { gte: 10, lt: 5 }]; + /// fixed32 another_value = 3 \[(buf.validate.field).fixed32 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(fixed32, optional, tag="5")] @@ -1166,8 +1166,8 @@ pub struct Fixed32Rules { /// /// ```proto /// message MyFixed32 { - /// // value must be in list [1, 2, 3] - /// repeated fixed32 value = 1 (buf.validate.field).fixed32 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated fixed32 value = 1 (buf.validate.field).fixed32 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(fixed32, repeated, packed="false", tag="6")] @@ -1178,8 +1178,8 @@ pub struct Fixed32Rules { /// /// ```proto /// message MyFixed32 { - /// // value must not be in list [1, 2, 3] - /// repeated fixed32 value = 1 (buf.validate.field).fixed32 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated fixed32 value = 1 (buf.validate.field).fixed32 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(fixed32, repeated, packed="false", tag="7")] @@ -1195,7 +1195,7 @@ pub struct Fixed64Rules { /// ```proto /// message MyFixed64 { /// // value must equal 42 - /// fixed64 value = 1 [(buf.validate.field).fixed64.const = 42]; + /// fixed64 value = 1 \[(buf.validate.field).fixed64.const = 42\]; /// } /// ``` #[prost(fixed64, optional, tag="1")] @@ -1207,7 +1207,7 @@ pub struct Fixed64Rules { /// ```proto /// message MyFixed64 { /// // value must be less than 10 - /// fixed64 value = 1 [(buf.validate.field).fixed64.lt = 10]; + /// fixed64 value = 1 \[(buf.validate.field).fixed64.lt = 10\]; /// } /// ``` #[prost(fixed64, optional, tag="2")] @@ -1219,7 +1219,7 @@ pub struct Fixed64Rules { /// ```proto /// message MyFixed64 { /// // value must be less than or equal to 10 - /// fixed64 value = 1 [(buf.validate.field).fixed64.lte = 10]; + /// fixed64 value = 1 \[(buf.validate.field).fixed64.lte = 10\]; /// } /// ``` #[prost(fixed64, optional, tag="3")] @@ -1233,13 +1233,13 @@ pub struct Fixed64Rules { /// ```proto /// message MyFixed64 { /// // value must be greater than 5 \[fixed64.gt\] - /// fixed64 value = 1 [(buf.validate.field).fixed64.gt = 5]; + /// fixed64 value = 1 \[(buf.validate.field).fixed64.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[fixed64.gt_lt\] - /// fixed64 other_value = 2 [(buf.validate.field).fixed64 = { gt: 5, lt: 10 }]; + /// fixed64 other_value = 2 \[(buf.validate.field).fixed64 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[fixed64.gt_lt_exclusive\] - /// fixed64 another_value = 3 [(buf.validate.field).fixed64 = { gt: 10, lt: 5 }]; + /// fixed64 another_value = 3 \[(buf.validate.field).fixed64 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(fixed64, optional, tag="4")] @@ -1253,13 +1253,13 @@ pub struct Fixed64Rules { /// ```proto /// message MyFixed64 { /// // value must be greater than or equal to 5 \[fixed64.gte\] - /// fixed64 value = 1 [(buf.validate.field).fixed64.gte = 5]; + /// fixed64 value = 1 \[(buf.validate.field).fixed64.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[fixed64.gte_lt\] - /// fixed64 other_value = 2 [(buf.validate.field).fixed64 = { gte: 5, lt: 10 }]; + /// fixed64 other_value = 2 \[(buf.validate.field).fixed64 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[fixed64.gte_lt_exclusive\] - /// fixed64 another_value = 3 [(buf.validate.field).fixed64 = { gte: 10, lt: 5 }]; + /// fixed64 another_value = 3 \[(buf.validate.field).fixed64 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(fixed64, optional, tag="5")] @@ -1270,8 +1270,8 @@ pub struct Fixed64Rules { /// /// ```proto /// message MyFixed64 { - /// // value must be in list [1, 2, 3] - /// repeated fixed64 value = 1 (buf.validate.field).fixed64 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated fixed64 value = 1 (buf.validate.field).fixed64 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(fixed64, repeated, packed="false", tag="6")] @@ -1282,8 +1282,8 @@ pub struct Fixed64Rules { /// /// ```proto /// message MyFixed64 { - /// // value must not be in list [1, 2, 3] - /// repeated fixed64 value = 1 (buf.validate.field).fixed64 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated fixed64 value = 1 (buf.validate.field).fixed64 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(fixed64, repeated, packed="false", tag="7")] @@ -1299,7 +1299,7 @@ pub struct SFixed32Rules { /// ```proto /// message MySFixed32 { /// // value must equal 42 - /// sfixed32 value = 1 [(buf.validate.field).sfixed32.const = 42]; + /// sfixed32 value = 1 \[(buf.validate.field).sfixed32.const = 42\]; /// } /// ``` #[prost(sfixed32, optional, tag="1")] @@ -1311,7 +1311,7 @@ pub struct SFixed32Rules { /// ```proto /// message MySFixed32 { /// // value must be less than 10 - /// sfixed32 value = 1 [(buf.validate.field).sfixed32.lt = 10]; + /// sfixed32 value = 1 \[(buf.validate.field).sfixed32.lt = 10\]; /// } /// ``` #[prost(sfixed32, optional, tag="2")] @@ -1323,7 +1323,7 @@ pub struct SFixed32Rules { /// ```proto /// message MySFixed32 { /// // value must be less than or equal to 10 - /// sfixed32 value = 1 [(buf.validate.field).sfixed32.lte = 10]; + /// sfixed32 value = 1 \[(buf.validate.field).sfixed32.lte = 10\]; /// } /// ``` #[prost(sfixed32, optional, tag="3")] @@ -1337,13 +1337,13 @@ pub struct SFixed32Rules { /// ```proto /// message MySFixed32 { /// // value must be greater than 5 \[sfixed32.gt\] - /// sfixed32 value = 1 [(buf.validate.field).sfixed32.gt = 5]; + /// sfixed32 value = 1 \[(buf.validate.field).sfixed32.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[sfixed32.gt_lt\] - /// sfixed32 other_value = 2 [(buf.validate.field).sfixed32 = { gt: 5, lt: 10 }]; + /// sfixed32 other_value = 2 \[(buf.validate.field).sfixed32 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[sfixed32.gt_lt_exclusive\] - /// sfixed32 another_value = 3 [(buf.validate.field).sfixed32 = { gt: 10, lt: 5 }]; + /// sfixed32 another_value = 3 \[(buf.validate.field).sfixed32 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(sfixed32, optional, tag="4")] @@ -1357,13 +1357,13 @@ pub struct SFixed32Rules { /// ```proto /// message MySFixed32 { /// // value must be greater than or equal to 5 \[sfixed32.gte\] - /// sfixed32 value = 1 [(buf.validate.field).sfixed32.gte = 5]; + /// sfixed32 value = 1 \[(buf.validate.field).sfixed32.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[sfixed32.gte_lt\] - /// sfixed32 other_value = 2 [(buf.validate.field).sfixed32 = { gte: 5, lt: 10 }]; + /// sfixed32 other_value = 2 \[(buf.validate.field).sfixed32 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[sfixed32.gte_lt_exclusive\] - /// sfixed32 another_value = 3 [(buf.validate.field).sfixed32 = { gte: 10, lt: 5 }]; + /// sfixed32 another_value = 3 \[(buf.validate.field).sfixed32 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(sfixed32, optional, tag="5")] @@ -1374,8 +1374,8 @@ pub struct SFixed32Rules { /// /// ```proto /// message MySFixed32 { - /// // value must be in list [1, 2, 3] - /// repeated sfixed32 value = 1 (buf.validate.field).sfixed32 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated sfixed32 value = 1 (buf.validate.field).sfixed32 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(sfixed32, repeated, packed="false", tag="6")] @@ -1386,8 +1386,8 @@ pub struct SFixed32Rules { /// /// ```proto /// message MySFixed32 { - /// // value must not be in list [1, 2, 3] - /// repeated sfixed32 value = 1 (buf.validate.field).sfixed32 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated sfixed32 value = 1 (buf.validate.field).sfixed32 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(sfixed32, repeated, packed="false", tag="7")] @@ -1403,7 +1403,7 @@ pub struct SFixed64Rules { /// ```proto /// message MySFixed64 { /// // value must equal 42 - /// sfixed64 value = 1 [(buf.validate.field).sfixed64.const = 42]; + /// sfixed64 value = 1 \[(buf.validate.field).sfixed64.const = 42\]; /// } /// ``` #[prost(sfixed64, optional, tag="1")] @@ -1415,7 +1415,7 @@ pub struct SFixed64Rules { /// ```proto /// message MySFixed64 { /// // value must be less than 10 - /// sfixed64 value = 1 [(buf.validate.field).sfixed64.lt = 10]; + /// sfixed64 value = 1 \[(buf.validate.field).sfixed64.lt = 10\]; /// } /// ``` #[prost(sfixed64, optional, tag="2")] @@ -1427,7 +1427,7 @@ pub struct SFixed64Rules { /// ```proto /// message MySFixed64 { /// // value must be less than or equal to 10 - /// sfixed64 value = 1 [(buf.validate.field).sfixed64.lte = 10]; + /// sfixed64 value = 1 \[(buf.validate.field).sfixed64.lte = 10\]; /// } /// ``` #[prost(sfixed64, optional, tag="3")] @@ -1441,13 +1441,13 @@ pub struct SFixed64Rules { /// ```proto /// message MySFixed64 { /// // value must be greater than 5 \[sfixed64.gt\] - /// sfixed64 value = 1 [(buf.validate.field).sfixed64.gt = 5]; + /// sfixed64 value = 1 \[(buf.validate.field).sfixed64.gt = 5\]; /// /// // value must be greater than 5 and less than 10 \[sfixed64.gt_lt\] - /// sfixed64 other_value = 2 [(buf.validate.field).sfixed64 = { gt: 5, lt: 10 }]; + /// sfixed64 other_value = 2 \[(buf.validate.field).sfixed64 = { gt: 5, lt: 10 }\]; /// /// // value must be greater than 10 or less than 5 \[sfixed64.gt_lt_exclusive\] - /// sfixed64 another_value = 3 [(buf.validate.field).sfixed64 = { gt: 10, lt: 5 }]; + /// sfixed64 another_value = 3 \[(buf.validate.field).sfixed64 = { gt: 10, lt: 5 }\]; /// } /// ``` #[prost(sfixed64, optional, tag="4")] @@ -1461,13 +1461,13 @@ pub struct SFixed64Rules { /// ```proto /// message MySFixed64 { /// // value must be greater than or equal to 5 \[sfixed64.gte\] - /// sfixed64 value = 1 [(buf.validate.field).sfixed64.gte = 5]; + /// sfixed64 value = 1 \[(buf.validate.field).sfixed64.gte = 5\]; /// /// // value must be greater than or equal to 5 and less than 10 \[sfixed64.gte_lt\] - /// sfixed64 other_value = 2 [(buf.validate.field).sfixed64 = { gte: 5, lt: 10 }]; + /// sfixed64 other_value = 2 \[(buf.validate.field).sfixed64 = { gte: 5, lt: 10 }\]; /// /// // value must be greater than or equal to 10 or less than 5 \[sfixed64.gte_lt_exclusive\] - /// sfixed64 another_value = 3 [(buf.validate.field).sfixed64 = { gte: 10, lt: 5 }]; + /// sfixed64 another_value = 3 \[(buf.validate.field).sfixed64 = { gte: 10, lt: 5 }\]; /// } /// ``` #[prost(sfixed64, optional, tag="5")] @@ -1478,8 +1478,8 @@ pub struct SFixed64Rules { /// /// ```proto /// message MySFixed64 { - /// // value must be in list [1, 2, 3] - /// repeated sfixed64 value = 1 (buf.validate.field).sfixed64 = { in: [1, 2, 3] }; + /// // value must be in list \[1, 2, 3\] + /// repeated sfixed64 value = 1 (buf.validate.field).sfixed64 = { in: \[1, 2, 3\] }; /// } /// ``` #[prost(sfixed64, repeated, packed="false", tag="6")] @@ -1490,8 +1490,8 @@ pub struct SFixed64Rules { /// /// ```proto /// message MySFixed64 { - /// // value must not be in list [1, 2, 3] - /// repeated sfixed64 value = 1 (buf.validate.field).sfixed64 = { not_in: [1, 2, 3] }; + /// // value must not be in list \[1, 2, 3\] + /// repeated sfixed64 value = 1 (buf.validate.field).sfixed64 = { not_in: \[1, 2, 3\] }; /// } /// ``` #[prost(sfixed64, repeated, packed="false", tag="7")] @@ -1508,7 +1508,7 @@ pub struct BoolRules { /// ```proto /// message MyBool { /// // value must equal true - /// bool value = 1 [(buf.validate.field).bool.const = true]; + /// bool value = 1 \[(buf.validate.field).bool.const = true\]; /// } /// ``` #[prost(bool, optional, tag="1")] @@ -1525,7 +1525,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value must equal `hello` - /// string value = 1 [(buf.validate.field).string.const = "hello"]; + /// string value = 1 \[(buf.validate.field).string.const = "hello"\]; /// } /// ``` #[prost(string, optional, tag="1")] @@ -1538,7 +1538,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value length must be 5 characters - /// string value = 1 [(buf.validate.field).string.len = 5]; + /// string value = 1 \[(buf.validate.field).string.len = 5\]; /// } /// ``` #[prost(uint64, optional, tag="19")] @@ -1551,7 +1551,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value length must be at least 3 characters - /// string value = 1 [(buf.validate.field).string.min_len = 3]; + /// string value = 1 \[(buf.validate.field).string.min_len = 3\]; /// } /// ``` #[prost(uint64, optional, tag="2")] @@ -1564,7 +1564,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value length must be at most 10 characters - /// string value = 1 [(buf.validate.field).string.max_len = 10]; + /// string value = 1 \[(buf.validate.field).string.max_len = 10\]; /// } /// ``` #[prost(uint64, optional, tag="3")] @@ -1576,7 +1576,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value length must be 6 bytes - /// string value = 1 [(buf.validate.field).string.len_bytes = 6]; + /// string value = 1 \[(buf.validate.field).string.len_bytes = 6\]; /// } /// ``` #[prost(uint64, optional, tag="20")] @@ -1588,7 +1588,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value length must be at least 4 bytes - /// string value = 1 [(buf.validate.field).string.min_bytes = 4]; + /// string value = 1 \[(buf.validate.field).string.min_bytes = 4\]; /// } /// /// ``` @@ -1601,7 +1601,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value length must be at most 8 bytes - /// string value = 1 [(buf.validate.field).string.max_bytes = 8]; + /// string value = 1 \[(buf.validate.field).string.max_bytes = 8\]; /// } /// ``` #[prost(uint64, optional, tag="5")] @@ -1614,7 +1614,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value does not match regex pattern `^\[a-zA-Z\]//$` - /// string value = 1 [(buf.validate.field).string.pattern = "^\[a-zA-Z]//$"\]; + /// string value = 1 \[(buf.validate.field).string.pattern = "^[a-zA-Z\]//$"]; /// } /// ``` #[prost(string, optional, tag="6")] @@ -1627,7 +1627,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value does not have prefix `pre` - /// string value = 1 [(buf.validate.field).string.prefix = "pre"]; + /// string value = 1 \[(buf.validate.field).string.prefix = "pre"\]; /// } /// ``` #[prost(string, optional, tag="7")] @@ -1639,7 +1639,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value does not have suffix `post` - /// string value = 1 [(buf.validate.field).string.suffix = "post"]; + /// string value = 1 \[(buf.validate.field).string.suffix = "post"\]; /// } /// ``` #[prost(string, optional, tag="8")] @@ -1651,7 +1651,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value does not contain substring `inside`. - /// string value = 1 [(buf.validate.field).string.contains = "inside"]; + /// string value = 1 \[(buf.validate.field).string.contains = "inside"\]; /// } /// ``` #[prost(string, optional, tag="9")] @@ -1663,7 +1663,7 @@ pub struct StringRules { /// ```proto /// message MyString { /// // value contains substring `inside`. - /// string value = 1 [(buf.validate.field).string.not_contains = "inside"]; + /// string value = 1 \[(buf.validate.field).string.not_contains = "inside"\]; /// } /// ``` #[prost(string, optional, tag="23")] @@ -1674,8 +1674,8 @@ pub struct StringRules { /// /// ```proto /// message MyString { - /// // value must be in list ["apple", "banana"] - /// repeated string value = 1 [(buf.validate.field).string.in = "apple", (buf.validate.field).string.in = "banana"]; + /// // value must be in list \["apple", "banana"\] + /// repeated string value = 1 \[(buf.validate.field).string.in = "apple", (buf.validate.field).string.in = "banana"\]; /// } /// ``` #[prost(string, repeated, tag="10")] @@ -1685,22 +1685,22 @@ pub struct StringRules { /// an error message will be generated. /// ```proto /// message MyString { - /// // value must not be in list ["orange", "grape"] - /// repeated string value = 1 [(buf.validate.field).string.not_in = "orange", (buf.validate.field).string.not_in = "grape"]; + /// // value must not be in list \["orange", "grape"\] + /// repeated string value = 1 \[(buf.validate.field).string.not_in = "orange", (buf.validate.field).string.not_in = "grape"\]; /// } /// ``` #[prost(string, repeated, tag="11")] pub not_in: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, /// This applies to regexes `HTTP_HEADER_NAME` and `HTTP_HEADER_VALUE` to /// enable strict header validation. By default, this is true, and HTTP header - /// validations are \[RFC-compliant\](). Setting to false will enable looser + /// validations are [RFC-compliant](). Setting to false will enable looser /// validations that only disallow `\r\n\0` characters, which can be used to /// bypass header matching rules. /// /// ```proto /// message MyString { /// // The field `value` must have be a valid HTTP headers, but not enforced with strict rules. - /// string value = 1 [(buf.validate.field).string.strict = false]; + /// string value = 1 \[(buf.validate.field).string.strict = false\]; /// } /// ``` #[prost(bool, optional, tag="25")] @@ -1724,7 +1724,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid email address - /// string value = 1 [(buf.validate.field).string.email = true]; + /// string value = 1 \[(buf.validate.field).string.email = true\]; /// } /// ``` #[prost(bool, tag="12")] @@ -1737,7 +1737,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid hostname - /// string value = 1 [(buf.validate.field).string.hostname = true]; + /// string value = 1 \[(buf.validate.field).string.hostname = true\]; /// } /// ``` #[prost(bool, tag="13")] @@ -1750,7 +1750,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid IP address - /// string value = 1 [(buf.validate.field).string.ip = true]; + /// string value = 1 \[(buf.validate.field).string.ip = true\]; /// } /// ``` #[prost(bool, tag="14")] @@ -1762,7 +1762,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid IPv4 address - /// string value = 1 [(buf.validate.field).string.ipv4 = true]; + /// string value = 1 \[(buf.validate.field).string.ipv4 = true\]; /// } /// ``` #[prost(bool, tag="15")] @@ -1774,7 +1774,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid IPv6 address - /// string value = 1 [(buf.validate.field).string.ipv6 = true]; + /// string value = 1 \[(buf.validate.field).string.ipv6 = true\]; /// } /// ``` #[prost(bool, tag="16")] @@ -1786,7 +1786,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid URI - /// string value = 1 [(buf.validate.field).string.uri = true]; + /// string value = 1 \[(buf.validate.field).string.uri = true\]; /// } /// ``` #[prost(bool, tag="17")] @@ -1798,7 +1798,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid URI - /// string value = 1 [(buf.validate.field).string.uri_ref = true]; + /// string value = 1 \[(buf.validate.field).string.uri_ref = true\]; /// } /// ``` #[prost(bool, tag="18")] @@ -1812,7 +1812,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid hostname, or ip address - /// string value = 1 [(buf.validate.field).string.address = true]; + /// string value = 1 \[(buf.validate.field).string.address = true\]; /// } /// ``` #[prost(bool, tag="21")] @@ -1824,7 +1824,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid UUID - /// string value = 1 [(buf.validate.field).string.uuid = true]; + /// string value = 1 \[(buf.validate.field).string.uuid = true\]; /// } /// ``` #[prost(bool, tag="22")] @@ -1836,7 +1836,7 @@ pub mod string_rules { /// ```proto /// message MyString { /// // value must be a valid HTTP header value - /// string value = 1 [(buf.validate.field).string.well_known_regex = 2]; + /// string value = 1 \[(buf.validate.field).string.well_known_regex = 2\]; /// } /// ``` /// @@ -1864,7 +1864,7 @@ pub struct BytesRules { /// ```proto /// message MyBytes { /// // value must be "\x01\x02\x03\x04" - /// bytes value = 1 [(buf.validate.field).bytes.const = "\x01\x02\x03\x04"]; + /// bytes value = 1 \[(buf.validate.field).bytes.const = "\x01\x02\x03\x04"\]; /// } /// ``` #[prost(bytes="bytes", optional, tag="1")] @@ -1875,7 +1875,7 @@ pub struct BytesRules { /// ```proto /// message MyBytes { /// // value length must be 4 bytes. - /// optional bytes value = 1 [(buf.validate.field).bytes.len = 4]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.len = 4\]; /// } /// ``` #[prost(uint64, optional, tag="13")] @@ -1887,7 +1887,7 @@ pub struct BytesRules { /// ```proto /// message MyBytes { /// // value length must be at least 2 bytes. - /// optional bytes value = 1 [(buf.validate.field).bytes.min_len = 2]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.min_len = 2\]; /// } /// ``` #[prost(uint64, optional, tag="2")] @@ -1899,7 +1899,7 @@ pub struct BytesRules { /// ```proto /// message MyBytes { /// // value must be at most 6 bytes. - /// optional bytes value = 1 [(buf.validate.field).bytes.max_len = 6]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.max_len = 6\]; /// } /// ``` #[prost(uint64, optional, tag="3")] @@ -1913,7 +1913,7 @@ pub struct BytesRules { /// ```proto /// message MyBytes { /// // value must match regex pattern "^\[a-zA-Z0-9\]+$". - /// optional bytes value = 1 [(buf.validate.field).bytes.pattern = "^\[a-zA-Z0-9]+$"\]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.pattern = "^[a-zA-Z0-9\]+$"]; /// } /// ``` #[prost(string, optional, tag="4")] @@ -1925,7 +1925,7 @@ pub struct BytesRules { /// ```proto /// message MyBytes { /// // value does not have prefix \x01\x02 - /// optional bytes value = 1 [(buf.validate.field).bytes.prefix = "\x01\x02"]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.prefix = "\x01\x02"\]; /// } /// ``` #[prost(bytes="bytes", optional, tag="5")] @@ -1937,7 +1937,7 @@ pub struct BytesRules { /// ```proto /// message MyBytes { /// // value does not have suffix \x03\x04 - /// optional bytes value = 1 [(buf.validate.field).bytes.suffix = "\x03\x04"]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.suffix = "\x03\x04"\]; /// } /// ``` #[prost(bytes="bytes", optional, tag="6")] @@ -1949,7 +1949,7 @@ pub struct BytesRules { /// ```protobuf /// message MyBytes { /// // value does not contain \x02\x03 - /// optional bytes value = 1 [(buf.validate.field).bytes.contains = "\x02\x03"]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.contains = "\x02\x03"\]; /// } /// ``` #[prost(bytes="bytes", optional, tag="7")] @@ -1960,8 +1960,8 @@ pub struct BytesRules { /// /// ```protobuf /// message MyBytes { - /// // value must in ["\x01\x02", "\x02\x03", "\x03\x04"] - /// optional bytes value = 1 [(buf.validate.field).bytes.in = {"\x01\x02", "\x02\x03", "\x03\x04"}]; + /// // value must in \["\x01\x02", "\x02\x03", "\x03\x04"\] + /// optional bytes value = 1 \[(buf.validate.field).bytes.in = {"\x01\x02", "\x02\x03", "\x03\x04"}\]; /// } /// ``` #[prost(bytes="bytes", repeated, tag="8")] @@ -1973,8 +1973,8 @@ pub struct BytesRules { /// /// ```proto /// message MyBytes { - /// // value must not in ["\x01\x02", "\x02\x03", "\x03\x04"] - /// optional bytes value = 1 [(buf.validate.field).bytes.not_in = {"\x01\x02", "\x02\x03", "\x03\x04"}]; + /// // value must not in \["\x01\x02", "\x02\x03", "\x03\x04"\] + /// optional bytes value = 1 \[(buf.validate.field).bytes.not_in = {"\x01\x02", "\x02\x03", "\x03\x04"}\]; /// } /// ``` #[prost(bytes="bytes", repeated, tag="9")] @@ -1997,7 +1997,7 @@ pub mod bytes_rules { /// ```proto /// message MyBytes { /// // value must be a valid IP address - /// optional bytes value = 1 [(buf.validate.field).bytes.ip = true]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.ip = true\]; /// } /// ``` #[prost(bool, tag="10")] @@ -2008,7 +2008,7 @@ pub mod bytes_rules { /// ```proto /// message MyBytes { /// // value must be a valid IPv4 address - /// optional bytes value = 1 [(buf.validate.field).bytes.ipv4 = true]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.ipv4 = true\]; /// } /// ``` #[prost(bool, tag="11")] @@ -2018,7 +2018,7 @@ pub mod bytes_rules { /// ```proto /// message MyBytes { /// // value must be a valid IPv6 address - /// optional bytes value = 1 [(buf.validate.field).bytes.ipv6 = true]; + /// optional bytes value = 1 \[(buf.validate.field).bytes.ipv6 = true\]; /// } /// ``` #[prost(bool, tag="12")] @@ -2041,7 +2041,7 @@ pub struct EnumRules { /// /// message MyMessage { /// // The field `value` must be exactly MY_ENUM_VALUE1. - /// MyEnum value = 1 [(buf.validate.field).enum.const = 1]; + /// MyEnum value = 1 \[(buf.validate.field).enum.const = 1\]; /// } /// ``` #[prost(int32, optional, tag="1")] @@ -2058,7 +2058,7 @@ pub struct EnumRules { /// /// message MyMessage { /// // The field `value` must be a defined value of MyEnum. - /// MyEnum value = 1 [(buf.validate.field).enum.defined_only = true]; + /// MyEnum value = 1 \[(buf.validate.field).enum.defined_only = true\]; /// } /// ``` #[prost(bool, optional, tag="2")] @@ -2076,7 +2076,7 @@ pub struct EnumRules { /// /// message MyMessage { /// // The field `value` must be equal to one of the specified values. - /// MyEnum value = 1 [(buf.validate.field).enum.in = {1, 2}]; + /// MyEnum value = 1 \[(buf.validate.field).enum.in = {1, 2}\]; /// } /// ``` #[prost(int32, repeated, packed="false", tag="3")] @@ -2094,7 +2094,7 @@ pub struct EnumRules { /// /// message MyMessage { /// // The field `value` must not be equal to any of the specified values. - /// MyEnum value = 1 [(buf.validate.field).enum.not_in = {1, 2}]; + /// MyEnum value = 1 \[(buf.validate.field).enum.not_in = {1, 2}\]; /// } /// ``` #[prost(int32, repeated, packed="false", tag="4")] @@ -2110,7 +2110,7 @@ pub struct RepeatedRules { /// ```proto /// message MyRepeated { /// // value must contain at least 2 items - /// repeated string value = 1 [(buf.validate.field).repeated.min_items = 2]; + /// repeated string value = 1 \[(buf.validate.field).repeated.min_items = 2\]; /// } /// ``` #[prost(uint64, optional, tag="1")] @@ -2123,7 +2123,7 @@ pub struct RepeatedRules { /// ```proto /// message MyRepeated { /// // value must contain no more than 3 item(s) - /// repeated string value = 1 [(buf.validate.field).repeated.max_items = 3]; + /// repeated string value = 1 \[(buf.validate.field).repeated.max_items = 3\]; /// } /// ``` #[prost(uint64, optional, tag="2")] @@ -2135,7 +2135,7 @@ pub struct RepeatedRules { /// ```proto /// message MyRepeated { /// // repeated value must contain unique items - /// repeated string value = 1 [(buf.validate.field).repeated.unique = true]; + /// repeated string value = 1 \[(buf.validate.field).repeated.unique = true\]; /// } /// ``` #[prost(bool, optional, tag="3")] @@ -2167,7 +2167,7 @@ pub struct MapRules { /// ```proto /// message MyMap { /// // The field `value` must have at least 2 key-value pairs. - /// map value = 1 [(buf.validate.field).map.min_pairs = 2]; + /// map value = 1 \[(buf.validate.field).map.min_pairs = 2\]; /// } /// ``` #[prost(uint64, optional, tag="1")] @@ -2178,7 +2178,7 @@ pub struct MapRules { /// ```proto /// message MyMap { /// // The field `value` must have at most 3 key-value pairs. - /// map value = 1 [(buf.validate.field).map.max_pairs = 3]; + /// map value = 1 \[(buf.validate.field).map.max_pairs = 3\]; /// } /// ``` #[prost(uint64, optional, tag="2")] @@ -2227,7 +2227,7 @@ pub struct AnyRules { /// ```proto /// message MyAny { /// // The `value` field must have a `type_url` equal to one of the specified values. - /// google.protobuf.Any value = 1 [(buf.validate.field).any.in = ["type.googleapis.com/MyType1", "type.googleapis.com/MyType2"]]; + /// google.protobuf.Any value = 1 \[(buf.validate.field).any.in = ["type.googleapis.com/MyType1", "type.googleapis.com/MyType2"]\]; /// } /// ``` #[prost(string, repeated, tag="2")] @@ -2237,7 +2237,7 @@ pub struct AnyRules { /// ```proto /// message MyAny { /// // The field `value` must not have a `type_url` equal to any of the specified values. - /// google.protobuf.Any value = 1 [(buf.validate.field).any.not_in = ["type.googleapis.com/ForbiddenType1", "type.googleapis.com/ForbiddenType2"]]; + /// google.protobuf.Any value = 1 \[(buf.validate.field).any.not_in = ["type.googleapis.com/ForbiddenType1", "type.googleapis.com/ForbiddenType2"]\]; /// } /// ``` #[prost(string, repeated, tag="3")] @@ -2254,7 +2254,7 @@ pub struct DurationRules { /// ```proto /// message MyDuration { /// // value must equal 5s - /// google.protobuf.Duration value = 1 [(buf.validate.field).duration.const = "5s"]; + /// google.protobuf.Duration value = 1 \[(buf.validate.field).duration.const = "5s"\]; /// } /// ``` #[prost(message, optional, tag="2")] @@ -2266,7 +2266,7 @@ pub struct DurationRules { /// ```proto /// message MyDuration { /// // value must be less than 5s - /// google.protobuf.Duration value = 1 [(buf.validate.field).duration.lt = "5s"]; + /// google.protobuf.Duration value = 1 \[(buf.validate.field).duration.lt = "5s"\]; /// } /// ``` #[prost(message, optional, tag="3")] @@ -2278,7 +2278,7 @@ pub struct DurationRules { /// ```proto /// message MyDuration { /// // value must be less than or equal to 10s - /// google.protobuf.Duration value = 1 [(buf.validate.field).duration.lte = "10s"]; + /// google.protobuf.Duration value = 1 \[(buf.validate.field).duration.lte = "10s"\]; /// } /// ``` #[prost(message, optional, tag="4")] @@ -2292,13 +2292,13 @@ pub struct DurationRules { /// ```proto /// message MyDuration { /// // duration must be greater than 5s \[duration.gt\] - /// google.protobuf.Duration value = 1 [(buf.validate.field).duration.gt = { seconds: 5 }]; + /// google.protobuf.Duration value = 1 \[(buf.validate.field).duration.gt = { seconds: 5 }\]; /// /// // duration must be greater than 5s and less than 10s \[duration.gt_lt\] - /// google.protobuf.Duration another_value = 2 [(buf.validate.field).duration = { gt: { seconds: 5 }, lt: { seconds: 10 } }]; + /// google.protobuf.Duration another_value = 2 \[(buf.validate.field).duration = { gt: { seconds: 5 }, lt: { seconds: 10 } }\]; /// /// // duration must be greater than 10s or less than 5s \[duration.gt_lt_exclusive\] - /// google.protobuf.Duration other_value = 3 [(buf.validate.field).duration = { gt: { seconds: 10 }, lt: { seconds: 5 } }]; + /// google.protobuf.Duration other_value = 3 \[(buf.validate.field).duration = { gt: { seconds: 10 }, lt: { seconds: 5 } }\]; /// } /// ``` #[prost(message, optional, tag="5")] @@ -2312,13 +2312,13 @@ pub struct DurationRules { /// ```proto /// message MyDuration { /// // duration must be greater than or equal to 5s \[duration.gte\] - /// google.protobuf.Duration value = 1 [(buf.validate.field).duration.gte = { seconds: 5 }]; + /// google.protobuf.Duration value = 1 \[(buf.validate.field).duration.gte = { seconds: 5 }\]; /// /// // duration must be greater than or equal to 5s and less than 10s \[duration.gte_lt\] - /// google.protobuf.Duration another_value = 2 [(buf.validate.field).duration = { gte: { seconds: 5 }, lt: { seconds: 10 } }]; + /// google.protobuf.Duration another_value = 2 \[(buf.validate.field).duration = { gte: { seconds: 5 }, lt: { seconds: 10 } }\]; /// /// // duration must be greater than or equal to 10s or less than 5s \[duration.gte_lt_exclusive\] - /// google.protobuf.Duration other_value = 3 [(buf.validate.field).duration = { gte: { seconds: 10 }, lt: { seconds: 5 } }]; + /// google.protobuf.Duration other_value = 3 \[(buf.validate.field).duration = { gte: { seconds: 10 }, lt: { seconds: 5 } }\]; /// } /// ``` #[prost(message, optional, tag="6")] @@ -2329,8 +2329,8 @@ pub struct DurationRules { /// /// ```proto /// message MyDuration { - /// // value must be in list [1s, 2s, 3s] - /// google.protobuf.Duration value = 1 [(buf.validate.field).duration.in = ["1s", "2s", "3s"]]; + /// // value must be in list \[1s, 2s, 3s\] + /// google.protobuf.Duration value = 1 \[(buf.validate.field).duration.in = ["1s", "2s", "3s"]\]; /// } /// ``` #[prost(message, repeated, tag="7")] @@ -2342,8 +2342,8 @@ pub struct DurationRules { /// /// ```proto /// message MyDuration { - /// // value must not be in list [1s, 2s, 3s] - /// google.protobuf.Duration value = 1 [(buf.validate.field).duration.not_in = ["1s", "2s", "3s"]]; + /// // value must not be in list \[1s, 2s, 3s\] + /// google.protobuf.Duration value = 1 \[(buf.validate.field).duration.not_in = ["1s", "2s", "3s"]\]; /// } /// ``` #[prost(message, repeated, tag="8")] @@ -2358,7 +2358,7 @@ pub struct TimestampRules { /// ```proto /// message MyTimestamp { /// // value must equal 2023-05-03T10:00:00Z - /// google.protobuf.Timestamp created_at = 1 [(buf.validate.field).timestamp.const = {seconds: 1727998800}]; + /// google.protobuf.Timestamp created_at = 1 \[(buf.validate.field).timestamp.const = {seconds: 1727998800}\]; /// } /// ``` #[prost(message, optional, tag="2")] @@ -2368,7 +2368,7 @@ pub struct TimestampRules { /// ```proto /// message MyDuration { /// // duration must be less than 'P3D' \[duration.lt\] - /// google.protobuf.Duration value = 1 [(buf.validate.field).duration.lt = { seconds: 259200 }]; + /// google.protobuf.Duration value = 1 \[(buf.validate.field).duration.lt = { seconds: 259200 }\]; /// } /// ``` #[prost(message, optional, tag="3")] @@ -2378,7 +2378,7 @@ pub struct TimestampRules { /// ```proto /// message MyTimestamp { /// // timestamp must be less than or equal to '2023-05-14T00:00:00Z' \[timestamp.lte\] - /// google.protobuf.Timestamp value = 1 [(buf.validate.field).timestamp.lte = { seconds: 1678867200 }]; + /// google.protobuf.Timestamp value = 1 \[(buf.validate.field).timestamp.lte = { seconds: 1678867200 }\]; /// } /// ``` #[prost(message, optional, tag="4")] @@ -2392,13 +2392,13 @@ pub struct TimestampRules { /// ```proto /// message MyTimestamp { /// // timestamp must be greater than '2023-01-01T00:00:00Z' \[timestamp.gt\] - /// google.protobuf.Timestamp value = 1 [(buf.validate.field).timestamp.gt = { seconds: 1672444800 }]; + /// google.protobuf.Timestamp value = 1 \[(buf.validate.field).timestamp.gt = { seconds: 1672444800 }\]; /// /// // timestamp must be greater than '2023-01-01T00:00:00Z' and less than '2023-01-02T00:00:00Z' \[timestamp.gt_lt\] - /// google.protobuf.Timestamp another_value = 2 [(buf.validate.field).timestamp = { gt: { seconds: 1672444800 }, lt: { seconds: 1672531200 } }]; + /// google.protobuf.Timestamp another_value = 2 \[(buf.validate.field).timestamp = { gt: { seconds: 1672444800 }, lt: { seconds: 1672531200 } }\]; /// /// // timestamp must be greater than '2023-01-02T00:00:00Z' or less than '2023-01-01T00:00:00Z' \[timestamp.gt_lt_exclusive\] - /// google.protobuf.Timestamp other_value = 3 [(buf.validate.field).timestamp = { gt: { seconds: 1672531200 }, lt: { seconds: 1672444800 } }]; + /// google.protobuf.Timestamp other_value = 3 \[(buf.validate.field).timestamp = { gt: { seconds: 1672531200 }, lt: { seconds: 1672444800 } }\]; /// } /// ``` #[prost(message, optional, tag="5")] @@ -2412,13 +2412,13 @@ pub struct TimestampRules { /// ```proto /// message MyTimestamp { /// // timestamp must be greater than or equal to '2023-01-01T00:00:00Z' \[timestamp.gte\] - /// google.protobuf.Timestamp value = 1 [(buf.validate.field).timestamp.gte = { seconds: 1672444800 }]; + /// google.protobuf.Timestamp value = 1 \[(buf.validate.field).timestamp.gte = { seconds: 1672444800 }\]; /// /// // timestamp must be greater than or equal to '2023-01-01T00:00:00Z' and less than '2023-01-02T00:00:00Z' \[timestamp.gte_lt\] - /// google.protobuf.Timestamp another_value = 2 [(buf.validate.field).timestamp = { gte: { seconds: 1672444800 }, lt: { seconds: 1672531200 } }]; + /// google.protobuf.Timestamp another_value = 2 \[(buf.validate.field).timestamp = { gte: { seconds: 1672444800 }, lt: { seconds: 1672531200 } }\]; /// /// // timestamp must be greater than or equal to '2023-01-02T00:00:00Z' or less than '2023-01-01T00:00:00Z' \[timestamp.gte_lt_exclusive\] - /// google.protobuf.Timestamp other_value = 3 [(buf.validate.field).timestamp = { gte: { seconds: 1672531200 }, lt: { seconds: 1672444800 } }]; + /// google.protobuf.Timestamp other_value = 3 \[(buf.validate.field).timestamp = { gte: { seconds: 1672531200 }, lt: { seconds: 1672444800 } }\]; /// } /// ``` #[prost(message, optional, tag="6")] @@ -2428,7 +2428,7 @@ pub struct TimestampRules { /// ```proto /// message MyTimestamp { /// // value must be less than now - /// google.protobuf.Timestamp created_at = 1 [(buf.validate.field).timestamp.lt_now = true]; + /// google.protobuf.Timestamp created_at = 1 \[(buf.validate.field).timestamp.lt_now = true\]; /// } /// ``` #[prost(bool, optional, tag="7")] @@ -2438,7 +2438,7 @@ pub struct TimestampRules { /// ```proto /// message MyTimestamp { /// // value must be greater than now - /// google.protobuf.Timestamp created_at = 1 [(buf.validate.field).timestamp.gt_now = true]; + /// google.protobuf.Timestamp created_at = 1 \[(buf.validate.field).timestamp.gt_now = true\]; /// } /// ``` #[prost(bool, optional, tag="8")] @@ -2448,7 +2448,7 @@ pub struct TimestampRules { /// ```proto /// message MyTimestamp { /// // value must be within 1 hour of now - /// google.protobuf.Timestamp created_at = 1 [(buf.validate.field).timestamp.within = {seconds: 3600}]; + /// google.protobuf.Timestamp created_at = 1 \[(buf.validate.field).timestamp.within = {seconds: 3600}\]; /// } /// ``` #[prost(message, optional, tag="9")] diff --git a/src/buf.validate.serde.rs b/src/buf.validate.serde.rs index 627b1e6e..604bfa45 100644 --- a/src/buf.validate.serde.rs +++ b/src/buf.validate.serde.rs @@ -77,25 +77,25 @@ impl<'de> serde::Deserialize<'de> for AnyRules { formatter.write_str("struct buf.validate.AnyRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::In => { if r#in__.is_some() { return Err(serde::de::Error::duplicate_field("in")); } - r#in__ = Some(map.next_value()?); + r#in__ = Some(map_.next_value()?); } GeneratedField::NotIn => { if not_in__.is_some() { return Err(serde::de::Error::duplicate_field("notIn")); } - not_in__ = Some(map.next_value()?); + not_in__ = Some(map_.next_value()?); } } } @@ -176,18 +176,18 @@ impl<'de> serde::Deserialize<'de> for BoolRules { formatter.write_str("struct buf.validate.BoolRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut r#const__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } - r#const__ = map.next_value()?; + r#const__ = map_.next_value()?; } } } @@ -242,27 +242,34 @@ impl serde::Serialize for BytesRules { } let mut struct_ser = serializer.serialize_struct("buf.validate.BytesRules", len)?; if let Some(v) = self.r#const.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("const", pbjson::private::base64::encode(&v).as_str())?; } if let Some(v) = self.len.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("len", ToString::to_string(&v).as_str())?; } if let Some(v) = self.min_len.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("minLen", ToString::to_string(&v).as_str())?; } if let Some(v) = self.max_len.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("maxLen", ToString::to_string(&v).as_str())?; } if let Some(v) = self.pattern.as_ref() { struct_ser.serialize_field("pattern", v)?; } if let Some(v) = self.prefix.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("prefix", pbjson::private::base64::encode(&v).as_str())?; } if let Some(v) = self.suffix.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("suffix", pbjson::private::base64::encode(&v).as_str())?; } if let Some(v) = self.contains.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("contains", pbjson::private::base64::encode(&v).as_str())?; } if !self.r#in.is_empty() { @@ -376,7 +383,7 @@ impl<'de> serde::Deserialize<'de> for BytesRules { formatter.write_str("struct buf.validate.BytesRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -391,14 +398,14 @@ impl<'de> serde::Deserialize<'de> for BytesRules { let mut r#in__ = None; let mut not_in__ = None; let mut well_known__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::BytesDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::BytesDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Len => { @@ -406,7 +413,7 @@ impl<'de> serde::Deserialize<'de> for BytesRules { return Err(serde::de::Error::duplicate_field("len")); } len__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::MinLen => { @@ -414,7 +421,7 @@ impl<'de> serde::Deserialize<'de> for BytesRules { return Err(serde::de::Error::duplicate_field("minLen")); } min_len__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::MaxLen => { @@ -422,21 +429,21 @@ impl<'de> serde::Deserialize<'de> for BytesRules { return Err(serde::de::Error::duplicate_field("maxLen")); } max_len__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Pattern => { if pattern__.is_some() { return Err(serde::de::Error::duplicate_field("pattern")); } - pattern__ = map.next_value()?; + pattern__ = map_.next_value()?; } GeneratedField::Prefix => { if prefix__.is_some() { return Err(serde::de::Error::duplicate_field("prefix")); } prefix__ = - map.next_value::<::std::option::Option<::pbjson::private::BytesDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::BytesDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Suffix => { @@ -444,7 +451,7 @@ impl<'de> serde::Deserialize<'de> for BytesRules { return Err(serde::de::Error::duplicate_field("suffix")); } suffix__ = - map.next_value::<::std::option::Option<::pbjson::private::BytesDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::BytesDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Contains => { @@ -452,7 +459,7 @@ impl<'de> serde::Deserialize<'de> for BytesRules { return Err(serde::de::Error::duplicate_field("contains")); } contains__ = - map.next_value::<::std::option::Option<::pbjson::private::BytesDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::BytesDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -460,7 +467,7 @@ impl<'de> serde::Deserialize<'de> for BytesRules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -469,7 +476,7 @@ impl<'de> serde::Deserialize<'de> for BytesRules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -477,19 +484,19 @@ impl<'de> serde::Deserialize<'de> for BytesRules { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("ip")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(bytes_rules::WellKnown::Ip); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(bytes_rules::WellKnown::Ip); } GeneratedField::Ipv4 => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("ipv4")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(bytes_rules::WellKnown::Ipv4); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(bytes_rules::WellKnown::Ipv4); } GeneratedField::Ipv6 => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("ipv6")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(bytes_rules::WellKnown::Ipv6); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(bytes_rules::WellKnown::Ipv6); } } } @@ -597,32 +604,32 @@ impl<'de> serde::Deserialize<'de> for Constraint { formatter.write_str("struct buf.validate.Constraint") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut message__ = None; let mut expression__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = Some(map.next_value()?); + id__ = Some(map_.next_value()?); } GeneratedField::Message => { if message__.is_some() { return Err(serde::de::Error::duplicate_field("message")); } - message__ = Some(map.next_value()?); + message__ = Some(map_.next_value()?); } GeneratedField::Expression => { if expression__.is_some() { return Err(serde::de::Error::duplicate_field("expression")); } - expression__ = Some(map.next_value()?); + expression__ = Some(map_.next_value()?); } } } @@ -759,7 +766,7 @@ impl<'de> serde::Deserialize<'de> for DoubleRules { formatter.write_str("struct buf.validate.DoubleRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -770,14 +777,14 @@ impl<'de> serde::Deserialize<'de> for DoubleRules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -785,7 +792,7 @@ impl<'de> serde::Deserialize<'de> for DoubleRules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -793,7 +800,7 @@ impl<'de> serde::Deserialize<'de> for DoubleRules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -801,7 +808,7 @@ impl<'de> serde::Deserialize<'de> for DoubleRules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -809,7 +816,7 @@ impl<'de> serde::Deserialize<'de> for DoubleRules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -817,7 +824,7 @@ impl<'de> serde::Deserialize<'de> for DoubleRules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -826,7 +833,7 @@ impl<'de> serde::Deserialize<'de> for DoubleRules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -969,7 +976,7 @@ impl<'de> serde::Deserialize<'de> for DurationRules { formatter.write_str("struct buf.validate.DurationRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -980,49 +987,49 @@ impl<'de> serde::Deserialize<'de> for DurationRules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } - r#const__ = map.next_value()?; + r#const__ = map_.next_value()?; } GeneratedField::Lt => { if lt__.is_some() { return Err(serde::de::Error::duplicate_field("lt")); } - lt__ = map.next_value()?; + lt__ = map_.next_value()?; } GeneratedField::Lte => { if lte__.is_some() { return Err(serde::de::Error::duplicate_field("lte")); } - lte__ = map.next_value()?; + lte__ = map_.next_value()?; } GeneratedField::Gt => { if gt__.is_some() { return Err(serde::de::Error::duplicate_field("gt")); } - gt__ = map.next_value()?; + gt__ = map_.next_value()?; } GeneratedField::Gte => { if gte__.is_some() { return Err(serde::de::Error::duplicate_field("gte")); } - gte__ = map.next_value()?; + gte__ = map_.next_value()?; } GeneratedField::In => { if r#in__.is_some() { return Err(serde::de::Error::duplicate_field("in")); } - r#in__ = Some(map.next_value()?); + r#in__ = Some(map_.next_value()?); } GeneratedField::NotIn => { if not_in__.is_some() { return Err(serde::de::Error::duplicate_field("notIn")); } - not_in__ = Some(map.next_value()?); + not_in__ = Some(map_.next_value()?); } } } @@ -1137,7 +1144,7 @@ impl<'de> serde::Deserialize<'de> for EnumRules { formatter.write_str("struct buf.validate.EnumRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1145,28 +1152,28 @@ impl<'de> serde::Deserialize<'de> for EnumRules { let mut defined_only__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::DefinedOnly => { if defined_only__.is_some() { return Err(serde::de::Error::duplicate_field("definedOnly")); } - defined_only__ = map.next_value()?; + defined_only__ = map_.next_value()?; } GeneratedField::In => { if r#in__.is_some() { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -1175,7 +1182,7 @@ impl<'de> serde::Deserialize<'de> for EnumRules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -1421,7 +1428,7 @@ impl<'de> serde::Deserialize<'de> for FieldConstraints { formatter.write_str("struct buf.validate.FieldConstraints") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1430,177 +1437,177 @@ impl<'de> serde::Deserialize<'de> for FieldConstraints { let mut required__ = None; let mut ignore_empty__ = None; let mut r#type__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Cel => { if cel__.is_some() { return Err(serde::de::Error::duplicate_field("cel")); } - cel__ = Some(map.next_value()?); + cel__ = Some(map_.next_value()?); } GeneratedField::Skipped => { if skipped__.is_some() { return Err(serde::de::Error::duplicate_field("skipped")); } - skipped__ = Some(map.next_value()?); + skipped__ = Some(map_.next_value()?); } GeneratedField::Required => { if required__.is_some() { return Err(serde::de::Error::duplicate_field("required")); } - required__ = Some(map.next_value()?); + required__ = Some(map_.next_value()?); } GeneratedField::IgnoreEmpty => { if ignore_empty__.is_some() { return Err(serde::de::Error::duplicate_field("ignoreEmpty")); } - ignore_empty__ = Some(map.next_value()?); + ignore_empty__ = Some(map_.next_value()?); } GeneratedField::Float => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("float")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Float) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Float) ; } GeneratedField::Double => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("double")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Double) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Double) ; } GeneratedField::Int32 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("int32")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Int32) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Int32) ; } GeneratedField::Int64 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("int64")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Int64) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Int64) ; } GeneratedField::Uint32 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("uint32")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Uint32) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Uint32) ; } GeneratedField::Uint64 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("uint64")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Uint64) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Uint64) ; } GeneratedField::Sint32 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("sint32")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Sint32) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Sint32) ; } GeneratedField::Sint64 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("sint64")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Sint64) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Sint64) ; } GeneratedField::Fixed32 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("fixed32")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Fixed32) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Fixed32) ; } GeneratedField::Fixed64 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("fixed64")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Fixed64) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Fixed64) ; } GeneratedField::Sfixed32 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("sfixed32")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Sfixed32) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Sfixed32) ; } GeneratedField::Sfixed64 => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("sfixed64")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Sfixed64) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Sfixed64) ; } GeneratedField::Bool => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("bool")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Bool) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Bool) ; } GeneratedField::String => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("string")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::String) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::String) ; } GeneratedField::Bytes => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("bytes")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Bytes) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Bytes) ; } GeneratedField::Enum => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("enum")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Enum) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Enum) ; } GeneratedField::Repeated => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("repeated")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Repeated) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Repeated) ; } GeneratedField::Map => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("map")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Map) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Map) ; } GeneratedField::Any => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("any")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Any) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Any) ; } GeneratedField::Duration => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("duration")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Duration) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Duration) ; } GeneratedField::Timestamp => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("timestamp")); } - r#type__ = map.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Timestamp) + r#type__ = map_.next_value::<::std::option::Option<_>>()?.map(field_constraints::Type::Timestamp) ; } } @@ -1740,7 +1747,7 @@ impl<'de> serde::Deserialize<'de> for Fixed32Rules { formatter.write_str("struct buf.validate.Fixed32Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1751,14 +1758,14 @@ impl<'de> serde::Deserialize<'de> for Fixed32Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -1766,7 +1773,7 @@ impl<'de> serde::Deserialize<'de> for Fixed32Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -1774,7 +1781,7 @@ impl<'de> serde::Deserialize<'de> for Fixed32Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -1782,7 +1789,7 @@ impl<'de> serde::Deserialize<'de> for Fixed32Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -1790,7 +1797,7 @@ impl<'de> serde::Deserialize<'de> for Fixed32Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -1798,7 +1805,7 @@ impl<'de> serde::Deserialize<'de> for Fixed32Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -1807,7 +1814,7 @@ impl<'de> serde::Deserialize<'de> for Fixed32Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -1858,18 +1865,23 @@ impl serde::Serialize for Fixed64Rules { } let mut struct_ser = serializer.serialize_struct("buf.validate.Fixed64Rules", len)?; if let Some(v) = self.r#const.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("const", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lte", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gte", ToString::to_string(&v).as_str())?; } if !self.r#in.is_empty() { @@ -1950,7 +1962,7 @@ impl<'de> serde::Deserialize<'de> for Fixed64Rules { formatter.write_str("struct buf.validate.Fixed64Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1961,14 +1973,14 @@ impl<'de> serde::Deserialize<'de> for Fixed64Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -1976,7 +1988,7 @@ impl<'de> serde::Deserialize<'de> for Fixed64Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -1984,7 +1996,7 @@ impl<'de> serde::Deserialize<'de> for Fixed64Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -1992,7 +2004,7 @@ impl<'de> serde::Deserialize<'de> for Fixed64Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -2000,7 +2012,7 @@ impl<'de> serde::Deserialize<'de> for Fixed64Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -2008,7 +2020,7 @@ impl<'de> serde::Deserialize<'de> for Fixed64Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -2017,7 +2029,7 @@ impl<'de> serde::Deserialize<'de> for Fixed64Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -2160,7 +2172,7 @@ impl<'de> serde::Deserialize<'de> for FloatRules { formatter.write_str("struct buf.validate.FloatRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -2171,14 +2183,14 @@ impl<'de> serde::Deserialize<'de> for FloatRules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -2186,7 +2198,7 @@ impl<'de> serde::Deserialize<'de> for FloatRules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -2194,7 +2206,7 @@ impl<'de> serde::Deserialize<'de> for FloatRules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -2202,7 +2214,7 @@ impl<'de> serde::Deserialize<'de> for FloatRules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -2210,7 +2222,7 @@ impl<'de> serde::Deserialize<'de> for FloatRules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -2218,7 +2230,7 @@ impl<'de> serde::Deserialize<'de> for FloatRules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -2227,7 +2239,7 @@ impl<'de> serde::Deserialize<'de> for FloatRules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -2370,7 +2382,7 @@ impl<'de> serde::Deserialize<'de> for Int32Rules { formatter.write_str("struct buf.validate.Int32Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -2381,14 +2393,14 @@ impl<'de> serde::Deserialize<'de> for Int32Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -2396,7 +2408,7 @@ impl<'de> serde::Deserialize<'de> for Int32Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -2404,7 +2416,7 @@ impl<'de> serde::Deserialize<'de> for Int32Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -2412,7 +2424,7 @@ impl<'de> serde::Deserialize<'de> for Int32Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -2420,7 +2432,7 @@ impl<'de> serde::Deserialize<'de> for Int32Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -2428,7 +2440,7 @@ impl<'de> serde::Deserialize<'de> for Int32Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -2437,7 +2449,7 @@ impl<'de> serde::Deserialize<'de> for Int32Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -2488,18 +2500,23 @@ impl serde::Serialize for Int64Rules { } let mut struct_ser = serializer.serialize_struct("buf.validate.Int64Rules", len)?; if let Some(v) = self.r#const.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("const", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lte", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gte", ToString::to_string(&v).as_str())?; } if !self.r#in.is_empty() { @@ -2580,7 +2597,7 @@ impl<'de> serde::Deserialize<'de> for Int64Rules { formatter.write_str("struct buf.validate.Int64Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -2591,14 +2608,14 @@ impl<'de> serde::Deserialize<'de> for Int64Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -2606,7 +2623,7 @@ impl<'de> serde::Deserialize<'de> for Int64Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -2614,7 +2631,7 @@ impl<'de> serde::Deserialize<'de> for Int64Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -2622,7 +2639,7 @@ impl<'de> serde::Deserialize<'de> for Int64Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -2630,7 +2647,7 @@ impl<'de> serde::Deserialize<'de> for Int64Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -2638,7 +2655,7 @@ impl<'de> serde::Deserialize<'de> for Int64Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -2647,7 +2664,7 @@ impl<'de> serde::Deserialize<'de> for Int64Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -2706,10 +2723,9 @@ impl<'de> serde::Deserialize<'de> for KnownRegex { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(KnownRegex::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -2719,10 +2735,9 @@ impl<'de> serde::Deserialize<'de> for KnownRegex { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(KnownRegex::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -2765,9 +2780,11 @@ impl serde::Serialize for MapRules { } let mut struct_ser = serializer.serialize_struct("buf.validate.MapRules", len)?; if let Some(v) = self.min_pairs.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("minPairs", ToString::to_string(&v).as_str())?; } if let Some(v) = self.max_pairs.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("maxPairs", ToString::to_string(&v).as_str())?; } if let Some(v) = self.keys.as_ref() { @@ -2840,7 +2857,7 @@ impl<'de> serde::Deserialize<'de> for MapRules { formatter.write_str("struct buf.validate.MapRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -2848,14 +2865,14 @@ impl<'de> serde::Deserialize<'de> for MapRules { let mut max_pairs__ = None; let mut keys__ = None; let mut values__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::MinPairs => { if min_pairs__.is_some() { return Err(serde::de::Error::duplicate_field("minPairs")); } min_pairs__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::MaxPairs => { @@ -2863,20 +2880,20 @@ impl<'de> serde::Deserialize<'de> for MapRules { return Err(serde::de::Error::duplicate_field("maxPairs")); } max_pairs__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Keys => { if keys__.is_some() { return Err(serde::de::Error::duplicate_field("keys")); } - keys__ = map.next_value()?; + keys__ = map_.next_value()?; } GeneratedField::Values => { if values__.is_some() { return Err(serde::de::Error::duplicate_field("values")); } - values__ = map.next_value()?; + values__ = map_.next_value()?; } } } @@ -2968,25 +2985,25 @@ impl<'de> serde::Deserialize<'de> for MessageConstraints { formatter.write_str("struct buf.validate.MessageConstraints") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut disabled__ = None; let mut cel__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Disabled => { if disabled__.is_some() { return Err(serde::de::Error::duplicate_field("disabled")); } - disabled__ = map.next_value()?; + disabled__ = map_.next_value()?; } GeneratedField::Cel => { if cel__.is_some() { return Err(serde::de::Error::duplicate_field("cel")); } - cel__ = Some(map.next_value()?); + cel__ = Some(map_.next_value()?); } } } @@ -3067,18 +3084,18 @@ impl<'de> serde::Deserialize<'de> for OneofConstraints { formatter.write_str("struct buf.validate.OneofConstraints") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut required__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Required => { if required__.is_some() { return Err(serde::de::Error::duplicate_field("required")); } - required__ = map.next_value()?; + required__ = map_.next_value()?; } } } @@ -3112,9 +3129,11 @@ impl serde::Serialize for RepeatedRules { } let mut struct_ser = serializer.serialize_struct("buf.validate.RepeatedRules", len)?; if let Some(v) = self.min_items.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("minItems", ToString::to_string(&v).as_str())?; } if let Some(v) = self.max_items.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("maxItems", ToString::to_string(&v).as_str())?; } if let Some(v) = self.unique.as_ref() { @@ -3187,7 +3206,7 @@ impl<'de> serde::Deserialize<'de> for RepeatedRules { formatter.write_str("struct buf.validate.RepeatedRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -3195,14 +3214,14 @@ impl<'de> serde::Deserialize<'de> for RepeatedRules { let mut max_items__ = None; let mut unique__ = None; let mut items__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::MinItems => { if min_items__.is_some() { return Err(serde::de::Error::duplicate_field("minItems")); } min_items__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::MaxItems => { @@ -3210,20 +3229,20 @@ impl<'de> serde::Deserialize<'de> for RepeatedRules { return Err(serde::de::Error::duplicate_field("maxItems")); } max_items__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Unique => { if unique__.is_some() { return Err(serde::de::Error::duplicate_field("unique")); } - unique__ = map.next_value()?; + unique__ = map_.next_value()?; } GeneratedField::Items => { if items__.is_some() { return Err(serde::de::Error::duplicate_field("items")); } - items__ = map.next_value()?; + items__ = map_.next_value()?; } } } @@ -3361,7 +3380,7 @@ impl<'de> serde::Deserialize<'de> for SFixed32Rules { formatter.write_str("struct buf.validate.SFixed32Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -3372,14 +3391,14 @@ impl<'de> serde::Deserialize<'de> for SFixed32Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -3387,7 +3406,7 @@ impl<'de> serde::Deserialize<'de> for SFixed32Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -3395,7 +3414,7 @@ impl<'de> serde::Deserialize<'de> for SFixed32Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -3403,7 +3422,7 @@ impl<'de> serde::Deserialize<'de> for SFixed32Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -3411,7 +3430,7 @@ impl<'de> serde::Deserialize<'de> for SFixed32Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -3419,7 +3438,7 @@ impl<'de> serde::Deserialize<'de> for SFixed32Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -3428,7 +3447,7 @@ impl<'de> serde::Deserialize<'de> for SFixed32Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -3479,18 +3498,23 @@ impl serde::Serialize for SFixed64Rules { } let mut struct_ser = serializer.serialize_struct("buf.validate.SFixed64Rules", len)?; if let Some(v) = self.r#const.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("const", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lte", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gte", ToString::to_string(&v).as_str())?; } if !self.r#in.is_empty() { @@ -3571,7 +3595,7 @@ impl<'de> serde::Deserialize<'de> for SFixed64Rules { formatter.write_str("struct buf.validate.SFixed64Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -3582,14 +3606,14 @@ impl<'de> serde::Deserialize<'de> for SFixed64Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -3597,7 +3621,7 @@ impl<'de> serde::Deserialize<'de> for SFixed64Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -3605,7 +3629,7 @@ impl<'de> serde::Deserialize<'de> for SFixed64Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -3613,7 +3637,7 @@ impl<'de> serde::Deserialize<'de> for SFixed64Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -3621,7 +3645,7 @@ impl<'de> serde::Deserialize<'de> for SFixed64Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -3629,7 +3653,7 @@ impl<'de> serde::Deserialize<'de> for SFixed64Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -3638,7 +3662,7 @@ impl<'de> serde::Deserialize<'de> for SFixed64Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -3781,7 +3805,7 @@ impl<'de> serde::Deserialize<'de> for SInt32Rules { formatter.write_str("struct buf.validate.SInt32Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -3792,14 +3816,14 @@ impl<'de> serde::Deserialize<'de> for SInt32Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -3807,7 +3831,7 @@ impl<'de> serde::Deserialize<'de> for SInt32Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -3815,7 +3839,7 @@ impl<'de> serde::Deserialize<'de> for SInt32Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -3823,7 +3847,7 @@ impl<'de> serde::Deserialize<'de> for SInt32Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -3831,7 +3855,7 @@ impl<'de> serde::Deserialize<'de> for SInt32Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -3839,7 +3863,7 @@ impl<'de> serde::Deserialize<'de> for SInt32Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -3848,7 +3872,7 @@ impl<'de> serde::Deserialize<'de> for SInt32Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -3899,18 +3923,23 @@ impl serde::Serialize for SInt64Rules { } let mut struct_ser = serializer.serialize_struct("buf.validate.SInt64Rules", len)?; if let Some(v) = self.r#const.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("const", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lte", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gte", ToString::to_string(&v).as_str())?; } if !self.r#in.is_empty() { @@ -3991,7 +4020,7 @@ impl<'de> serde::Deserialize<'de> for SInt64Rules { formatter.write_str("struct buf.validate.SInt64Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -4002,14 +4031,14 @@ impl<'de> serde::Deserialize<'de> for SInt64Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -4017,7 +4046,7 @@ impl<'de> serde::Deserialize<'de> for SInt64Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -4025,7 +4054,7 @@ impl<'de> serde::Deserialize<'de> for SInt64Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -4033,7 +4062,7 @@ impl<'de> serde::Deserialize<'de> for SInt64Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -4041,7 +4070,7 @@ impl<'de> serde::Deserialize<'de> for SInt64Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -4049,7 +4078,7 @@ impl<'de> serde::Deserialize<'de> for SInt64Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -4058,7 +4087,7 @@ impl<'de> serde::Deserialize<'de> for SInt64Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -4139,21 +4168,27 @@ impl serde::Serialize for StringRules { struct_ser.serialize_field("const", v)?; } if let Some(v) = self.len.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("len", ToString::to_string(&v).as_str())?; } if let Some(v) = self.min_len.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("minLen", ToString::to_string(&v).as_str())?; } if let Some(v) = self.max_len.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("maxLen", ToString::to_string(&v).as_str())?; } if let Some(v) = self.len_bytes.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lenBytes", ToString::to_string(&v).as_str())?; } if let Some(v) = self.min_bytes.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("minBytes", ToString::to_string(&v).as_str())?; } if let Some(v) = self.max_bytes.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("maxBytes", ToString::to_string(&v).as_str())?; } if let Some(v) = self.pattern.as_ref() { @@ -4210,8 +4245,8 @@ impl serde::Serialize for StringRules { struct_ser.serialize_field("uuid", v)?; } string_rules::WellKnown::WellKnownRegex(v) => { - let v = KnownRegex::from_i32(*v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", *v)))?; + let v = KnownRegex::try_from(*v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", *v)))?; struct_ser.serialize_field("wellKnownRegex", &v)?; } } @@ -4350,7 +4385,7 @@ impl<'de> serde::Deserialize<'de> for StringRules { formatter.write_str("struct buf.validate.StringRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -4370,20 +4405,20 @@ impl<'de> serde::Deserialize<'de> for StringRules { let mut not_in__ = None; let mut strict__ = None; let mut well_known__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } - r#const__ = map.next_value()?; + r#const__ = map_.next_value()?; } GeneratedField::Len => { if len__.is_some() { return Err(serde::de::Error::duplicate_field("len")); } len__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::MinLen => { @@ -4391,7 +4426,7 @@ impl<'de> serde::Deserialize<'de> for StringRules { return Err(serde::de::Error::duplicate_field("minLen")); } min_len__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::MaxLen => { @@ -4399,7 +4434,7 @@ impl<'de> serde::Deserialize<'de> for StringRules { return Err(serde::de::Error::duplicate_field("maxLen")); } max_len__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::LenBytes => { @@ -4407,7 +4442,7 @@ impl<'de> serde::Deserialize<'de> for StringRules { return Err(serde::de::Error::duplicate_field("lenBytes")); } len_bytes__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::MinBytes => { @@ -4415,7 +4450,7 @@ impl<'de> serde::Deserialize<'de> for StringRules { return Err(serde::de::Error::duplicate_field("minBytes")); } min_bytes__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::MaxBytes => { @@ -4423,116 +4458,116 @@ impl<'de> serde::Deserialize<'de> for StringRules { return Err(serde::de::Error::duplicate_field("maxBytes")); } max_bytes__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Pattern => { if pattern__.is_some() { return Err(serde::de::Error::duplicate_field("pattern")); } - pattern__ = map.next_value()?; + pattern__ = map_.next_value()?; } GeneratedField::Prefix => { if prefix__.is_some() { return Err(serde::de::Error::duplicate_field("prefix")); } - prefix__ = map.next_value()?; + prefix__ = map_.next_value()?; } GeneratedField::Suffix => { if suffix__.is_some() { return Err(serde::de::Error::duplicate_field("suffix")); } - suffix__ = map.next_value()?; + suffix__ = map_.next_value()?; } GeneratedField::Contains => { if contains__.is_some() { return Err(serde::de::Error::duplicate_field("contains")); } - contains__ = map.next_value()?; + contains__ = map_.next_value()?; } GeneratedField::NotContains => { if not_contains__.is_some() { return Err(serde::de::Error::duplicate_field("notContains")); } - not_contains__ = map.next_value()?; + not_contains__ = map_.next_value()?; } GeneratedField::In => { if r#in__.is_some() { return Err(serde::de::Error::duplicate_field("in")); } - r#in__ = Some(map.next_value()?); + r#in__ = Some(map_.next_value()?); } GeneratedField::NotIn => { if not_in__.is_some() { return Err(serde::de::Error::duplicate_field("notIn")); } - not_in__ = Some(map.next_value()?); + not_in__ = Some(map_.next_value()?); } GeneratedField::Strict => { if strict__.is_some() { return Err(serde::de::Error::duplicate_field("strict")); } - strict__ = map.next_value()?; + strict__ = map_.next_value()?; } GeneratedField::Email => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("email")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Email); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Email); } GeneratedField::Hostname => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("hostname")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Hostname); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Hostname); } GeneratedField::Ip => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("ip")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Ip); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Ip); } GeneratedField::Ipv4 => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("ipv4")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Ipv4); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Ipv4); } GeneratedField::Ipv6 => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("ipv6")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Ipv6); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Ipv6); } GeneratedField::Uri => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("uri")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Uri); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Uri); } GeneratedField::UriRef => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("uriRef")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::UriRef); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::UriRef); } GeneratedField::Address => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("address")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Address); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Address); } GeneratedField::Uuid => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("uuid")); } - well_known__ = map.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Uuid); + well_known__ = map_.next_value::<::std::option::Option<_>>()?.map(string_rules::WellKnown::Uuid); } GeneratedField::WellKnownRegex => { if well_known__.is_some() { return Err(serde::de::Error::duplicate_field("wellKnownRegex")); } - well_known__ = map.next_value::<::std::option::Option>()?.map(|x| string_rules::WellKnown::WellKnownRegex(x as i32)); + well_known__ = map_.next_value::<::std::option::Option>()?.map(|x| string_rules::WellKnown::WellKnownRegex(x as i32)); } } } @@ -4692,7 +4727,7 @@ impl<'de> serde::Deserialize<'de> for TimestampRules { formatter.write_str("struct buf.validate.TimestampRules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -4704,55 +4739,55 @@ impl<'de> serde::Deserialize<'de> for TimestampRules { let mut lt_now__ = None; let mut gt_now__ = None; let mut within__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } - r#const__ = map.next_value()?; + r#const__ = map_.next_value()?; } GeneratedField::Lt => { if lt__.is_some() { return Err(serde::de::Error::duplicate_field("lt")); } - lt__ = map.next_value()?; + lt__ = map_.next_value()?; } GeneratedField::Lte => { if lte__.is_some() { return Err(serde::de::Error::duplicate_field("lte")); } - lte__ = map.next_value()?; + lte__ = map_.next_value()?; } GeneratedField::Gt => { if gt__.is_some() { return Err(serde::de::Error::duplicate_field("gt")); } - gt__ = map.next_value()?; + gt__ = map_.next_value()?; } GeneratedField::Gte => { if gte__.is_some() { return Err(serde::de::Error::duplicate_field("gte")); } - gte__ = map.next_value()?; + gte__ = map_.next_value()?; } GeneratedField::LtNow => { if lt_now__.is_some() { return Err(serde::de::Error::duplicate_field("ltNow")); } - lt_now__ = map.next_value()?; + lt_now__ = map_.next_value()?; } GeneratedField::GtNow => { if gt_now__.is_some() { return Err(serde::de::Error::duplicate_field("gtNow")); } - gt_now__ = map.next_value()?; + gt_now__ = map_.next_value()?; } GeneratedField::Within => { if within__.is_some() { return Err(serde::de::Error::duplicate_field("within")); } - within__ = map.next_value()?; + within__ = map_.next_value()?; } } } @@ -4894,7 +4929,7 @@ impl<'de> serde::Deserialize<'de> for UInt32Rules { formatter.write_str("struct buf.validate.UInt32Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -4905,14 +4940,14 @@ impl<'de> serde::Deserialize<'de> for UInt32Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -4920,7 +4955,7 @@ impl<'de> serde::Deserialize<'de> for UInt32Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -4928,7 +4963,7 @@ impl<'de> serde::Deserialize<'de> for UInt32Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -4936,7 +4971,7 @@ impl<'de> serde::Deserialize<'de> for UInt32Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -4944,7 +4979,7 @@ impl<'de> serde::Deserialize<'de> for UInt32Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -4952,7 +4987,7 @@ impl<'de> serde::Deserialize<'de> for UInt32Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -4961,7 +4996,7 @@ impl<'de> serde::Deserialize<'de> for UInt32Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -5012,18 +5047,23 @@ impl serde::Serialize for UInt64Rules { } let mut struct_ser = serializer.serialize_struct("buf.validate.UInt64Rules", len)?; if let Some(v) = self.r#const.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("const", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.lte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lte", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gt.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gt", ToString::to_string(&v).as_str())?; } if let Some(v) = self.gte.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("gte", ToString::to_string(&v).as_str())?; } if !self.r#in.is_empty() { @@ -5104,7 +5144,7 @@ impl<'de> serde::Deserialize<'de> for UInt64Rules { formatter.write_str("struct buf.validate.UInt64Rules") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -5115,14 +5155,14 @@ impl<'de> serde::Deserialize<'de> for UInt64Rules { let mut gte__ = None; let mut r#in__ = None; let mut not_in__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Const => { if r#const__.is_some() { return Err(serde::de::Error::duplicate_field("const")); } r#const__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lt => { @@ -5130,7 +5170,7 @@ impl<'de> serde::Deserialize<'de> for UInt64Rules { return Err(serde::de::Error::duplicate_field("lt")); } lt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Lte => { @@ -5138,7 +5178,7 @@ impl<'de> serde::Deserialize<'de> for UInt64Rules { return Err(serde::de::Error::duplicate_field("lte")); } lte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gt => { @@ -5146,7 +5186,7 @@ impl<'de> serde::Deserialize<'de> for UInt64Rules { return Err(serde::de::Error::duplicate_field("gt")); } gt__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::Gte => { @@ -5154,7 +5194,7 @@ impl<'de> serde::Deserialize<'de> for UInt64Rules { return Err(serde::de::Error::duplicate_field("gte")); } gte__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } GeneratedField::In => { @@ -5162,7 +5202,7 @@ impl<'de> serde::Deserialize<'de> for UInt64Rules { return Err(serde::de::Error::duplicate_field("in")); } r#in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -5171,7 +5211,7 @@ impl<'de> serde::Deserialize<'de> for UInt64Rules { return Err(serde::de::Error::duplicate_field("notIn")); } not_in__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -5279,32 +5319,32 @@ impl<'de> serde::Deserialize<'de> for Violation { formatter.write_str("struct buf.validate.Violation") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut field_path__ = None; let mut constraint_id__ = None; let mut message__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FieldPath => { if field_path__.is_some() { return Err(serde::de::Error::duplicate_field("fieldPath")); } - field_path__ = Some(map.next_value()?); + field_path__ = Some(map_.next_value()?); } GeneratedField::ConstraintId => { if constraint_id__.is_some() { return Err(serde::de::Error::duplicate_field("constraintId")); } - constraint_id__ = Some(map.next_value()?); + constraint_id__ = Some(map_.next_value()?); } GeneratedField::Message => { if message__.is_some() { return Err(serde::de::Error::duplicate_field("message")); } - message__ = Some(map.next_value()?); + message__ = Some(map_.next_value()?); } } } @@ -5386,18 +5426,18 @@ impl<'de> serde::Deserialize<'de> for Violations { formatter.write_str("struct buf.validate.Violations") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut violations__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Violations => { if violations__.is_some() { return Err(serde::de::Error::duplicate_field("violations")); } - violations__ = Some(map.next_value()?); + violations__ = Some(map_.next_value()?); } } } diff --git a/src/errors.serde.rs b/src/errors.serde.rs index 19371ae6..c6bb4776 100644 --- a/src/errors.serde.rs +++ b/src/errors.serde.rs @@ -94,7 +94,7 @@ impl<'de> serde::Deserialize<'de> for Error { formatter.write_str("struct errors.Error") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -102,34 +102,34 @@ impl<'de> serde::Deserialize<'de> for Error { let mut reason__ = None; let mut message__ = None; let mut metadata__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Code => { if code__.is_some() { return Err(serde::de::Error::duplicate_field("code")); } code__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Reason => { if reason__.is_some() { return Err(serde::de::Error::duplicate_field("reason")); } - reason__ = Some(map.next_value()?); + reason__ = Some(map_.next_value()?); } GeneratedField::Message => { if message__.is_some() { return Err(serde::de::Error::duplicate_field("message")); } - message__ = Some(map.next_value()?); + message__ = Some(map_.next_value()?); } GeneratedField::Metadata => { if metadata__.is_some() { return Err(serde::de::Error::duplicate_field("metadata")); } metadata__ = Some( - map.next_value::>()? + map_.next_value::>()? ); } } diff --git a/src/librarian.mapper.v1.serde.rs b/src/librarian.mapper.v1.serde.rs index 092dd480..5131365b 100644 --- a/src/librarian.mapper.v1.serde.rs +++ b/src/librarian.mapper.v1.serde.rs @@ -68,18 +68,18 @@ impl<'de> serde::Deserialize<'de> for DeleteEdgeRequest { formatter.write_str("struct librarian.mapper.v1.DeleteEdgeRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut edge_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::EdgeList => { if edge_list__.is_some() { return Err(serde::de::Error::duplicate_field("edgeList")); } - edge_list__ = Some(map.next_value()?); + edge_list__ = Some(map_.next_value()?); } } } @@ -148,12 +148,12 @@ impl<'de> serde::Deserialize<'de> for DeleteEdgeResponse { formatter.write_str("struct librarian.mapper.v1.DeleteEdgeResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(DeleteEdgeResponse { }) @@ -231,19 +231,19 @@ impl<'de> serde::Deserialize<'de> for DeleteVertexRequest { formatter.write_str("struct librarian.mapper.v1.DeleteVertexRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut vid_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::VidList => { if vid_list__.is_some() { return Err(serde::de::Error::duplicate_field("vidList")); } vid_list__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -314,12 +314,12 @@ impl<'de> serde::Deserialize<'de> for DeleteVertexResponse { formatter.write_str("struct librarian.mapper.v1.DeleteVertexResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(DeleteVertexResponse { }) @@ -350,14 +350,16 @@ impl serde::Serialize for Edge { } let mut struct_ser = serializer.serialize_struct("librarian.mapper.v1.Edge", len)?; if self.src_vid != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("srcVid", ToString::to_string(&self.src_vid).as_str())?; } if self.dst_vid != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("dstVid", ToString::to_string(&self.dst_vid).as_str())?; } if self.r#type != 0 { - let v = EdgeType::from_i32(self.r#type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; + let v = EdgeType::try_from(self.r#type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; struct_ser.serialize_field("type", &v)?; } if let Some(v) = self.prop.as_ref() { @@ -427,7 +429,7 @@ impl<'de> serde::Deserialize<'de> for Edge { formatter.write_str("struct librarian.mapper.v1.Edge") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -435,14 +437,14 @@ impl<'de> serde::Deserialize<'de> for Edge { let mut dst_vid__ = None; let mut r#type__ = None; let mut prop__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SrcVid => { if src_vid__.is_some() { return Err(serde::de::Error::duplicate_field("srcVid")); } src_vid__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::DstVid => { @@ -450,20 +452,20 @@ impl<'de> serde::Deserialize<'de> for Edge { return Err(serde::de::Error::duplicate_field("dstVid")); } dst_vid__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Type => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("type")); } - r#type__ = Some(map.next_value::()? as i32); + r#type__ = Some(map_.next_value::()? as i32); } GeneratedField::Prop => { if prop__.is_some() { return Err(serde::de::Error::duplicate_field("prop")); } - prop__ = map.next_value()?; + prop__ = map_.next_value()?; } } } @@ -509,6 +511,7 @@ impl serde::Serialize for EdgeCommonProp { struct_ser.serialize_field("updateTime", v)?; } if let Some(v) = self.rank.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("rank", ToString::to_string(&v).as_str())?; } struct_ser.end() @@ -576,7 +579,7 @@ impl<'de> serde::Deserialize<'de> for EdgeCommonProp { formatter.write_str("struct librarian.mapper.v1.EdgeCommonProp") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -584,32 +587,32 @@ impl<'de> serde::Deserialize<'de> for EdgeCommonProp { let mut create_time__ = None; let mut update_time__ = None; let mut rank__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::OccurTime => { if occur_time__.is_some() { return Err(serde::de::Error::duplicate_field("occurTime")); } - occur_time__ = map.next_value()?; + occur_time__ = map_.next_value()?; } GeneratedField::CreateTime => { if create_time__.is_some() { return Err(serde::de::Error::duplicate_field("createTime")); } - create_time__ = map.next_value()?; + create_time__ = map_.next_value()?; } GeneratedField::UpdateTime => { if update_time__.is_some() { return Err(serde::de::Error::duplicate_field("updateTime")); } - update_time__ = map.next_value()?; + update_time__ = map_.next_value()?; } GeneratedField::Rank => { if rank__.is_some() { return Err(serde::de::Error::duplicate_field("rank")); } rank__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } } @@ -666,10 +669,9 @@ impl<'de> serde::Deserialize<'de> for EdgeDirection { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(EdgeDirection::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -679,10 +681,9 @@ impl<'de> serde::Deserialize<'de> for EdgeDirection { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(EdgeDirection::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -783,26 +784,26 @@ impl<'de> serde::Deserialize<'de> for EdgeProp { formatter.write_str("struct librarian.mapper.v1.EdgeProp") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut common__ = None; let mut additional__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Common => { if common__.is_some() { return Err(serde::de::Error::duplicate_field("common")); } - common__ = map.next_value()?; + common__ = map_.next_value()?; } GeneratedField::Additional => { if additional__.is_some() { return Err(serde::de::Error::duplicate_field("additional")); } additional__ = Some( - map.next_value::>>()? + map_.next_value::>>()? .into_iter().map(|(k,v)| (k, v.0)).collect() ); } @@ -870,10 +871,9 @@ impl<'de> serde::Deserialize<'de> for EdgeType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(EdgeType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -883,10 +883,9 @@ impl<'de> serde::Deserialize<'de> for EdgeType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(EdgeType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -933,18 +932,19 @@ impl serde::Serialize for FetchEqualVertexNeighborRequest { } let mut struct_ser = serializer.serialize_struct("librarian.mapper.v1.FetchEqualVertexNeighborRequest", len)?; if self.src_vid != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("srcVid", ToString::to_string(&self.src_vid).as_str())?; } if !self.edge_type_filter.is_empty() { let v = self.edge_type_filter.iter().cloned().map(|v| { - EdgeType::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + EdgeType::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("edgeTypeFilter", &v)?; } if self.edge_direction != 0 { - let v = EdgeDirection::from_i32(self.edge_direction) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.edge_direction)))?; + let v = EdgeDirection::try_from(self.edge_direction) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.edge_direction)))?; struct_ser.serialize_field("edgeDirection", &v)?; } struct_ser.end() @@ -1009,34 +1009,34 @@ impl<'de> serde::Deserialize<'de> for FetchEqualVertexNeighborRequest { formatter.write_str("struct librarian.mapper.v1.FetchEqualVertexNeighborRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut src_vid__ = None; let mut edge_type_filter__ = None; let mut edge_direction__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SrcVid => { if src_vid__.is_some() { return Err(serde::de::Error::duplicate_field("srcVid")); } src_vid__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::EdgeTypeFilter => { if edge_type_filter__.is_some() { return Err(serde::de::Error::duplicate_field("edgeTypeFilter")); } - edge_type_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + edge_type_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } GeneratedField::EdgeDirection => { if edge_direction__.is_some() { return Err(serde::de::Error::duplicate_field("edgeDirection")); } - edge_direction__ = Some(map.next_value::()? as i32); + edge_direction__ = Some(map_.next_value::()? as i32); } } } @@ -1119,18 +1119,18 @@ impl<'de> serde::Deserialize<'de> for FetchEqualVertexNeighborResponse { formatter.write_str("struct librarian.mapper.v1.FetchEqualVertexNeighborResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut edge_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::EdgeList => { if edge_list__.is_some() { return Err(serde::de::Error::duplicate_field("edgeList")); } - edge_list__ = Some(map.next_value()?); + edge_list__ = Some(map_.next_value()?); } } } @@ -1155,6 +1155,7 @@ impl serde::Serialize for FetchEqualVertexRequest { } let mut struct_ser = serializer.serialize_struct("librarian.mapper.v1.FetchEqualVertexRequest", len)?; if self.src_vid != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("srcVid", ToString::to_string(&self.src_vid).as_str())?; } struct_ser.end() @@ -1211,19 +1212,19 @@ impl<'de> serde::Deserialize<'de> for FetchEqualVertexRequest { formatter.write_str("struct librarian.mapper.v1.FetchEqualVertexRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut src_vid__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SrcVid => { if src_vid__.is_some() { return Err(serde::de::Error::duplicate_field("srcVid")); } src_vid__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -1305,18 +1306,18 @@ impl<'de> serde::Deserialize<'de> for FetchEqualVertexResponse { formatter.write_str("struct librarian.mapper.v1.FetchEqualVertexResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut vertex_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::VertexList => { if vertex_list__.is_some() { return Err(serde::de::Error::duplicate_field("vertexList")); } - vertex_list__ = Some(map.next_value()?); + vertex_list__ = Some(map_.next_value()?); } } } @@ -1360,17 +1361,18 @@ impl serde::Serialize for FindPathRequest { } if !self.edge_type_filter.is_empty() { let v = self.edge_type_filter.iter().cloned().map(|v| { - EdgeType::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + EdgeType::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("edgeTypeFilter", &v)?; } if self.edge_direction != 0 { - let v = EdgeDirection::from_i32(self.edge_direction) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.edge_direction)))?; + let v = EdgeDirection::try_from(self.edge_direction) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.edge_direction)))?; struct_ser.serialize_field("edgeDirection", &v)?; } if self.max_step != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("maxStep", ToString::to_string(&self.max_step).as_str())?; } struct_ser.end() @@ -1443,7 +1445,7 @@ impl<'de> serde::Deserialize<'de> for FindPathRequest { formatter.write_str("struct librarian.mapper.v1.FindPathRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1452,14 +1454,14 @@ impl<'de> serde::Deserialize<'de> for FindPathRequest { let mut edge_type_filter__ = None; let mut edge_direction__ = None; let mut max_step__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SrcVid => { if src_vid__.is_some() { return Err(serde::de::Error::duplicate_field("srcVid")); } src_vid__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -1468,7 +1470,7 @@ impl<'de> serde::Deserialize<'de> for FindPathRequest { return Err(serde::de::Error::duplicate_field("dstVid")); } dst_vid__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -1476,20 +1478,20 @@ impl<'de> serde::Deserialize<'de> for FindPathRequest { if edge_type_filter__.is_some() { return Err(serde::de::Error::duplicate_field("edgeTypeFilter")); } - edge_type_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + edge_type_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } GeneratedField::EdgeDirection => { if edge_direction__.is_some() { return Err(serde::de::Error::duplicate_field("edgeDirection")); } - edge_direction__ = Some(map.next_value::()? as i32); + edge_direction__ = Some(map_.next_value::()? as i32); } GeneratedField::MaxStep => { if max_step__.is_some() { return Err(serde::de::Error::duplicate_field("maxStep")); } max_step__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -1575,18 +1577,18 @@ impl<'de> serde::Deserialize<'de> for FindPathResponse { formatter.write_str("struct librarian.mapper.v1.FindPathResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut path_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::PathList => { if path_list__.is_some() { return Err(serde::de::Error::duplicate_field("pathList")); } - path_list__ = Some(map.next_value()?); + path_list__ = Some(map_.next_value()?); } } } @@ -1667,18 +1669,18 @@ impl<'de> serde::Deserialize<'de> for find_path_response::SinglePath { formatter.write_str("struct librarian.mapper.v1.FindPathResponse.SinglePath") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut edge_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::EdgeList => { if edge_list__.is_some() { return Err(serde::de::Error::duplicate_field("edgeList")); } - edge_list__ = Some(map.next_value()?); + edge_list__ = Some(map_.next_value()?); } } } @@ -1721,30 +1723,35 @@ impl serde::Serialize for GoFromVertexRequest { } let mut struct_ser = serializer.serialize_struct("librarian.mapper.v1.GoFromVertexRequest", len)?; if self.src_vid != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("srcVid", ToString::to_string(&self.src_vid).as_str())?; } if !self.edge_type_filter.is_empty() { let v = self.edge_type_filter.iter().cloned().map(|v| { - EdgeType::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + EdgeType::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("edgeTypeFilter", &v)?; } if self.edge_direction != 0 { - let v = EdgeDirection::from_i32(self.edge_direction) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.edge_direction)))?; + let v = EdgeDirection::try_from(self.edge_direction) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.edge_direction)))?; struct_ser.serialize_field("edgeDirection", &v)?; } if self.min_step != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("minStep", ToString::to_string(&self.min_step).as_str())?; } if self.max_step != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("maxStep", ToString::to_string(&self.max_step).as_str())?; } if self.limit != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("limit", ToString::to_string(&self.limit).as_str())?; } if self.offset != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("offset", ToString::to_string(&self.offset).as_str())?; } struct_ser.end() @@ -1823,7 +1830,7 @@ impl<'de> serde::Deserialize<'de> for GoFromVertexRequest { formatter.write_str("struct librarian.mapper.v1.GoFromVertexRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1834,34 +1841,34 @@ impl<'de> serde::Deserialize<'de> for GoFromVertexRequest { let mut max_step__ = None; let mut limit__ = None; let mut offset__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SrcVid => { if src_vid__.is_some() { return Err(serde::de::Error::duplicate_field("srcVid")); } src_vid__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::EdgeTypeFilter => { if edge_type_filter__.is_some() { return Err(serde::de::Error::duplicate_field("edgeTypeFilter")); } - edge_type_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + edge_type_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } GeneratedField::EdgeDirection => { if edge_direction__.is_some() { return Err(serde::de::Error::duplicate_field("edgeDirection")); } - edge_direction__ = Some(map.next_value::()? as i32); + edge_direction__ = Some(map_.next_value::()? as i32); } GeneratedField::MinStep => { if min_step__.is_some() { return Err(serde::de::Error::duplicate_field("minStep")); } min_step__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::MaxStep => { @@ -1869,7 +1876,7 @@ impl<'de> serde::Deserialize<'de> for GoFromVertexRequest { return Err(serde::de::Error::duplicate_field("maxStep")); } max_step__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Limit => { @@ -1877,7 +1884,7 @@ impl<'de> serde::Deserialize<'de> for GoFromVertexRequest { return Err(serde::de::Error::duplicate_field("limit")); } limit__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Offset => { @@ -1885,7 +1892,7 @@ impl<'de> serde::Deserialize<'de> for GoFromVertexRequest { return Err(serde::de::Error::duplicate_field("offset")); } offset__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -1973,18 +1980,18 @@ impl<'de> serde::Deserialize<'de> for GoFromVertexResponse { formatter.write_str("struct librarian.mapper.v1.GoFromVertexResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut vertex_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::VertexList => { if vertex_list__.is_some() { return Err(serde::de::Error::duplicate_field("vertexList")); } - vertex_list__ = Some(map.next_value()?); + vertex_list__ = Some(map_.next_value()?); } } } @@ -2065,18 +2072,18 @@ impl<'de> serde::Deserialize<'de> for InsertEdgeRequest { formatter.write_str("struct librarian.mapper.v1.InsertEdgeRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut edge_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::EdgeList => { if edge_list__.is_some() { return Err(serde::de::Error::duplicate_field("edgeList")); } - edge_list__ = Some(map.next_value()?); + edge_list__ = Some(map_.next_value()?); } } } @@ -2145,12 +2152,12 @@ impl<'de> serde::Deserialize<'de> for InsertEdgeResponse { formatter.write_str("struct librarian.mapper.v1.InsertEdgeResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(InsertEdgeResponse { }) @@ -2228,18 +2235,18 @@ impl<'de> serde::Deserialize<'de> for InsertVertexRequest { formatter.write_str("struct librarian.mapper.v1.InsertVertexRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut vertex_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::VertexList => { if vertex_list__.is_some() { return Err(serde::de::Error::duplicate_field("vertexList")); } - vertex_list__ = Some(map.next_value()?); + vertex_list__ = Some(map_.next_value()?); } } } @@ -2308,12 +2315,12 @@ impl<'de> serde::Deserialize<'de> for InsertVertexResponse { formatter.write_str("struct librarian.mapper.v1.InsertVertexResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(InsertVertexResponse { }) @@ -2391,18 +2398,18 @@ impl<'de> serde::Deserialize<'de> for UpdateEdgeRequest { formatter.write_str("struct librarian.mapper.v1.UpdateEdgeRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut edge_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::EdgeList => { if edge_list__.is_some() { return Err(serde::de::Error::duplicate_field("edgeList")); } - edge_list__ = Some(map.next_value()?); + edge_list__ = Some(map_.next_value()?); } } } @@ -2471,12 +2478,12 @@ impl<'de> serde::Deserialize<'de> for UpdateEdgeResponse { formatter.write_str("struct librarian.mapper.v1.UpdateEdgeResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateEdgeResponse { }) @@ -2554,18 +2561,18 @@ impl<'de> serde::Deserialize<'de> for UpdateVertexRequest { formatter.write_str("struct librarian.mapper.v1.UpdateVertexRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut vertex_list__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::VertexList => { if vertex_list__.is_some() { return Err(serde::de::Error::duplicate_field("vertexList")); } - vertex_list__ = Some(map.next_value()?); + vertex_list__ = Some(map_.next_value()?); } } } @@ -2634,12 +2641,12 @@ impl<'de> serde::Deserialize<'de> for UpdateVertexResponse { formatter.write_str("struct librarian.mapper.v1.UpdateVertexResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateVertexResponse { }) @@ -2667,11 +2674,12 @@ impl serde::Serialize for Vertex { } let mut struct_ser = serializer.serialize_struct("librarian.mapper.v1.Vertex", len)?; if self.vid != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("vid", ToString::to_string(&self.vid).as_str())?; } if self.r#type != 0 { - let v = VertexType::from_i32(self.r#type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; + let v = VertexType::try_from(self.r#type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; struct_ser.serialize_field("type", &v)?; } if let Some(v) = self.prop.as_ref() { @@ -2736,34 +2744,34 @@ impl<'de> serde::Deserialize<'de> for Vertex { formatter.write_str("struct librarian.mapper.v1.Vertex") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut vid__ = None; let mut r#type__ = None; let mut prop__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Vid => { if vid__.is_some() { return Err(serde::de::Error::duplicate_field("vid")); } vid__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Type => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("type")); } - r#type__ = Some(map.next_value::()? as i32); + r#type__ = Some(map_.next_value::()? as i32); } GeneratedField::Prop => { if prop__.is_some() { return Err(serde::de::Error::duplicate_field("prop")); } - prop__ = map.next_value()?; + prop__ = map_.next_value()?; } } } @@ -2866,32 +2874,32 @@ impl<'de> serde::Deserialize<'de> for VertexCommonProp { formatter.write_str("struct librarian.mapper.v1.VertexCommonProp") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut occur_time__ = None; let mut create_time__ = None; let mut update_time__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::OccurTime => { if occur_time__.is_some() { return Err(serde::de::Error::duplicate_field("occurTime")); } - occur_time__ = map.next_value()?; + occur_time__ = map_.next_value()?; } GeneratedField::CreateTime => { if create_time__.is_some() { return Err(serde::de::Error::duplicate_field("createTime")); } - create_time__ = map.next_value()?; + create_time__ = map_.next_value()?; } GeneratedField::UpdateTime => { if update_time__.is_some() { return Err(serde::de::Error::duplicate_field("updateTime")); } - update_time__ = map.next_value()?; + update_time__ = map_.next_value()?; } } } @@ -2984,26 +2992,26 @@ impl<'de> serde::Deserialize<'de> for VertexProp { formatter.write_str("struct librarian.mapper.v1.VertexProp") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut common__ = None; let mut additional__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Common => { if common__.is_some() { return Err(serde::de::Error::duplicate_field("common")); } - common__ = map.next_value()?; + common__ = map_.next_value()?; } GeneratedField::Additional => { if additional__.is_some() { return Err(serde::de::Error::duplicate_field("additional")); } additional__ = Some( - map.next_value::>>()? + map_.next_value::>>()? .into_iter().map(|(k,v)| (k, v.0)).collect() ); } @@ -3063,10 +3071,9 @@ impl<'de> serde::Deserialize<'de> for VertexType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(VertexType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -3076,10 +3083,9 @@ impl<'de> serde::Deserialize<'de> for VertexType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(VertexType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) diff --git a/src/librarian.mapper.v1.tonic.rs b/src/librarian.mapper.v1.tonic.rs index 63993bbc..cb93fea4 100644 --- a/src/librarian.mapper.v1.tonic.rs +++ b/src/librarian.mapper.v1.tonic.rs @@ -564,7 +564,11 @@ pub mod librarian_mapper_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).insert_vertex(request).await + ::insert_vertex( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -610,7 +614,11 @@ pub mod librarian_mapper_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).delete_vertex(request).await + ::delete_vertex( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -656,7 +664,11 @@ pub mod librarian_mapper_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_vertex(request).await + ::update_vertex( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -701,7 +713,10 @@ pub mod librarian_mapper_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).insert_edge(request).await }; + let fut = async move { + ::insert_edge(&inner, request) + .await + }; Box::pin(fut) } } @@ -745,7 +760,10 @@ pub mod librarian_mapper_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).delete_edge(request).await }; + let fut = async move { + ::delete_edge(&inner, request) + .await + }; Box::pin(fut) } } @@ -789,7 +807,10 @@ pub mod librarian_mapper_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).update_edge(request).await }; + let fut = async move { + ::update_edge(&inner, request) + .await + }; Box::pin(fut) } } @@ -834,7 +855,11 @@ pub mod librarian_mapper_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).go_from_vertex(request).await + ::go_from_vertex( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -880,7 +905,11 @@ pub mod librarian_mapper_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).fetch_equal_vertex(request).await + ::fetch_equal_vertex( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -930,7 +959,11 @@ pub mod librarian_mapper_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).fetch_equal_vertex_neighbor(request).await + ::fetch_equal_vertex_neighbor( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -975,7 +1008,10 @@ pub mod librarian_mapper_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).find_path(request).await }; + let fut = async move { + ::find_path(&inner, request) + .await + }; Box::pin(fut) } } diff --git a/src/librarian.miner.v1.serde.rs b/src/librarian.miner.v1.serde.rs index 834002c2..312df55e 100644 --- a/src/librarian.miner.v1.serde.rs +++ b/src/librarian.miner.v1.serde.rs @@ -12,6 +12,7 @@ impl serde::Serialize for RecognizeImageBinaryRequest { } let mut struct_ser = serializer.serialize_struct("librarian.miner.v1.RecognizeImageBinaryRequest", len)?; if !self.data.is_empty() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("data", pbjson::private::base64::encode(&self.data).as_str())?; } struct_ser.end() @@ -67,19 +68,19 @@ impl<'de> serde::Deserialize<'de> for RecognizeImageBinaryRequest { formatter.write_str("struct librarian.miner.v1.RecognizeImageBinaryRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut data__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Data => { if data__.is_some() { return Err(serde::de::Error::duplicate_field("data")); } data__ = - Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) ; } } @@ -160,18 +161,18 @@ impl<'de> serde::Deserialize<'de> for RecognizeImageBinaryResponse { formatter.write_str("struct librarian.miner.v1.RecognizeImageBinaryResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut results__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Results => { if results__.is_some() { return Err(serde::de::Error::duplicate_field("results")); } - results__ = Some(map.next_value()?); + results__ = Some(map_.next_value()?); } } } @@ -260,27 +261,27 @@ impl<'de> serde::Deserialize<'de> for RecognizeImageResult { formatter.write_str("struct librarian.miner.v1.RecognizeImageResult") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut confidence__ = None; let mut text__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Confidence => { if confidence__.is_some() { return Err(serde::de::Error::duplicate_field("confidence")); } confidence__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Text => { if text__.is_some() { return Err(serde::de::Error::duplicate_field("text")); } - text__ = Some(map.next_value()?); + text__ = Some(map_.next_value()?); } } } @@ -361,18 +362,18 @@ impl<'de> serde::Deserialize<'de> for RecognizeImageUrlRequest { formatter.write_str("struct librarian.miner.v1.RecognizeImageURLRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut url__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Url => { if url__.is_some() { return Err(serde::de::Error::duplicate_field("url")); } - url__ = Some(map.next_value()?); + url__ = Some(map_.next_value()?); } } } @@ -452,18 +453,18 @@ impl<'de> serde::Deserialize<'de> for RecognizeImageUrlResponse { formatter.write_str("struct librarian.miner.v1.RecognizeImageURLResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut results__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Results => { if results__.is_some() { return Err(serde::de::Error::duplicate_field("results")); } - results__ = Some(map.next_value()?); + results__ = Some(map_.next_value()?); } } } diff --git a/src/librarian.miner.v1.tonic.rs b/src/librarian.miner.v1.tonic.rs index 393c41b6..7fde3cf8 100644 --- a/src/librarian.miner.v1.tonic.rs +++ b/src/librarian.miner.v1.tonic.rs @@ -271,7 +271,11 @@ pub mod librarian_miner_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).recognize_image_binary(request).await + ::recognize_image_binary( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -317,7 +321,11 @@ pub mod librarian_miner_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).recognize_image_url(request).await + ::recognize_image_url( + &inner, + request, + ) + .await }; Box::pin(fut) } diff --git a/src/librarian.porter.v1.serde.rs b/src/librarian.porter.v1.serde.rs index 2850b506..5c585222 100644 --- a/src/librarian.porter.v1.serde.rs +++ b/src/librarian.porter.v1.serde.rs @@ -68,18 +68,18 @@ impl<'de> serde::Deserialize<'de> for DisableContextRequest { formatter.write_str("struct librarian.porter.v1.DisableContextRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut context_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ContextId => { if context_id__.is_some() { return Err(serde::de::Error::duplicate_field("contextId")); } - context_id__ = map.next_value()?; + context_id__ = map_.next_value()?; } } } @@ -148,12 +148,12 @@ impl<'de> serde::Deserialize<'de> for DisableContextResponse { formatter.write_str("struct librarian.porter.v1.DisableContextResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(DisableContextResponse { }) @@ -241,25 +241,25 @@ impl<'de> serde::Deserialize<'de> for EnableContextRequest { formatter.write_str("struct librarian.porter.v1.EnableContextRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut context_id__ = None; let mut context_json__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ContextId => { if context_id__.is_some() { return Err(serde::de::Error::duplicate_field("contextId")); } - context_id__ = map.next_value()?; + context_id__ = map_.next_value()?; } GeneratedField::ContextJson => { if context_json__.is_some() { return Err(serde::de::Error::duplicate_field("contextJson")); } - context_json__ = Some(map.next_value()?); + context_json__ = Some(map_.next_value()?); } } } @@ -329,12 +329,12 @@ impl<'de> serde::Deserialize<'de> for EnableContextResponse { formatter.write_str("struct librarian.porter.v1.EnableContextResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(EnableContextResponse { }) @@ -359,6 +359,7 @@ impl serde::Serialize for EnablePorterRequest { } let mut struct_ser = serializer.serialize_struct("librarian.porter.v1.EnablePorterRequest", len)?; if self.sephirah_id != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sephirahId", ToString::to_string(&self.sephirah_id).as_str())?; } if let Some(v) = self.refresh_token.as_ref() { @@ -422,27 +423,27 @@ impl<'de> serde::Deserialize<'de> for EnablePorterRequest { formatter.write_str("struct librarian.porter.v1.EnablePorterRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut sephirah_id__ = None; let mut refresh_token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SephirahId => { if sephirah_id__.is_some() { return Err(serde::de::Error::duplicate_field("sephirahId")); } sephirah_id__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::RefreshToken => { if refresh_token__.is_some() { return Err(serde::de::Error::duplicate_field("refreshToken")); } - refresh_token__ = map.next_value()?; + refresh_token__ = map_.next_value()?; } } } @@ -512,12 +513,12 @@ impl<'de> serde::Deserialize<'de> for EnablePorterResponse { formatter.write_str("struct librarian.porter.v1.EnablePorterResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(EnablePorterResponse { }) @@ -603,25 +604,25 @@ impl<'de> serde::Deserialize<'de> for ExecFeedItemActionRequest { formatter.write_str("struct librarian.porter.v1.ExecFeedItemActionRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut action__ = None; let mut item__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Action => { if action__.is_some() { return Err(serde::de::Error::duplicate_field("action")); } - action__ = map.next_value()?; + action__ = map_.next_value()?; } GeneratedField::Item => { if item__.is_some() { return Err(serde::de::Error::duplicate_field("item")); } - item__ = map.next_value()?; + item__ = map_.next_value()?; } } } @@ -702,18 +703,18 @@ impl<'de> serde::Deserialize<'de> for ExecFeedItemActionResponse { formatter.write_str("struct librarian.porter.v1.ExecFeedItemActionResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut item__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Item => { if item__.is_some() { return Err(serde::de::Error::duplicate_field("item")); } - item__ = map.next_value()?; + item__ = map_.next_value()?; } } } @@ -782,12 +783,12 @@ impl<'de> serde::Deserialize<'de> for GetPorterInformationRequest { formatter.write_str("struct librarian.porter.v1.GetPorterInformationRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(GetPorterInformationRequest { }) @@ -903,7 +904,7 @@ impl<'de> serde::Deserialize<'de> for GetPorterInformationResponse { formatter.write_str("struct librarian.porter.v1.GetPorterInformationResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -912,37 +913,37 @@ impl<'de> serde::Deserialize<'de> for GetPorterInformationResponse { let mut global_name__ = None; let mut feature_summary__ = None; let mut context_json_schema__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Version => { if version__.is_some() { return Err(serde::de::Error::duplicate_field("version")); } - version__ = Some(map.next_value()?); + version__ = Some(map_.next_value()?); } GeneratedField::GlobalName => { if global_name__.is_some() { return Err(serde::de::Error::duplicate_field("globalName")); } - global_name__ = Some(map.next_value()?); + global_name__ = Some(map_.next_value()?); } GeneratedField::FeatureSummary => { if feature_summary__.is_some() { return Err(serde::de::Error::duplicate_field("featureSummary")); } - feature_summary__ = map.next_value()?; + feature_summary__ = map_.next_value()?; } GeneratedField::ContextJsonSchema => { if context_json_schema__.is_some() { return Err(serde::de::Error::duplicate_field("contextJsonSchema")); } - context_json_schema__ = map.next_value()?; + context_json_schema__ = map_.next_value()?; } } } @@ -1067,7 +1068,7 @@ impl<'de> serde::Deserialize<'de> for PorterFeatureSummary { formatter.write_str("struct librarian.porter.v1.PorterFeatureSummary") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1076,37 +1077,37 @@ impl<'de> serde::Deserialize<'de> for PorterFeatureSummary { let mut feed_sources__ = None; let mut notify_destinations__ = None; let mut feed_item_actions__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccountPlatforms => { if account_platforms__.is_some() { return Err(serde::de::Error::duplicate_field("accountPlatforms")); } - account_platforms__ = Some(map.next_value()?); + account_platforms__ = Some(map_.next_value()?); } GeneratedField::AppInfoSources => { if app_info_sources__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoSources")); } - app_info_sources__ = Some(map.next_value()?); + app_info_sources__ = Some(map_.next_value()?); } GeneratedField::FeedSources => { if feed_sources__.is_some() { return Err(serde::de::Error::duplicate_field("feedSources")); } - feed_sources__ = Some(map.next_value()?); + feed_sources__ = Some(map_.next_value()?); } GeneratedField::NotifyDestinations => { if notify_destinations__.is_some() { return Err(serde::de::Error::duplicate_field("notifyDestinations")); } - notify_destinations__ = Some(map.next_value()?); + notify_destinations__ = Some(map_.next_value()?); } GeneratedField::FeedItemActions => { if feed_item_actions__.is_some() { return Err(serde::de::Error::duplicate_field("feedItemActions")); } - feed_item_actions__ = Some(map.next_value()?); + feed_item_actions__ = Some(map_.next_value()?); } } } @@ -1138,8 +1139,8 @@ impl serde::Serialize for PullAccountAppInfoRelationRequest { } let mut struct_ser = serializer.serialize_struct("librarian.porter.v1.PullAccountAppInfoRelationRequest", len)?; if self.relation_type != 0 { - let v = super::super::v1::AccountAppRelationType::from_i32(self.relation_type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.relation_type)))?; + let v = super::super::v1::AccountAppRelationType::try_from(self.relation_type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.relation_type)))?; struct_ser.serialize_field("relationType", &v)?; } if let Some(v) = self.account_id.as_ref() { @@ -1203,25 +1204,25 @@ impl<'de> serde::Deserialize<'de> for PullAccountAppInfoRelationRequest { formatter.write_str("struct librarian.porter.v1.PullAccountAppInfoRelationRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut relation_type__ = None; let mut account_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::RelationType => { if relation_type__.is_some() { return Err(serde::de::Error::duplicate_field("relationType")); } - relation_type__ = Some(map.next_value::()? as i32); + relation_type__ = Some(map_.next_value::()? as i32); } GeneratedField::AccountId => { if account_id__.is_some() { return Err(serde::de::Error::duplicate_field("accountId")); } - account_id__ = map.next_value()?; + account_id__ = map_.next_value()?; } } } @@ -1303,18 +1304,18 @@ impl<'de> serde::Deserialize<'de> for PullAccountAppInfoRelationResponse { formatter.write_str("struct librarian.porter.v1.PullAccountAppInfoRelationResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } @@ -1395,18 +1396,18 @@ impl<'de> serde::Deserialize<'de> for PullAccountRequest { formatter.write_str("struct librarian.porter.v1.PullAccountRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut account_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccountId => { if account_id__.is_some() { return Err(serde::de::Error::duplicate_field("accountId")); } - account_id__ = map.next_value()?; + account_id__ = map_.next_value()?; } } } @@ -1486,18 +1487,18 @@ impl<'de> serde::Deserialize<'de> for PullAccountResponse { formatter.write_str("struct librarian.porter.v1.PullAccountResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut account__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Account => { if account__.is_some() { return Err(serde::de::Error::duplicate_field("account")); } - account__ = map.next_value()?; + account__ = map_.next_value()?; } } } @@ -1578,18 +1579,18 @@ impl<'de> serde::Deserialize<'de> for PullAppInfoRequest { formatter.write_str("struct librarian.porter.v1.PullAppInfoRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfoId => { if app_info_id__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoId")); } - app_info_id__ = map.next_value()?; + app_info_id__ = map_.next_value()?; } } } @@ -1670,18 +1671,18 @@ impl<'de> serde::Deserialize<'de> for PullAppInfoResponse { formatter.write_str("struct librarian.porter.v1.PullAppInfoResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfo => { if app_info__.is_some() { return Err(serde::de::Error::duplicate_field("appInfo")); } - app_info__ = map.next_value()?; + app_info__ = map_.next_value()?; } } } @@ -1761,18 +1762,18 @@ impl<'de> serde::Deserialize<'de> for PullFeedRequest { formatter.write_str("struct librarian.porter.v1.PullFeedRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut source__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Source => { if source__.is_some() { return Err(serde::de::Error::duplicate_field("source")); } - source__ = map.next_value()?; + source__ = map_.next_value()?; } } } @@ -1852,18 +1853,18 @@ impl<'de> serde::Deserialize<'de> for PullFeedResponse { formatter.write_str("struct librarian.porter.v1.PullFeedResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut data__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Data => { if data__.is_some() { return Err(serde::de::Error::duplicate_field("data")); } - data__ = map.next_value()?; + data__ = map_.next_value()?; } } } @@ -1952,25 +1953,25 @@ impl<'de> serde::Deserialize<'de> for PushFeedItemsRequest { formatter.write_str("struct librarian.porter.v1.PushFeedItemsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut destination__ = None; let mut items__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Destination => { if destination__.is_some() { return Err(serde::de::Error::duplicate_field("destination")); } - destination__ = map.next_value()?; + destination__ = map_.next_value()?; } GeneratedField::Items => { if items__.is_some() { return Err(serde::de::Error::duplicate_field("items")); } - items__ = Some(map.next_value()?); + items__ = Some(map_.next_value()?); } } } @@ -2040,12 +2041,12 @@ impl<'de> serde::Deserialize<'de> for PushFeedItemsResponse { formatter.write_str("struct librarian.porter.v1.PushFeedItemsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(PushFeedItemsResponse { }) @@ -2122,18 +2123,18 @@ impl<'de> serde::Deserialize<'de> for SearchAppInfoRequest { formatter.write_str("struct librarian.porter.v1.SearchAppInfoRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut name__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } } } @@ -2214,18 +2215,18 @@ impl<'de> serde::Deserialize<'de> for SearchAppInfoResponse { formatter.write_str("struct librarian.porter.v1.SearchAppInfoResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } diff --git a/src/librarian.porter.v1.tonic.rs b/src/librarian.porter.v1.tonic.rs index 55034b2b..19f87a4e 100644 --- a/src/librarian.porter.v1.tonic.rs +++ b/src/librarian.porter.v1.tonic.rs @@ -603,7 +603,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_porter_information(request).await + ::get_porter_information( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -649,7 +653,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).enable_porter(request).await + ::enable_porter( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -695,7 +703,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).enable_context(request).await + ::enable_context( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -741,7 +753,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).disable_context(request).await + ::disable_context( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -787,7 +803,8 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).pull_account(request).await + ::pull_account(&inner, request) + .await }; Box::pin(fut) } @@ -833,7 +850,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).pull_app_info(request).await + ::pull_app_info( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -884,7 +905,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).pull_account_app_info_relation(request).await + ::pull_account_app_info_relation( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -930,7 +955,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).search_app_info(request).await + ::search_app_info( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -975,7 +1004,10 @@ pub mod librarian_porter_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).pull_feed(request).await }; + let fut = async move { + ::pull_feed(&inner, request) + .await + }; Box::pin(fut) } } @@ -1020,7 +1052,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).push_feed_items(request).await + ::push_feed_items( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -1066,7 +1102,11 @@ pub mod librarian_porter_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).exec_feed_item_action(request).await + ::exec_feed_item_action( + &inner, + request, + ) + .await }; Box::pin(fut) } diff --git a/src/librarian.searcher.v1.serde.rs b/src/librarian.searcher.v1.serde.rs index 08261641..0775310f 100644 --- a/src/librarian.searcher.v1.serde.rs +++ b/src/librarian.searcher.v1.serde.rs @@ -27,13 +27,13 @@ impl serde::Serialize for DescribeIdRequest { struct_ser.serialize_field("description", &self.description)?; } if self.mode != 0 { - let v = describe_id_request::DescribeMode::from_i32(self.mode) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.mode)))?; + let v = describe_id_request::DescribeMode::try_from(self.mode) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.mode)))?; struct_ser.serialize_field("mode", &v)?; } if self.index != 0 { - let v = Index::from_i32(self.index) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.index)))?; + let v = Index::try_from(self.index) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.index)))?; struct_ser.serialize_field("index", &v)?; } struct_ser.end() @@ -98,7 +98,7 @@ impl<'de> serde::Deserialize<'de> for DescribeIdRequest { formatter.write_str("struct librarian.searcher.v1.DescribeIDRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -106,31 +106,31 @@ impl<'de> serde::Deserialize<'de> for DescribeIdRequest { let mut description__ = None; let mut mode__ = None; let mut index__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Mode => { if mode__.is_some() { return Err(serde::de::Error::duplicate_field("mode")); } - mode__ = Some(map.next_value::()? as i32); + mode__ = Some(map_.next_value::()? as i32); } GeneratedField::Index => { if index__.is_some() { return Err(serde::de::Error::duplicate_field("index")); } - index__ = Some(map.next_value::()? as i32); + index__ = Some(map_.next_value::()? as i32); } } } @@ -184,10 +184,9 @@ impl<'de> serde::Deserialize<'de> for describe_id_request::DescribeMode { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(describe_id_request::DescribeMode::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -197,10 +196,9 @@ impl<'de> serde::Deserialize<'de> for describe_id_request::DescribeMode { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(describe_id_request::DescribeMode::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -278,12 +276,12 @@ impl<'de> serde::Deserialize<'de> for DescribeIdResponse { formatter.write_str("struct librarian.searcher.v1.DescribeIDResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(DescribeIdResponse { }) @@ -333,10 +331,9 @@ impl<'de> serde::Deserialize<'de> for Index { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(Index::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -346,10 +343,9 @@ impl<'de> serde::Deserialize<'de> for Index { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(Index::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -439,19 +435,19 @@ impl<'de> serde::Deserialize<'de> for NewBatchIDsRequest { formatter.write_str("struct librarian.searcher.v1.NewBatchIDsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut num__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Num => { if num__.is_some() { return Err(serde::de::Error::duplicate_field("num")); } num__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -532,18 +528,18 @@ impl<'de> serde::Deserialize<'de> for NewBatchIDsResponse { formatter.write_str("struct librarian.searcher.v1.NewBatchIDsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut ids__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Ids => { if ids__.is_some() { return Err(serde::de::Error::duplicate_field("ids")); } - ids__ = Some(map.next_value()?); + ids__ = Some(map_.next_value()?); } } } @@ -612,12 +608,12 @@ impl<'de> serde::Deserialize<'de> for NewIdRequest { formatter.write_str("struct librarian.searcher.v1.NewIDRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(NewIdRequest { }) @@ -694,18 +690,18 @@ impl<'de> serde::Deserialize<'de> for NewIdResponse { formatter.write_str("struct librarian.searcher.v1.NewIDResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -794,25 +790,25 @@ impl<'de> serde::Deserialize<'de> for SearchAppInfoRequest { formatter.write_str("struct librarian.searcher.v1.SearchAppInfoRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut name__ = None; let mut source__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Source => { if source__.is_some() { return Err(serde::de::Error::duplicate_field("source")); } - source__ = map.next_value()?; + source__ = map_.next_value()?; } } } @@ -894,18 +890,18 @@ impl<'de> serde::Deserialize<'de> for SearchAppInfoResponse { formatter.write_str("struct librarian.searcher.v1.SearchAppInfoResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } @@ -942,8 +938,8 @@ impl serde::Serialize for SearchIdRequest { struct_ser.serialize_field("query", &self.query)?; } if self.index != 0 { - let v = Index::from_i32(self.index) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.index)))?; + let v = Index::try_from(self.index) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.index)))?; struct_ser.serialize_field("index", &v)?; } struct_ser.end() @@ -1005,32 +1001,32 @@ impl<'de> serde::Deserialize<'de> for SearchIdRequest { formatter.write_str("struct librarian.searcher.v1.SearchIDRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut query__ = None; let mut index__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Query => { if query__.is_some() { return Err(serde::de::Error::duplicate_field("query")); } - query__ = Some(map.next_value()?); + query__ = Some(map_.next_value()?); } GeneratedField::Index => { if index__.is_some() { return Err(serde::de::Error::duplicate_field("index")); } - index__ = Some(map.next_value::()? as i32); + index__ = Some(map_.next_value::()? as i32); } } } @@ -1121,25 +1117,25 @@ impl<'de> serde::Deserialize<'de> for SearchIdResponse { formatter.write_str("struct librarian.searcher.v1.SearchIDResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut result__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Result => { if result__.is_some() { return Err(serde::de::Error::duplicate_field("result")); } - result__ = Some(map.next_value()?); + result__ = Some(map_.next_value()?); } } } @@ -1171,6 +1167,7 @@ impl serde::Serialize for search_id_response::Result { struct_ser.serialize_field("id", v)?; } if self.rank != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("rank", ToString::to_string(&self.rank).as_str())?; } struct_ser.end() @@ -1229,26 +1226,26 @@ impl<'de> serde::Deserialize<'de> for search_id_response::Result { formatter.write_str("struct librarian.searcher.v1.SearchIDResponse.Result") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut rank__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Rank => { if rank__.is_some() { return Err(serde::de::Error::duplicate_field("rank")); } rank__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } diff --git a/src/librarian.searcher.v1.tonic.rs b/src/librarian.searcher.v1.tonic.rs index 3e5202fa..60d13ade 100644 --- a/src/librarian.searcher.v1.tonic.rs +++ b/src/librarian.searcher.v1.tonic.rs @@ -371,7 +371,10 @@ pub mod librarian_searcher_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).new_id(request).await }; + let fut = async move { + ::new_id(&inner, request) + .await + }; Box::pin(fut) } } @@ -416,7 +419,11 @@ pub mod librarian_searcher_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).new_batch_i_ds(request).await + ::new_batch_i_ds( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -461,7 +468,13 @@ pub mod librarian_searcher_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).describe_id(request).await }; + let fut = async move { + ::describe_id( + &inner, + request, + ) + .await + }; Box::pin(fut) } } @@ -505,7 +518,10 @@ pub mod librarian_searcher_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).search_id(request).await }; + let fut = async move { + ::search_id(&inner, request) + .await + }; Box::pin(fut) } } @@ -550,7 +566,11 @@ pub mod librarian_searcher_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).search_app_info(request).await + ::search_app_info( + &inner, + request, + ) + .await }; Box::pin(fut) } diff --git a/src/librarian.sephirah.v1.serde.rs b/src/librarian.sephirah.v1.serde.rs index 23d613a9..b3d28cd1 100644 --- a/src/librarian.sephirah.v1.serde.rs +++ b/src/librarian.sephirah.v1.serde.rs @@ -68,18 +68,18 @@ impl<'de> serde::Deserialize<'de> for AcquireUserTokenRequest { formatter.write_str("struct librarian.sephirah.v1.AcquireUserTokenRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut user_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::UserId => { if user_id__.is_some() { return Err(serde::de::Error::duplicate_field("userId")); } - user_id__ = map.next_value()?; + user_id__ = map_.next_value()?; } } } @@ -160,18 +160,18 @@ impl<'de> serde::Deserialize<'de> for AcquireUserTokenResponse { formatter.write_str("struct librarian.sephirah.v1.AcquireUserTokenResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut access_token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccessToken => { if access_token__.is_some() { return Err(serde::de::Error::duplicate_field("accessToken")); } - access_token__ = Some(map.next_value()?); + access_token__ = Some(map_.next_value()?); } } } @@ -262,25 +262,25 @@ impl<'de> serde::Deserialize<'de> for AddAppInstRunTimeRequest { formatter.write_str("struct librarian.sephirah.v1.AddAppInstRunTimeRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_inst_id__ = None; let mut time_range__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInstId => { if app_inst_id__.is_some() { return Err(serde::de::Error::duplicate_field("appInstId")); } - app_inst_id__ = map.next_value()?; + app_inst_id__ = map_.next_value()?; } GeneratedField::TimeRange => { if time_range__.is_some() { return Err(serde::de::Error::duplicate_field("timeRange")); } - time_range__ = map.next_value()?; + time_range__ = map_.next_value()?; } } } @@ -350,12 +350,12 @@ impl<'de> serde::Deserialize<'de> for AddAppInstRunTimeResponse { formatter.write_str("struct librarian.sephirah.v1.AddAppInstRunTimeResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(AddAppInstRunTimeResponse { }) @@ -443,25 +443,25 @@ impl<'de> serde::Deserialize<'de> for AddFeedItemToCollectionRequest { formatter.write_str("struct librarian.sephirah.v1.AddFeedItemToCollectionRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut feed_item_id__ = None; let mut collection_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FeedItemId => { if feed_item_id__.is_some() { return Err(serde::de::Error::duplicate_field("feedItemId")); } - feed_item_id__ = map.next_value()?; + feed_item_id__ = map_.next_value()?; } GeneratedField::CollectionId => { if collection_id__.is_some() { return Err(serde::de::Error::duplicate_field("collectionId")); } - collection_id__ = map.next_value()?; + collection_id__ = map_.next_value()?; } } } @@ -531,12 +531,12 @@ impl<'de> serde::Deserialize<'de> for AddFeedItemToCollectionResponse { formatter.write_str("struct librarian.sephirah.v1.AddFeedItemToCollectionResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(AddFeedItemToCollectionResponse { }) @@ -650,7 +650,7 @@ impl<'de> serde::Deserialize<'de> for App { formatter.write_str("struct librarian.sephirah.v1.App") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -659,37 +659,37 @@ impl<'de> serde::Deserialize<'de> for App { let mut description__ = None; let mut assigned_app_info_id__ = None; let mut public__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::AssignedAppInfoId => { if assigned_app_info_id__.is_some() { return Err(serde::de::Error::duplicate_field("assignedAppInfoId")); } - assigned_app_info_id__ = map.next_value()?; + assigned_app_info_id__ = map_.next_value()?; } GeneratedField::Public => { if public__.is_some() { return Err(serde::de::Error::duplicate_field("public")); } - public__ = Some(map.next_value()?); + public__ = Some(map_.next_value()?); } } } @@ -742,12 +742,14 @@ impl serde::Serialize for AppBinary { struct_ser.serialize_field("name", &self.name)?; } if self.size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sizeBytes", ToString::to_string(&self.size_bytes).as_str())?; } if !self.public_url.is_empty() { struct_ser.serialize_field("publicUrl", &self.public_url)?; } if !self.sha256.is_empty() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sha256", pbjson::private::base64::encode(&self.sha256).as_str())?; } if !self.token_server_url.is_empty() { @@ -830,7 +832,7 @@ impl<'de> serde::Deserialize<'de> for AppBinary { formatter.write_str("struct librarian.sephirah.v1.AppBinary") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -841,53 +843,53 @@ impl<'de> serde::Deserialize<'de> for AppBinary { let mut sha256__ = None; let mut token_server_url__ = None; let mut chunks__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::SizeBytes => { if size_bytes__.is_some() { return Err(serde::de::Error::duplicate_field("sizeBytes")); } size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::PublicUrl => { if public_url__.is_some() { return Err(serde::de::Error::duplicate_field("publicUrl")); } - public_url__ = Some(map.next_value()?); + public_url__ = Some(map_.next_value()?); } GeneratedField::Sha256 => { if sha256__.is_some() { return Err(serde::de::Error::duplicate_field("sha256")); } sha256__ = - Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) ; } GeneratedField::TokenServerUrl => { if token_server_url__.is_some() { return Err(serde::de::Error::duplicate_field("tokenServerUrl")); } - token_server_url__ = Some(map.next_value()?); + token_server_url__ = Some(map_.next_value()?); } GeneratedField::Chunks => { if chunks__.is_some() { return Err(serde::de::Error::duplicate_field("chunks")); } - chunks__ = Some(map.next_value()?); + chunks__ = Some(map_.next_value()?); } } } @@ -927,15 +929,18 @@ impl serde::Serialize for app_binary::Chunk { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.AppBinary.Chunk", len)?; if self.sequence != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sequence", ToString::to_string(&self.sequence).as_str())?; } if self.size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sizeBytes", ToString::to_string(&self.size_bytes).as_str())?; } if !self.public_url.is_empty() { struct_ser.serialize_field("publicUrl", &self.public_url)?; } if !self.sha256.is_empty() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sha256", pbjson::private::base64::encode(&self.sha256).as_str())?; } struct_ser.end() @@ -1002,7 +1007,7 @@ impl<'de> serde::Deserialize<'de> for app_binary::Chunk { formatter.write_str("struct librarian.sephirah.v1.AppBinary.Chunk") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1010,14 +1015,14 @@ impl<'de> serde::Deserialize<'de> for app_binary::Chunk { let mut size_bytes__ = None; let mut public_url__ = None; let mut sha256__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Sequence => { if sequence__.is_some() { return Err(serde::de::Error::duplicate_field("sequence")); } sequence__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::SizeBytes => { @@ -1025,21 +1030,21 @@ impl<'de> serde::Deserialize<'de> for app_binary::Chunk { return Err(serde::de::Error::duplicate_field("sizeBytes")); } size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::PublicUrl => { if public_url__.is_some() { return Err(serde::de::Error::duplicate_field("publicUrl")); } - public_url__ = Some(map.next_value()?); + public_url__ = Some(map_.next_value()?); } GeneratedField::Sha256 => { if sha256__.is_some() { return Err(serde::de::Error::duplicate_field("sha256")); } sha256__ = - Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) ; } } @@ -1152,7 +1157,7 @@ impl<'de> serde::Deserialize<'de> for AppCategory { formatter.write_str("struct librarian.sephirah.v1.AppCategory") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1160,31 +1165,31 @@ impl<'de> serde::Deserialize<'de> for AppCategory { let mut name__ = None; let mut app_ids__ = None; let mut app_info_ids__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::AppIds => { if app_ids__.is_some() { return Err(serde::de::Error::duplicate_field("appIds")); } - app_ids__ = Some(map.next_value()?); + app_ids__ = Some(map_.next_value()?); } GeneratedField::AppInfoIds => { if app_info_ids__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoIds")); } - app_info_ids__ = Some(map.next_value()?); + app_info_ids__ = Some(map_.next_value()?); } } } @@ -1287,32 +1292,32 @@ impl<'de> serde::Deserialize<'de> for AppInst { formatter.write_str("struct librarian.sephirah.v1.AppInst") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut device_id__ = None; let mut app_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::DeviceId => { if device_id__.is_some() { return Err(serde::de::Error::duplicate_field("deviceId")); } - device_id__ = map.next_value()?; + device_id__ = map_.next_value()?; } GeneratedField::AppId => { if app_id__.is_some() { return Err(serde::de::Error::duplicate_field("appId")); } - app_id__ = map.next_value()?; + app_id__ = map_.next_value()?; } } } @@ -1367,10 +1372,9 @@ impl<'de> serde::Deserialize<'de> for AppSaveFileCapacityStrategy { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(AppSaveFileCapacityStrategy::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -1380,10 +1384,9 @@ impl<'de> serde::Deserialize<'de> for AppSaveFileCapacityStrategy { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(AppSaveFileCapacityStrategy::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -1484,25 +1487,25 @@ impl<'de> serde::Deserialize<'de> for AssignAppRequest { formatter.write_str("struct librarian.sephirah.v1.AssignAppRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info_id__ = None; let mut app_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfoId => { if app_info_id__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoId")); } - app_info_id__ = map.next_value()?; + app_info_id__ = map_.next_value()?; } GeneratedField::AppId => { if app_id__.is_some() { return Err(serde::de::Error::duplicate_field("appId")); } - app_id__ = map.next_value()?; + app_id__ = map_.next_value()?; } } } @@ -1572,12 +1575,12 @@ impl<'de> serde::Deserialize<'de> for AssignAppResponse { formatter.write_str("struct librarian.sephirah.v1.AssignAppResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(AssignAppResponse { }) @@ -1629,10 +1632,9 @@ impl<'de> serde::Deserialize<'de> for ChunkTransferStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(ChunkTransferStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -1642,10 +1644,9 @@ impl<'de> serde::Deserialize<'de> for ChunkTransferStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(ChunkTransferStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -1737,18 +1738,18 @@ impl<'de> serde::Deserialize<'de> for CreateAppCategoryRequest { formatter.write_str("struct librarian.sephirah.v1.CreateAppCategoryRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_category__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppCategory => { if app_category__.is_some() { return Err(serde::de::Error::duplicate_field("appCategory")); } - app_category__ = map.next_value()?; + app_category__ = map_.next_value()?; } } } @@ -1828,18 +1829,18 @@ impl<'de> serde::Deserialize<'de> for CreateAppCategoryResponse { formatter.write_str("struct librarian.sephirah.v1.CreateAppCategoryResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -1920,18 +1921,18 @@ impl<'de> serde::Deserialize<'de> for CreateAppInfoRequest { formatter.write_str("struct librarian.sephirah.v1.CreateAppInfoRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfo => { if app_info__.is_some() { return Err(serde::de::Error::duplicate_field("appInfo")); } - app_info__ = map.next_value()?; + app_info__ = map_.next_value()?; } } } @@ -2011,18 +2012,18 @@ impl<'de> serde::Deserialize<'de> for CreateAppInfoResponse { formatter.write_str("struct librarian.sephirah.v1.CreateAppInfoResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -2103,18 +2104,18 @@ impl<'de> serde::Deserialize<'de> for CreateAppInstRequest { formatter.write_str("struct librarian.sephirah.v1.CreateAppInstRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_inst__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInst => { if app_inst__.is_some() { return Err(serde::de::Error::duplicate_field("appInst")); } - app_inst__ = map.next_value()?; + app_inst__ = map_.next_value()?; } } } @@ -2194,18 +2195,18 @@ impl<'de> serde::Deserialize<'de> for CreateAppInstResponse { formatter.write_str("struct librarian.sephirah.v1.CreateAppInstResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -2285,18 +2286,18 @@ impl<'de> serde::Deserialize<'de> for CreateAppRequest { formatter.write_str("struct librarian.sephirah.v1.CreateAppRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::App => { if app__.is_some() { return Err(serde::de::Error::duplicate_field("app")); } - app__ = map.next_value()?; + app__ = map_.next_value()?; } } } @@ -2376,18 +2377,18 @@ impl<'de> serde::Deserialize<'de> for CreateAppResponse { formatter.write_str("struct librarian.sephirah.v1.CreateAppResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -2468,18 +2469,18 @@ impl<'de> serde::Deserialize<'de> for CreateFeedActionSetRequest { formatter.write_str("struct librarian.sephirah.v1.CreateFeedActionSetRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut action_set__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ActionSet => { if action_set__.is_some() { return Err(serde::de::Error::duplicate_field("actionSet")); } - action_set__ = map.next_value()?; + action_set__ = map_.next_value()?; } } } @@ -2559,18 +2560,18 @@ impl<'de> serde::Deserialize<'de> for CreateFeedActionSetResponse { formatter.write_str("struct librarian.sephirah.v1.CreateFeedActionSetResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -2650,18 +2651,18 @@ impl<'de> serde::Deserialize<'de> for CreateFeedConfigRequest { formatter.write_str("struct librarian.sephirah.v1.CreateFeedConfigRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut config__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Config => { if config__.is_some() { return Err(serde::de::Error::duplicate_field("config")); } - config__ = map.next_value()?; + config__ = map_.next_value()?; } } } @@ -2741,18 +2742,18 @@ impl<'de> serde::Deserialize<'de> for CreateFeedConfigResponse { formatter.write_str("struct librarian.sephirah.v1.CreateFeedConfigResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -2832,18 +2833,18 @@ impl<'de> serde::Deserialize<'de> for CreateFeedItemCollectionRequest { formatter.write_str("struct librarian.sephirah.v1.CreateFeedItemCollectionRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut collection__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Collection => { if collection__.is_some() { return Err(serde::de::Error::duplicate_field("collection")); } - collection__ = map.next_value()?; + collection__ = map_.next_value()?; } } } @@ -2912,12 +2913,12 @@ impl<'de> serde::Deserialize<'de> for CreateFeedItemCollectionResponse { formatter.write_str("struct librarian.sephirah.v1.CreateFeedItemCollectionResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(CreateFeedItemCollectionResponse { }) @@ -2994,18 +2995,18 @@ impl<'de> serde::Deserialize<'de> for CreateNotifyFlowRequest { formatter.write_str("struct librarian.sephirah.v1.CreateNotifyFlowRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut flow__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Flow => { if flow__.is_some() { return Err(serde::de::Error::duplicate_field("flow")); } - flow__ = map.next_value()?; + flow__ = map_.next_value()?; } } } @@ -3085,18 +3086,18 @@ impl<'de> serde::Deserialize<'de> for CreateNotifyFlowResponse { formatter.write_str("struct librarian.sephirah.v1.CreateNotifyFlowResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -3176,18 +3177,18 @@ impl<'de> serde::Deserialize<'de> for CreateNotifyTargetRequest { formatter.write_str("struct librarian.sephirah.v1.CreateNotifyTargetRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut target__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Target => { if target__.is_some() { return Err(serde::de::Error::duplicate_field("target")); } - target__ = map.next_value()?; + target__ = map_.next_value()?; } } } @@ -3267,18 +3268,18 @@ impl<'de> serde::Deserialize<'de> for CreateNotifyTargetResponse { formatter.write_str("struct librarian.sephirah.v1.CreateNotifyTargetResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -3368,25 +3369,25 @@ impl<'de> serde::Deserialize<'de> for CreatePorterContextRequest { formatter.write_str("struct librarian.sephirah.v1.CreatePorterContextRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut porter_id__ = None; let mut context__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::PorterId => { if porter_id__.is_some() { return Err(serde::de::Error::duplicate_field("porterId")); } - porter_id__ = map.next_value()?; + porter_id__ = map_.next_value()?; } GeneratedField::Context => { if context__.is_some() { return Err(serde::de::Error::duplicate_field("context")); } - context__ = map.next_value()?; + context__ = map_.next_value()?; } } } @@ -3468,18 +3469,18 @@ impl<'de> serde::Deserialize<'de> for CreatePorterContextResponse { formatter.write_str("struct librarian.sephirah.v1.CreatePorterContextResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut context_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ContextId => { if context_id__.is_some() { return Err(serde::de::Error::duplicate_field("contextId")); } - context_id__ = map.next_value()?; + context_id__ = map_.next_value()?; } } } @@ -3560,18 +3561,18 @@ impl<'de> serde::Deserialize<'de> for CreateSharedAppSaveFileRequest { formatter.write_str("struct librarian.sephirah.v1.CreateSharedAppSaveFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut shared_app_save_file__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SharedAppSaveFile => { if shared_app_save_file__.is_some() { return Err(serde::de::Error::duplicate_field("sharedAppSaveFile")); } - shared_app_save_file__ = map.next_value()?; + shared_app_save_file__ = map_.next_value()?; } } } @@ -3651,18 +3652,18 @@ impl<'de> serde::Deserialize<'de> for CreateSharedAppSaveFileResponse { formatter.write_str("struct librarian.sephirah.v1.CreateSharedAppSaveFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -3743,18 +3744,18 @@ impl<'de> serde::Deserialize<'de> for CreateSharedAppSaveRequest { formatter.write_str("struct librarian.sephirah.v1.CreateSharedAppSaveRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut shared_app_save__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SharedAppSave => { if shared_app_save__.is_some() { return Err(serde::de::Error::duplicate_field("sharedAppSave")); } - shared_app_save__ = map.next_value()?; + shared_app_save__ = map_.next_value()?; } } } @@ -3834,18 +3835,18 @@ impl<'de> serde::Deserialize<'de> for CreateSharedAppSaveResponse { formatter.write_str("struct librarian.sephirah.v1.CreateSharedAppSaveResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -3925,18 +3926,18 @@ impl<'de> serde::Deserialize<'de> for CreateTagRequest { formatter.write_str("struct librarian.sephirah.v1.CreateTagRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut tag__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Tag => { if tag__.is_some() { return Err(serde::de::Error::duplicate_field("tag")); } - tag__ = map.next_value()?; + tag__ = map_.next_value()?; } } } @@ -4016,18 +4017,18 @@ impl<'de> serde::Deserialize<'de> for CreateTagResponse { formatter.write_str("struct librarian.sephirah.v1.CreateTagResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -4107,18 +4108,18 @@ impl<'de> serde::Deserialize<'de> for CreateUserRequest { formatter.write_str("struct librarian.sephirah.v1.CreateUserRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut user__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::User => { if user__.is_some() { return Err(serde::de::Error::duplicate_field("user")); } - user__ = map.next_value()?; + user__ = map_.next_value()?; } } } @@ -4198,18 +4199,18 @@ impl<'de> serde::Deserialize<'de> for CreateUserResponse { formatter.write_str("struct librarian.sephirah.v1.CreateUserResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -4290,18 +4291,18 @@ impl<'de> serde::Deserialize<'de> for DeleteUserSessionRequest { formatter.write_str("struct librarian.sephirah.v1.DeleteUserSessionRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut session_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SessionId => { if session_id__.is_some() { return Err(serde::de::Error::duplicate_field("sessionId")); } - session_id__ = map.next_value()?; + session_id__ = map_.next_value()?; } } } @@ -4370,12 +4371,12 @@ impl<'de> serde::Deserialize<'de> for DeleteUserSessionResponse { formatter.write_str("struct librarian.sephirah.v1.DeleteUserSessionResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(DeleteUserSessionResponse { }) @@ -4421,8 +4422,8 @@ impl serde::Serialize for DeviceInfo { struct_ser.serialize_field("deviceName", &self.device_name)?; } if self.system_type != 0 { - let v = SystemType::from_i32(self.system_type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.system_type)))?; + let v = SystemType::try_from(self.system_type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.system_type)))?; struct_ser.serialize_field("systemType", &v)?; } if !self.system_version.is_empty() { @@ -4515,7 +4516,7 @@ impl<'de> serde::Deserialize<'de> for DeviceInfo { formatter.write_str("struct librarian.sephirah.v1.DeviceInfo") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -4526,49 +4527,49 @@ impl<'de> serde::Deserialize<'de> for DeviceInfo { let mut client_name__ = None; let mut client_source_code_address__ = None; let mut client_version__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::DeviceId => { if device_id__.is_some() { return Err(serde::de::Error::duplicate_field("deviceId")); } - device_id__ = map.next_value()?; + device_id__ = map_.next_value()?; } GeneratedField::DeviceName => { if device_name__.is_some() { return Err(serde::de::Error::duplicate_field("deviceName")); } - device_name__ = Some(map.next_value()?); + device_name__ = Some(map_.next_value()?); } GeneratedField::SystemType => { if system_type__.is_some() { return Err(serde::de::Error::duplicate_field("systemType")); } - system_type__ = Some(map.next_value::()? as i32); + system_type__ = Some(map_.next_value::()? as i32); } GeneratedField::SystemVersion => { if system_version__.is_some() { return Err(serde::de::Error::duplicate_field("systemVersion")); } - system_version__ = Some(map.next_value()?); + system_version__ = Some(map_.next_value()?); } GeneratedField::ClientName => { if client_name__.is_some() { return Err(serde::de::Error::duplicate_field("clientName")); } - client_name__ = Some(map.next_value()?); + client_name__ = Some(map_.next_value()?); } GeneratedField::ClientSourceCodeAddress => { if client_source_code_address__.is_some() { return Err(serde::de::Error::duplicate_field("clientSourceCodeAddress")); } - client_source_code_address__ = Some(map.next_value()?); + client_source_code_address__ = Some(map_.next_value()?); } GeneratedField::ClientVersion => { if client_version__.is_some() { return Err(serde::de::Error::duplicate_field("clientVersion")); } - client_version__ = Some(map.next_value()?); + client_version__ = Some(map_.next_value()?); } } } @@ -4654,18 +4655,18 @@ impl<'de> serde::Deserialize<'de> for DownloadAppBinaryRequest { formatter.write_str("struct librarian.sephirah.v1.DownloadAppBinaryRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -4755,25 +4756,25 @@ impl<'de> serde::Deserialize<'de> for DownloadAppBinaryResponse { formatter.write_str("struct librarian.sephirah.v1.DownloadAppBinaryResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_binary__ = None; let mut token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppBinary => { if app_binary__.is_some() { return Err(serde::de::Error::duplicate_field("appBinary")); } - app_binary__ = map.next_value()?; + app_binary__ = map_.next_value()?; } GeneratedField::Token => { if token__.is_some() { return Err(serde::de::Error::duplicate_field("token")); } - token__ = Some(map.next_value()?); + token__ = Some(map_.next_value()?); } } } @@ -4854,18 +4855,18 @@ impl<'de> serde::Deserialize<'de> for DownloadAppSaveFileRequest { formatter.write_str("struct librarian.sephirah.v1.DownloadAppSaveFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -4946,18 +4947,18 @@ impl<'de> serde::Deserialize<'de> for DownloadAppSaveFileResponse { formatter.write_str("struct librarian.sephirah.v1.DownloadAppSaveFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut download_token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::DownloadToken => { if download_token__.is_some() { return Err(serde::de::Error::duplicate_field("downloadToken")); } - download_token__ = Some(map.next_value()?); + download_token__ = Some(map_.next_value()?); } } } @@ -4985,9 +4986,11 @@ impl serde::Serialize for DownloadFileRequest { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.DownloadFileRequest", len)?; if self.start_chunk_number != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("startChunkNumber", ToString::to_string(&self.start_chunk_number).as_str())?; } if let Some(v) = self.end_chunk_number.as_ref() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("endChunkNumber", ToString::to_string(&v).as_str())?; } struct_ser.end() @@ -5048,20 +5051,20 @@ impl<'de> serde::Deserialize<'de> for DownloadFileRequest { formatter.write_str("struct librarian.sephirah.v1.DownloadFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut start_chunk_number__ = None; let mut end_chunk_number__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::StartChunkNumber => { if start_chunk_number__.is_some() { return Err(serde::de::Error::duplicate_field("startChunkNumber")); } start_chunk_number__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::EndChunkNumber => { @@ -5069,7 +5072,7 @@ impl<'de> serde::Deserialize<'de> for DownloadFileRequest { return Err(serde::de::Error::duplicate_field("endChunkNumber")); } end_chunk_number__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } } @@ -5152,18 +5155,18 @@ impl<'de> serde::Deserialize<'de> for DownloadFileResponse { formatter.write_str("struct librarian.sephirah.v1.DownloadFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut file_chunk__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FileChunk => { if file_chunk__.is_some() { return Err(serde::de::Error::duplicate_field("fileChunk")); } - file_chunk__ = map.next_value()?; + file_chunk__ = map_.next_value()?; } } } @@ -5243,18 +5246,18 @@ impl<'de> serde::Deserialize<'de> for DownloadImageRequest { formatter.write_str("struct librarian.sephirah.v1.DownloadImageRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -5335,18 +5338,18 @@ impl<'de> serde::Deserialize<'de> for DownloadImageResponse { formatter.write_str("struct librarian.sephirah.v1.DownloadImageResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut download_token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::DownloadToken => { if download_token__.is_some() { return Err(serde::de::Error::duplicate_field("downloadToken")); } - download_token__ = Some(map.next_value()?); + download_token__ = Some(map_.next_value()?); } } } @@ -5407,10 +5410,9 @@ impl<'de> serde::Deserialize<'de> for ErrorReason { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(ErrorReason::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -5420,10 +5422,9 @@ impl<'de> serde::Deserialize<'de> for ErrorReason { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(ErrorReason::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -5544,7 +5545,7 @@ impl<'de> serde::Deserialize<'de> for FeedActionSet { formatter.write_str("struct librarian.sephirah.v1.FeedActionSet") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -5552,31 +5553,31 @@ impl<'de> serde::Deserialize<'de> for FeedActionSet { let mut name__ = None; let mut description__ = None; let mut actions__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Actions => { if actions__.is_some() { return Err(serde::de::Error::duplicate_field("actions")); } - actions__ = Some(map.next_value()?); + actions__ = Some(map_.next_value()?); } } } @@ -5652,8 +5653,8 @@ impl serde::Serialize for FeedConfig { struct_ser.serialize_field("actionSets", &self.action_sets)?; } if self.status != 0 { - let v = FeedConfigStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = FeedConfigStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } if let Some(v) = self.pull_interval.as_ref() { @@ -5669,8 +5670,8 @@ impl serde::Serialize for FeedConfig { struct_ser.serialize_field("latestPullTime", v)?; } if let Some(v) = self.latest_pull_status.as_ref() { - let v = FeedConfigPullStatus::from_i32(*v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", *v)))?; + let v = FeedConfigPullStatus::try_from(*v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", *v)))?; struct_ser.serialize_field("latestPullStatus", &v)?; } if let Some(v) = self.latest_pull_message.as_ref() { @@ -5768,7 +5769,7 @@ impl<'de> serde::Deserialize<'de> for FeedConfig { formatter.write_str("struct librarian.sephirah.v1.FeedConfig") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -5784,79 +5785,79 @@ impl<'de> serde::Deserialize<'de> for FeedConfig { let mut latest_pull_time__ = None; let mut latest_pull_status__ = None; let mut latest_pull_message__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Source => { if source__.is_some() { return Err(serde::de::Error::duplicate_field("source")); } - source__ = map.next_value()?; + source__ = map_.next_value()?; } GeneratedField::ActionSets => { if action_sets__.is_some() { return Err(serde::de::Error::duplicate_field("actionSets")); } - action_sets__ = Some(map.next_value()?); + action_sets__ = Some(map_.next_value()?); } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } GeneratedField::PullInterval => { if pull_interval__.is_some() { return Err(serde::de::Error::duplicate_field("pullInterval")); } - pull_interval__ = map.next_value()?; + pull_interval__ = map_.next_value()?; } GeneratedField::Category => { if category__.is_some() { return Err(serde::de::Error::duplicate_field("category")); } - category__ = Some(map.next_value()?); + category__ = Some(map_.next_value()?); } GeneratedField::HideItems => { if hide_items__.is_some() { return Err(serde::de::Error::duplicate_field("hideItems")); } - hide_items__ = Some(map.next_value()?); + hide_items__ = Some(map_.next_value()?); } GeneratedField::LatestPullTime => { if latest_pull_time__.is_some() { return Err(serde::de::Error::duplicate_field("latestPullTime")); } - latest_pull_time__ = map.next_value()?; + latest_pull_time__ = map_.next_value()?; } GeneratedField::LatestPullStatus => { if latest_pull_status__.is_some() { return Err(serde::de::Error::duplicate_field("latestPullStatus")); } - latest_pull_status__ = map.next_value::<::std::option::Option>()?.map(|x| x as i32); + latest_pull_status__ = map_.next_value::<::std::option::Option>()?.map(|x| x as i32); } GeneratedField::LatestPullMessage => { if latest_pull_message__.is_some() { return Err(serde::de::Error::duplicate_field("latestPullMessage")); } - latest_pull_message__ = map.next_value()?; + latest_pull_message__ = map_.next_value()?; } } } @@ -5920,10 +5921,9 @@ impl<'de> serde::Deserialize<'de> for FeedConfigPullStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(FeedConfigPullStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -5933,10 +5933,9 @@ impl<'de> serde::Deserialize<'de> for FeedConfigPullStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(FeedConfigPullStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -5997,10 +5996,9 @@ impl<'de> serde::Deserialize<'de> for FeedConfigStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(FeedConfigStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -6010,10 +6008,9 @@ impl<'de> serde::Deserialize<'de> for FeedConfigStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(FeedConfigStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -6129,7 +6126,7 @@ impl<'de> serde::Deserialize<'de> for FeedItemCollection { formatter.write_str("struct librarian.sephirah.v1.FeedItemCollection") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -6137,31 +6134,31 @@ impl<'de> serde::Deserialize<'de> for FeedItemCollection { let mut name__ = None; let mut description__ = None; let mut category__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Category => { if category__.is_some() { return Err(serde::de::Error::duplicate_field("category")); } - category__ = Some(map.next_value()?); + category__ = Some(map_.next_value()?); } } } @@ -6255,6 +6252,7 @@ impl serde::Serialize for FeedItemDigest { struct_ser.serialize_field("feedAvatarUrl", &self.feed_avatar_url)?; } if self.read_count != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("readCount", ToString::to_string(&self.read_count).as_str())?; } struct_ser.end() @@ -6353,7 +6351,7 @@ impl<'de> serde::Deserialize<'de> for FeedItemDigest { formatter.write_str("struct librarian.sephirah.v1.FeedItemDigest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -6369,80 +6367,80 @@ impl<'de> serde::Deserialize<'de> for FeedItemDigest { let mut feed_config_name__ = None; let mut feed_avatar_url__ = None; let mut read_count__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FeedId => { if feed_id__.is_some() { return Err(serde::de::Error::duplicate_field("feedId")); } - feed_id__ = map.next_value()?; + feed_id__ = map_.next_value()?; } GeneratedField::ItemId => { if item_id__.is_some() { return Err(serde::de::Error::duplicate_field("itemId")); } - item_id__ = map.next_value()?; + item_id__ = map_.next_value()?; } GeneratedField::AvatarUrl => { if avatar_url__.is_some() { return Err(serde::de::Error::duplicate_field("avatarUrl")); } - avatar_url__ = Some(map.next_value()?); + avatar_url__ = Some(map_.next_value()?); } GeneratedField::Authors => { if authors__.is_some() { return Err(serde::de::Error::duplicate_field("authors")); } - authors__ = Some(map.next_value()?); + authors__ = Some(map_.next_value()?); } GeneratedField::PublishedParsedTime => { if published_parsed_time__.is_some() { return Err(serde::de::Error::duplicate_field("publishedParsedTime")); } - published_parsed_time__ = map.next_value()?; + published_parsed_time__ = map_.next_value()?; } GeneratedField::Title => { if title__.is_some() { return Err(serde::de::Error::duplicate_field("title")); } - title__ = Some(map.next_value()?); + title__ = Some(map_.next_value()?); } GeneratedField::ShortDescription => { if short_description__.is_some() { return Err(serde::de::Error::duplicate_field("shortDescription")); } - short_description__ = Some(map.next_value()?); + short_description__ = Some(map_.next_value()?); } GeneratedField::ImageUrls => { if image_urls__.is_some() { return Err(serde::de::Error::duplicate_field("imageUrls")); } - image_urls__ = Some(map.next_value()?); + image_urls__ = Some(map_.next_value()?); } GeneratedField::PublishPlatform => { if publish_platform__.is_some() { return Err(serde::de::Error::duplicate_field("publishPlatform")); } - publish_platform__ = Some(map.next_value()?); + publish_platform__ = Some(map_.next_value()?); } GeneratedField::FeedConfigName => { if feed_config_name__.is_some() { return Err(serde::de::Error::duplicate_field("feedConfigName")); } - feed_config_name__ = Some(map.next_value()?); + feed_config_name__ = Some(map_.next_value()?); } GeneratedField::FeedAvatarUrl => { if feed_avatar_url__.is_some() { return Err(serde::de::Error::duplicate_field("feedAvatarUrl")); } - feed_avatar_url__ = Some(map.next_value()?); + feed_avatar_url__ = Some(map_.next_value()?); } GeneratedField::ReadCount => { if read_count__.is_some() { return Err(serde::de::Error::duplicate_field("readCount")); } read_count__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -6482,9 +6480,11 @@ impl serde::Serialize for FileChunk { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.FileChunk", len)?; if self.chunk_number != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("chunkNumber", ToString::to_string(&self.chunk_number).as_str())?; } if !self.data.is_empty() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("data", pbjson::private::base64::encode(&self.data).as_str())?; } struct_ser.end() @@ -6544,20 +6544,20 @@ impl<'de> serde::Deserialize<'de> for FileChunk { formatter.write_str("struct librarian.sephirah.v1.FileChunk") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut chunk_number__ = None; let mut data__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ChunkNumber => { if chunk_number__.is_some() { return Err(serde::de::Error::duplicate_field("chunkNumber")); } chunk_number__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Data => { @@ -6565,7 +6565,7 @@ impl<'de> serde::Deserialize<'de> for FileChunk { return Err(serde::de::Error::duplicate_field("data")); } data__ = - Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) ; } } @@ -6613,14 +6613,16 @@ impl serde::Serialize for FileMetadata { struct_ser.serialize_field("name", &self.name)?; } if self.size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sizeBytes", ToString::to_string(&self.size_bytes).as_str())?; } if self.r#type != 0 { - let v = FileType::from_i32(self.r#type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; + let v = FileType::try_from(self.r#type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; struct_ser.serialize_field("type", &v)?; } if !self.sha256.is_empty() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sha256", pbjson::private::base64::encode(&self.sha256).as_str())?; } if let Some(v) = self.create_time.as_ref() { @@ -6696,7 +6698,7 @@ impl<'de> serde::Deserialize<'de> for FileMetadata { formatter.write_str("struct librarian.sephirah.v1.FileMetadata") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -6706,47 +6708,47 @@ impl<'de> serde::Deserialize<'de> for FileMetadata { let mut r#type__ = None; let mut sha256__ = None; let mut create_time__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::SizeBytes => { if size_bytes__.is_some() { return Err(serde::de::Error::duplicate_field("sizeBytes")); } size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Type => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("type")); } - r#type__ = Some(map.next_value::()? as i32); + r#type__ = Some(map_.next_value::()? as i32); } GeneratedField::Sha256 => { if sha256__.is_some() { return Err(serde::de::Error::duplicate_field("sha256")); } sha256__ = - Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) ; } GeneratedField::CreateTime => { if create_time__.is_some() { return Err(serde::de::Error::duplicate_field("createTime")); } - create_time__ = map.next_value()?; + create_time__ = map_.next_value()?; } } } @@ -6806,10 +6808,9 @@ impl<'de> serde::Deserialize<'de> for FileTransferStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(FileTransferStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -6819,10 +6820,9 @@ impl<'de> serde::Deserialize<'de> for FileTransferStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(FileTransferStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -6884,10 +6884,9 @@ impl<'de> serde::Deserialize<'de> for FileType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(FileType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -6897,10 +6896,9 @@ impl<'de> serde::Deserialize<'de> for FileType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(FileType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -6990,18 +6988,18 @@ impl<'de> serde::Deserialize<'de> for GetAppInfoRequest { formatter.write_str("struct librarian.sephirah.v1.GetAppInfoRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfoId => { if app_info_id__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoId")); } - app_info_id__ = map.next_value()?; + app_info_id__ = map_.next_value()?; } } } @@ -7082,18 +7080,18 @@ impl<'de> serde::Deserialize<'de> for GetAppInfoResponse { formatter.write_str("struct librarian.sephirah.v1.GetAppInfoResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfo => { if app_info__.is_some() { return Err(serde::de::Error::duplicate_field("appInfo")); } - app_info__ = map.next_value()?; + app_info__ = map_.next_value()?; } } } @@ -7177,18 +7175,18 @@ impl<'de> serde::Deserialize<'de> for GetAppSaveFileCapacityDefaultRequest { formatter.write_str("struct librarian.sephirah.v1.GetAppSaveFileCapacityDefaultRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut entity__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::App => { if entity__.is_some() { return Err(serde::de::Error::duplicate_field("app")); } - entity__ = map.next_value::<::std::option::Option<_>>()?.map(get_app_save_file_capacity_default_request::Entity::App); + entity__ = map_.next_value::<::std::option::Option<_>>()?.map(get_app_save_file_capacity_default_request::Entity::App); } } } @@ -7219,14 +7217,16 @@ impl serde::Serialize for GetAppSaveFileCapacityDefaultResponse { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.GetAppSaveFileCapacityDefaultResponse", len)?; if self.count != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("count", ToString::to_string(&self.count).as_str())?; } if self.size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sizeBytes", ToString::to_string(&self.size_bytes).as_str())?; } if self.strategy != 0 { - let v = AppSaveFileCapacityStrategy::from_i32(self.strategy) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.strategy)))?; + let v = AppSaveFileCapacityStrategy::try_from(self.strategy) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.strategy)))?; struct_ser.serialize_field("strategy", &v)?; } struct_ser.end() @@ -7289,21 +7289,21 @@ impl<'de> serde::Deserialize<'de> for GetAppSaveFileCapacityDefaultResponse { formatter.write_str("struct librarian.sephirah.v1.GetAppSaveFileCapacityDefaultResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut count__ = None; let mut size_bytes__ = None; let mut strategy__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Count => { if count__.is_some() { return Err(serde::de::Error::duplicate_field("count")); } count__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::SizeBytes => { @@ -7311,14 +7311,14 @@ impl<'de> serde::Deserialize<'de> for GetAppSaveFileCapacityDefaultResponse { return Err(serde::de::Error::duplicate_field("sizeBytes")); } size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Strategy => { if strategy__.is_some() { return Err(serde::de::Error::duplicate_field("strategy")); } - strategy__ = Some(map.next_value::()? as i32); + strategy__ = Some(map_.next_value::()? as i32); } } } @@ -7411,24 +7411,24 @@ impl<'de> serde::Deserialize<'de> for GetAppSaveFileCapacityRequest { formatter.write_str("struct librarian.sephirah.v1.GetAppSaveFileCapacityRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut entity__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::User => { if entity__.is_some() { return Err(serde::de::Error::duplicate_field("user")); } - entity__ = map.next_value::<::std::option::Option<_>>()?.map(get_app_save_file_capacity_request::Entity::User); + entity__ = map_.next_value::<::std::option::Option<_>>()?.map(get_app_save_file_capacity_request::Entity::User); } GeneratedField::AppId => { if entity__.is_some() { return Err(serde::de::Error::duplicate_field("appId")); } - entity__ = map.next_value::<::std::option::Option<_>>()?.map(get_app_save_file_capacity_request::Entity::AppId) + entity__ = map_.next_value::<::std::option::Option<_>>()?.map(get_app_save_file_capacity_request::Entity::AppId) ; } } @@ -7460,14 +7460,16 @@ impl serde::Serialize for GetAppSaveFileCapacityResponse { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.GetAppSaveFileCapacityResponse", len)?; if self.count != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("count", ToString::to_string(&self.count).as_str())?; } if self.size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sizeBytes", ToString::to_string(&self.size_bytes).as_str())?; } if self.strategy != 0 { - let v = AppSaveFileCapacityStrategy::from_i32(self.strategy) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.strategy)))?; + let v = AppSaveFileCapacityStrategy::try_from(self.strategy) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.strategy)))?; struct_ser.serialize_field("strategy", &v)?; } struct_ser.end() @@ -7530,21 +7532,21 @@ impl<'de> serde::Deserialize<'de> for GetAppSaveFileCapacityResponse { formatter.write_str("struct librarian.sephirah.v1.GetAppSaveFileCapacityResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut count__ = None; let mut size_bytes__ = None; let mut strategy__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Count => { if count__.is_some() { return Err(serde::de::Error::duplicate_field("count")); } count__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::SizeBytes => { @@ -7552,14 +7554,14 @@ impl<'de> serde::Deserialize<'de> for GetAppSaveFileCapacityResponse { return Err(serde::de::Error::duplicate_field("sizeBytes")); } size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Strategy => { if strategy__.is_some() { return Err(serde::de::Error::duplicate_field("strategy")); } - strategy__ = Some(map.next_value::()? as i32); + strategy__ = Some(map_.next_value::()? as i32); } } } @@ -7641,18 +7643,18 @@ impl<'de> serde::Deserialize<'de> for GetBatchFeedItemsRequest { formatter.write_str("struct librarian.sephirah.v1.GetBatchFeedItemsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut ids__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Ids => { if ids__.is_some() { return Err(serde::de::Error::duplicate_field("ids")); } - ids__ = Some(map.next_value()?); + ids__ = Some(map_.next_value()?); } } } @@ -7732,18 +7734,18 @@ impl<'de> serde::Deserialize<'de> for GetBatchFeedItemsResponse { formatter.write_str("struct librarian.sephirah.v1.GetBatchFeedItemsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut items__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Items => { if items__.is_some() { return Err(serde::de::Error::duplicate_field("items")); } - items__ = Some(map.next_value()?); + items__ = Some(map_.next_value()?); } } } @@ -7824,18 +7826,18 @@ impl<'de> serde::Deserialize<'de> for GetBoundAppInfosRequest { formatter.write_str("struct librarian.sephirah.v1.GetBoundAppInfosRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfoId => { if app_info_id__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoId")); } - app_info_id__ = map.next_value()?; + app_info_id__ = map_.next_value()?; } } } @@ -7916,18 +7918,18 @@ impl<'de> serde::Deserialize<'de> for GetBoundAppInfosResponse { formatter.write_str("struct librarian.sephirah.v1.GetBoundAppInfosResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } @@ -8007,18 +8009,18 @@ impl<'de> serde::Deserialize<'de> for GetFeedItemRequest { formatter.write_str("struct librarian.sephirah.v1.GetFeedItemRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -8098,18 +8100,18 @@ impl<'de> serde::Deserialize<'de> for GetFeedItemResponse { formatter.write_str("struct librarian.sephirah.v1.GetFeedItemResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut item__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Item => { if item__.is_some() { return Err(serde::de::Error::duplicate_field("item")); } - item__ = map.next_value()?; + item__ = map_.next_value()?; } } } @@ -8140,8 +8142,8 @@ impl serde::Serialize for GetFileCapacityRequest { struct_ser.serialize_field("userId", v)?; } if self.file_type != 0 { - let v = FileType::from_i32(self.file_type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.file_type)))?; + let v = FileType::try_from(self.file_type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.file_type)))?; struct_ser.serialize_field("fileType", &v)?; } struct_ser.end() @@ -8202,25 +8204,25 @@ impl<'de> serde::Deserialize<'de> for GetFileCapacityRequest { formatter.write_str("struct librarian.sephirah.v1.GetFileCapacityRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut user_id__ = None; let mut file_type__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::UserId => { if user_id__.is_some() { return Err(serde::de::Error::duplicate_field("userId")); } - user_id__ = map.next_value()?; + user_id__ = map_.next_value()?; } GeneratedField::FileType => { if file_type__.is_some() { return Err(serde::de::Error::duplicate_field("fileType")); } - file_type__ = Some(map.next_value::()? as i32); + file_type__ = Some(map_.next_value::()? as i32); } } } @@ -8249,9 +8251,11 @@ impl serde::Serialize for GetFileCapacityResponse { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.GetFileCapacityResponse", len)?; if self.limit_size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("limitSizeBytes", ToString::to_string(&self.limit_size_bytes).as_str())?; } if self.used_size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("usedSizeBytes", ToString::to_string(&self.used_size_bytes).as_str())?; } struct_ser.end() @@ -8312,20 +8316,20 @@ impl<'de> serde::Deserialize<'de> for GetFileCapacityResponse { formatter.write_str("struct librarian.sephirah.v1.GetFileCapacityResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut limit_size_bytes__ = None; let mut used_size_bytes__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::LimitSizeBytes => { if limit_size_bytes__.is_some() { return Err(serde::de::Error::duplicate_field("limitSizeBytes")); } limit_size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::UsedSizeBytes => { @@ -8333,7 +8337,7 @@ impl<'de> serde::Deserialize<'de> for GetFileCapacityResponse { return Err(serde::de::Error::duplicate_field("usedSizeBytes")); } used_size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -8415,18 +8419,18 @@ impl<'de> serde::Deserialize<'de> for GetImageRequest { formatter.write_str("struct librarian.sephirah.v1.GetImageRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -8525,32 +8529,32 @@ impl<'de> serde::Deserialize<'de> for GetImageResponse { formatter.write_str("struct librarian.sephirah.v1.GetImageResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut file_metadata__ = None; let mut name__ = None; let mut description__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FileMetadata => { if file_metadata__.is_some() { return Err(serde::de::Error::duplicate_field("fileMetadata")); } - file_metadata__ = map.next_value()?; + file_metadata__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } } } @@ -8632,18 +8636,18 @@ impl<'de> serde::Deserialize<'de> for GetPurchasedAppInfosRequest { formatter.write_str("struct librarian.sephirah.v1.GetPurchasedAppInfosRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut source__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Source => { if source__.is_some() { return Err(serde::de::Error::duplicate_field("source")); } - source__ = map.next_value()?; + source__ = map_.next_value()?; } } } @@ -8724,18 +8728,18 @@ impl<'de> serde::Deserialize<'de> for GetPurchasedAppInfosResponse { formatter.write_str("struct librarian.sephirah.v1.GetPurchasedAppInfosResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } @@ -8816,18 +8820,18 @@ impl<'de> serde::Deserialize<'de> for GetServerInformationRequest { formatter.write_str("struct librarian.sephirah.v1.GetServerInformationRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut with_status_report__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::WithStatusReport => { if with_status_report__.is_some() { return Err(serde::de::Error::duplicate_field("withStatusReport")); } - with_status_report__ = map.next_value()?; + with_status_report__ = map_.next_value()?; } } } @@ -8958,7 +8962,7 @@ impl<'de> serde::Deserialize<'de> for GetServerInformationResponse { formatter.write_str("struct librarian.sephirah.v1.GetServerInformationResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -8968,43 +8972,43 @@ impl<'de> serde::Deserialize<'de> for GetServerInformationResponse { let mut feature_summary__ = None; let mut server_instance_summary__ = None; let mut status_report__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ServerBinarySummary => { if server_binary_summary__.is_some() { return Err(serde::de::Error::duplicate_field("serverBinarySummary")); } - server_binary_summary__ = map.next_value()?; + server_binary_summary__ = map_.next_value()?; } GeneratedField::ProtocolSummary => { if protocol_summary__.is_some() { return Err(serde::de::Error::duplicate_field("protocolSummary")); } - protocol_summary__ = map.next_value()?; + protocol_summary__ = map_.next_value()?; } GeneratedField::CurrentTime => { if current_time__.is_some() { return Err(serde::de::Error::duplicate_field("currentTime")); } - current_time__ = map.next_value()?; + current_time__ = map_.next_value()?; } GeneratedField::FeatureSummary => { if feature_summary__.is_some() { return Err(serde::de::Error::duplicate_field("featureSummary")); } - feature_summary__ = map.next_value()?; + feature_summary__ = map_.next_value()?; } GeneratedField::ServerInstanceSummary => { if server_instance_summary__.is_some() { return Err(serde::de::Error::duplicate_field("serverInstanceSummary")); } - server_instance_summary__ = map.next_value()?; + server_instance_summary__ = map_.next_value()?; } GeneratedField::StatusReport => { if status_report__.is_some() { return Err(serde::de::Error::duplicate_field("statusReport")); } - status_report__ = map.next_value()?; + status_report__ = map_.next_value()?; } } } @@ -9108,32 +9112,32 @@ impl<'de> serde::Deserialize<'de> for GetTokenRequest { formatter.write_str("struct librarian.sephirah.v1.GetTokenRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut username__ = None; let mut password__ = None; let mut device_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Username => { if username__.is_some() { return Err(serde::de::Error::duplicate_field("username")); } - username__ = Some(map.next_value()?); + username__ = Some(map_.next_value()?); } GeneratedField::Password => { if password__.is_some() { return Err(serde::de::Error::duplicate_field("password")); } - password__ = Some(map.next_value()?); + password__ = Some(map_.next_value()?); } GeneratedField::DeviceId => { if device_id__.is_some() { return Err(serde::de::Error::duplicate_field("deviceId")); } - device_id__ = map.next_value()?; + device_id__ = map_.next_value()?; } } } @@ -9226,25 +9230,25 @@ impl<'de> serde::Deserialize<'de> for GetTokenResponse { formatter.write_str("struct librarian.sephirah.v1.GetTokenResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut access_token__ = None; let mut refresh_token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccessToken => { if access_token__.is_some() { return Err(serde::de::Error::duplicate_field("accessToken")); } - access_token__ = Some(map.next_value()?); + access_token__ = Some(map_.next_value()?); } GeneratedField::RefreshToken => { if refresh_token__.is_some() { return Err(serde::de::Error::duplicate_field("refreshToken")); } - refresh_token__ = Some(map.next_value()?); + refresh_token__ = Some(map_.next_value()?); } } } @@ -9325,18 +9329,18 @@ impl<'de> serde::Deserialize<'de> for GetUserRequest { formatter.write_str("struct librarian.sephirah.v1.GetUserRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -9416,18 +9420,18 @@ impl<'de> serde::Deserialize<'de> for GetUserResponse { formatter.write_str("struct librarian.sephirah.v1.GetUserResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut user__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::User => { if user__.is_some() { return Err(serde::de::Error::duplicate_field("user")); } - user__ = map.next_value()?; + user__ = map_.next_value()?; } } } @@ -9558,7 +9562,7 @@ impl<'de> serde::Deserialize<'de> for GroupFeedItemsRequest { formatter.write_str("struct librarian.sephirah.v1.GroupFeedItemsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -9568,44 +9572,44 @@ impl<'de> serde::Deserialize<'de> for GroupFeedItemsRequest { let mut publish_platform_filter__ = None; let mut category_filter__ = None; let mut group_size__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::PublishTimeAggregation => { if publish_time_aggregation__.is_some() { return Err(serde::de::Error::duplicate_field("publishTimeAggregation")); } - publish_time_aggregation__ = map.next_value()?; + publish_time_aggregation__ = map_.next_value()?; } GeneratedField::FeedIdFilter => { if feed_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("feedIdFilter")); } - feed_id_filter__ = Some(map.next_value()?); + feed_id_filter__ = Some(map_.next_value()?); } GeneratedField::AuthorFilter => { if author_filter__.is_some() { return Err(serde::de::Error::duplicate_field("authorFilter")); } - author_filter__ = Some(map.next_value()?); + author_filter__ = Some(map_.next_value()?); } GeneratedField::PublishPlatformFilter => { if publish_platform_filter__.is_some() { return Err(serde::de::Error::duplicate_field("publishPlatformFilter")); } - publish_platform_filter__ = Some(map.next_value()?); + publish_platform_filter__ = Some(map_.next_value()?); } GeneratedField::CategoryFilter => { if category_filter__.is_some() { return Err(serde::de::Error::duplicate_field("categoryFilter")); } - category_filter__ = Some(map.next_value()?); + category_filter__ = Some(map_.next_value()?); } GeneratedField::GroupSize => { if group_size__.is_some() { return Err(serde::de::Error::duplicate_field("groupSize")); } group_size__ = - map.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) + map_.next_value::<::std::option::Option<::pbjson::private::NumberDeserialize<_>>>()?.map(|x| x.0) ; } } @@ -9691,18 +9695,18 @@ impl<'de> serde::Deserialize<'de> for GroupFeedItemsResponse { formatter.write_str("struct librarian.sephirah.v1.GroupFeedItemsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut groups__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Groups => { if groups__.is_some() { return Err(serde::de::Error::duplicate_field("groups")); } - groups__ = Some(map.next_value()?); + groups__ = Some(map_.next_value()?); } } } @@ -9792,25 +9796,25 @@ impl<'de> serde::Deserialize<'de> for group_feed_items_response::FeedItemsGroup formatter.write_str("struct librarian.sephirah.v1.GroupFeedItemsResponse.FeedItemsGroup") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut time_range__ = None; let mut items__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::TimeRange => { if time_range__.is_some() { return Err(serde::de::Error::duplicate_field("timeRange")); } - time_range__ = map.next_value()?; + time_range__ = map_.next_value()?; } GeneratedField::Items => { if items__.is_some() { return Err(serde::de::Error::duplicate_field("items")); } - items__ = Some(map.next_value()?); + items__ = Some(map_.next_value()?); } } } @@ -9892,18 +9896,18 @@ impl<'de> serde::Deserialize<'de> for LinkAccountRequest { formatter.write_str("struct librarian.sephirah.v1.LinkAccountRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut account_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccountId => { if account_id__.is_some() { return Err(serde::de::Error::duplicate_field("accountId")); } - account_id__ = map.next_value()?; + account_id__ = map_.next_value()?; } } } @@ -9984,18 +9988,18 @@ impl<'de> serde::Deserialize<'de> for LinkAccountResponse { formatter.write_str("struct librarian.sephirah.v1.LinkAccountResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut account_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccountId => { if account_id__.is_some() { return Err(serde::de::Error::duplicate_field("accountId")); } - account_id__ = map.next_value()?; + account_id__ = map_.next_value()?; } } } @@ -10064,12 +10068,12 @@ impl<'de> serde::Deserialize<'de> for ListAppCategoriesRequest { formatter.write_str("struct librarian.sephirah.v1.ListAppCategoriesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(ListAppCategoriesRequest { }) @@ -10147,18 +10151,18 @@ impl<'de> serde::Deserialize<'de> for ListAppCategoriesResponse { formatter.write_str("struct librarian.sephirah.v1.ListAppCategoriesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_categories__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppCategories => { if app_categories__.is_some() { return Err(serde::de::Error::duplicate_field("appCategories")); } - app_categories__ = Some(map.next_value()?); + app_categories__ = Some(map_.next_value()?); } } } @@ -10208,8 +10212,8 @@ impl serde::Serialize for ListAppInfosRequest { } if !self.type_filter.is_empty() { let v = self.type_filter.iter().cloned().map(|v| { - super::super::v1::AppType::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + super::super::v1::AppType::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("typeFilter", &v)?; } @@ -10292,7 +10296,7 @@ impl<'de> serde::Deserialize<'de> for ListAppInfosRequest { formatter.write_str("struct librarian.sephirah.v1.ListAppInfosRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -10302,43 +10306,43 @@ impl<'de> serde::Deserialize<'de> for ListAppInfosRequest { let mut type_filter__ = None; let mut id_filter__ = None; let mut contain_details__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::ExcludeInternal => { if exclude_internal__.is_some() { return Err(serde::de::Error::duplicate_field("excludeInternal")); } - exclude_internal__ = Some(map.next_value()?); + exclude_internal__ = Some(map_.next_value()?); } GeneratedField::SourceFilter => { if source_filter__.is_some() { return Err(serde::de::Error::duplicate_field("sourceFilter")); } - source_filter__ = Some(map.next_value()?); + source_filter__ = Some(map_.next_value()?); } GeneratedField::TypeFilter => { if type_filter__.is_some() { return Err(serde::de::Error::duplicate_field("typeFilter")); } - type_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + type_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::ContainDetails => { if contain_details__.is_some() { return Err(serde::de::Error::duplicate_field("containDetails")); } - contain_details__ = Some(map.next_value()?); + contain_details__ = Some(map_.next_value()?); } } } @@ -10433,25 +10437,25 @@ impl<'de> serde::Deserialize<'de> for ListAppInfosResponse { formatter.write_str("struct librarian.sephirah.v1.ListAppInfosResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } @@ -10562,7 +10566,7 @@ impl<'de> serde::Deserialize<'de> for ListAppInstsRequest { formatter.write_str("struct librarian.sephirah.v1.ListAppInstsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -10570,31 +10574,31 @@ impl<'de> serde::Deserialize<'de> for ListAppInstsRequest { let mut device_id_filter__ = None; let mut id_filter__ = None; let mut app_id_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::DeviceIdFilter => { if device_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("deviceIdFilter")); } - device_id_filter__ = Some(map.next_value()?); + device_id_filter__ = Some(map_.next_value()?); } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::AppIdFilter => { if app_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("appIdFilter")); } - app_id_filter__ = Some(map.next_value()?); + app_id_filter__ = Some(map_.next_value()?); } } } @@ -10687,25 +10691,25 @@ impl<'de> serde::Deserialize<'de> for ListAppInstsResponse { formatter.write_str("struct librarian.sephirah.v1.ListAppInstsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut app_insts__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::AppInsts => { if app_insts__.is_some() { return Err(serde::de::Error::duplicate_field("appInsts")); } - app_insts__ = Some(map.next_value()?); + app_insts__ = Some(map_.next_value()?); } } } @@ -10787,18 +10791,18 @@ impl<'de> serde::Deserialize<'de> for ListAppSaveFilesRequest { formatter.write_str("struct librarian.sephirah.v1.ListAppSaveFilesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppId => { if app_id__.is_some() { return Err(serde::de::Error::duplicate_field("appId")); } - app_id__ = map.next_value()?; + app_id__ = map_.next_value()?; } } } @@ -10878,18 +10882,18 @@ impl<'de> serde::Deserialize<'de> for ListAppSaveFilesResponse { formatter.write_str("struct librarian.sephirah.v1.ListAppSaveFilesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut results__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Results => { if results__.is_some() { return Err(serde::de::Error::duplicate_field("results")); } - results__ = Some(map.next_value()?); + results__ = Some(map_.next_value()?); } } } @@ -10987,32 +10991,32 @@ impl<'de> serde::Deserialize<'de> for list_app_save_files_response::Result { formatter.write_str("struct librarian.sephirah.v1.ListAppSaveFilesResponse.Result") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut file__ = None; let mut pinned__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::File => { if file__.is_some() { return Err(serde::de::Error::duplicate_field("file")); } - file__ = map.next_value()?; + file__ = map_.next_value()?; } GeneratedField::Pinned => { if pinned__.is_some() { return Err(serde::de::Error::duplicate_field("pinned")); } - pinned__ = Some(map.next_value()?); + pinned__ = Some(map_.next_value()?); } } } @@ -11124,7 +11128,7 @@ impl<'de> serde::Deserialize<'de> for ListAppsRequest { formatter.write_str("struct librarian.sephirah.v1.ListAppsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -11132,31 +11136,31 @@ impl<'de> serde::Deserialize<'de> for ListAppsRequest { let mut owner_id_filter__ = None; let mut id_filter__ = None; let mut assigned_app_info_id_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::OwnerIdFilter => { if owner_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("ownerIdFilter")); } - owner_id_filter__ = Some(map.next_value()?); + owner_id_filter__ = Some(map_.next_value()?); } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::AssignedAppInfoIdFilter => { if assigned_app_info_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("assignedAppInfoIdFilter")); } - assigned_app_info_id_filter__ = Some(map.next_value()?); + assigned_app_info_id_filter__ = Some(map_.next_value()?); } } } @@ -11248,25 +11252,25 @@ impl<'de> serde::Deserialize<'de> for ListAppsResponse { formatter.write_str("struct librarian.sephirah.v1.ListAppsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut apps__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Apps => { if apps__.is_some() { return Err(serde::de::Error::duplicate_field("apps")); } - apps__ = Some(map.next_value()?); + apps__ = Some(map_.next_value()?); } } } @@ -11347,18 +11351,18 @@ impl<'de> serde::Deserialize<'de> for ListFeedActionSetsRequest { formatter.write_str("struct librarian.sephirah.v1.ListFeedActionSetsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } } } @@ -11448,25 +11452,25 @@ impl<'de> serde::Deserialize<'de> for ListFeedActionSetsResponse { formatter.write_str("struct librarian.sephirah.v1.ListFeedActionSetsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut action_sets__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::ActionSets => { if action_sets__.is_some() { return Err(serde::de::Error::duplicate_field("actionSets")); } - action_sets__ = Some(map.next_value()?); + action_sets__ = Some(map_.next_value()?); } } } @@ -11536,12 +11540,12 @@ impl<'de> serde::Deserialize<'de> for ListFeedCategoriesRequest { formatter.write_str("struct librarian.sephirah.v1.ListFeedCategoriesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(ListFeedCategoriesRequest { }) @@ -11618,18 +11622,18 @@ impl<'de> serde::Deserialize<'de> for ListFeedCategoriesResponse { formatter.write_str("struct librarian.sephirah.v1.ListFeedCategoriesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut categories__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Categories => { if categories__.is_some() { return Err(serde::de::Error::duplicate_field("categories")); } - categories__ = Some(map.next_value()?); + categories__ = Some(map_.next_value()?); } } } @@ -11682,8 +11686,8 @@ impl serde::Serialize for ListFeedConfigsRequest { } if !self.status_filter.is_empty() { let v = self.status_filter.iter().cloned().map(|v| { - FeedConfigStatus::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + FeedConfigStatus::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("statusFilter", &v)?; } @@ -11763,7 +11767,7 @@ impl<'de> serde::Deserialize<'de> for ListFeedConfigsRequest { formatter.write_str("struct librarian.sephirah.v1.ListFeedConfigsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -11773,43 +11777,43 @@ impl<'de> serde::Deserialize<'de> for ListFeedConfigsRequest { let mut source_filter__ = None; let mut status_filter__ = None; let mut category_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::AuthorIdFilter => { if author_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("authorIdFilter")); } - author_id_filter__ = Some(map.next_value()?); + author_id_filter__ = Some(map_.next_value()?); } GeneratedField::SourceFilter => { if source_filter__.is_some() { return Err(serde::de::Error::duplicate_field("sourceFilter")); } - source_filter__ = Some(map.next_value()?); + source_filter__ = Some(map_.next_value()?); } GeneratedField::StatusFilter => { if status_filter__.is_some() { return Err(serde::de::Error::duplicate_field("statusFilter")); } - status_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + status_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } GeneratedField::CategoryFilter => { if category_filter__.is_some() { return Err(serde::de::Error::duplicate_field("categoryFilter")); } - category_filter__ = Some(map.next_value()?); + category_filter__ = Some(map_.next_value()?); } } } @@ -11904,25 +11908,25 @@ impl<'de> serde::Deserialize<'de> for ListFeedConfigsResponse { formatter.write_str("struct librarian.sephirah.v1.ListFeedConfigsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut feeds_with_config__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::FeedsWithConfig => { if feeds_with_config__.is_some() { return Err(serde::de::Error::duplicate_field("feedsWithConfig")); } - feeds_with_config__ = Some(map.next_value()?); + feeds_with_config__ = Some(map_.next_value()?); } } } @@ -12012,25 +12016,25 @@ impl<'de> serde::Deserialize<'de> for list_feed_configs_response::FeedWithConfig formatter.write_str("struct librarian.sephirah.v1.ListFeedConfigsResponse.FeedWithConfig") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut feed__ = None; let mut config__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Feed => { if feed__.is_some() { return Err(serde::de::Error::duplicate_field("feed")); } - feed__ = map.next_value()?; + feed__ = map_.next_value()?; } GeneratedField::Config => { if config__.is_some() { return Err(serde::de::Error::duplicate_field("config")); } - config__ = map.next_value()?; + config__ = map_.next_value()?; } } } @@ -12131,32 +12135,32 @@ impl<'de> serde::Deserialize<'de> for ListFeedItemCollectionsRequest { formatter.write_str("struct librarian.sephirah.v1.ListFeedItemCollectionsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut id_filter__ = None; let mut category_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::CategoryFilter => { if category_filter__.is_some() { return Err(serde::de::Error::duplicate_field("categoryFilter")); } - category_filter__ = Some(map.next_value()?); + category_filter__ = Some(map_.next_value()?); } } } @@ -12247,25 +12251,25 @@ impl<'de> serde::Deserialize<'de> for ListFeedItemCollectionsResponse { formatter.write_str("struct librarian.sephirah.v1.ListFeedItemCollectionsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut collections__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Collections => { if collections__.is_some() { return Err(serde::de::Error::duplicate_field("collections")); } - collections__ = Some(map.next_value()?); + collections__ = Some(map_.next_value()?); } } } @@ -12396,7 +12400,7 @@ impl<'de> serde::Deserialize<'de> for ListFeedItemsInCollectionRequest { formatter.write_str("struct librarian.sephirah.v1.ListFeedItemsInCollectionRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -12406,43 +12410,43 @@ impl<'de> serde::Deserialize<'de> for ListFeedItemsInCollectionRequest { let mut publish_platform_filter__ = None; let mut category_filter__ = None; let mut publish_time_range__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::CollectionIdFilter => { if collection_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("collectionIdFilter")); } - collection_id_filter__ = Some(map.next_value()?); + collection_id_filter__ = Some(map_.next_value()?); } GeneratedField::AuthorFilter => { if author_filter__.is_some() { return Err(serde::de::Error::duplicate_field("authorFilter")); } - author_filter__ = Some(map.next_value()?); + author_filter__ = Some(map_.next_value()?); } GeneratedField::PublishPlatformFilter => { if publish_platform_filter__.is_some() { return Err(serde::de::Error::duplicate_field("publishPlatformFilter")); } - publish_platform_filter__ = Some(map.next_value()?); + publish_platform_filter__ = Some(map_.next_value()?); } GeneratedField::CategoryFilter => { if category_filter__.is_some() { return Err(serde::de::Error::duplicate_field("categoryFilter")); } - category_filter__ = Some(map.next_value()?); + category_filter__ = Some(map_.next_value()?); } GeneratedField::PublishTimeRange => { if publish_time_range__.is_some() { return Err(serde::de::Error::duplicate_field("publishTimeRange")); } - publish_time_range__ = map.next_value()?; + publish_time_range__ = map_.next_value()?; } } } @@ -12536,25 +12540,25 @@ impl<'de> serde::Deserialize<'de> for ListFeedItemsInCollectionResponse { formatter.write_str("struct librarian.sephirah.v1.ListFeedItemsInCollectionResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut items__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Items => { if items__.is_some() { return Err(serde::de::Error::duplicate_field("items")); } - items__ = Some(map.next_value()?); + items__ = Some(map_.next_value()?); } } } @@ -12685,7 +12689,7 @@ impl<'de> serde::Deserialize<'de> for ListFeedItemsRequest { formatter.write_str("struct librarian.sephirah.v1.ListFeedItemsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -12695,43 +12699,43 @@ impl<'de> serde::Deserialize<'de> for ListFeedItemsRequest { let mut publish_platform_filter__ = None; let mut category_filter__ = None; let mut publish_time_range__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::FeedIdFilter => { if feed_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("feedIdFilter")); } - feed_id_filter__ = Some(map.next_value()?); + feed_id_filter__ = Some(map_.next_value()?); } GeneratedField::AuthorFilter => { if author_filter__.is_some() { return Err(serde::de::Error::duplicate_field("authorFilter")); } - author_filter__ = Some(map.next_value()?); + author_filter__ = Some(map_.next_value()?); } GeneratedField::PublishPlatformFilter => { if publish_platform_filter__.is_some() { return Err(serde::de::Error::duplicate_field("publishPlatformFilter")); } - publish_platform_filter__ = Some(map.next_value()?); + publish_platform_filter__ = Some(map_.next_value()?); } GeneratedField::CategoryFilter => { if category_filter__.is_some() { return Err(serde::de::Error::duplicate_field("categoryFilter")); } - category_filter__ = Some(map.next_value()?); + category_filter__ = Some(map_.next_value()?); } GeneratedField::PublishTimeRange => { if publish_time_range__.is_some() { return Err(serde::de::Error::duplicate_field("publishTimeRange")); } - publish_time_range__ = map.next_value()?; + publish_time_range__ = map_.next_value()?; } } } @@ -12825,25 +12829,25 @@ impl<'de> serde::Deserialize<'de> for ListFeedItemsResponse { formatter.write_str("struct librarian.sephirah.v1.ListFeedItemsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut items__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Items => { if items__.is_some() { return Err(serde::de::Error::duplicate_field("items")); } - items__ = Some(map.next_value()?); + items__ = Some(map_.next_value()?); } } } @@ -12913,12 +12917,12 @@ impl<'de> serde::Deserialize<'de> for ListFeedPlatformsRequest { formatter.write_str("struct librarian.sephirah.v1.ListFeedPlatformsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(ListFeedPlatformsRequest { }) @@ -12995,18 +12999,18 @@ impl<'de> serde::Deserialize<'de> for ListFeedPlatformsResponse { formatter.write_str("struct librarian.sephirah.v1.ListFeedPlatformsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut platforms__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Platforms => { if platforms__.is_some() { return Err(serde::de::Error::duplicate_field("platforms")); } - platforms__ = Some(map.next_value()?); + platforms__ = Some(map_.next_value()?); } } } @@ -13096,25 +13100,25 @@ impl<'de> serde::Deserialize<'de> for ListImagesRequest { formatter.write_str("struct librarian.sephirah.v1.ListImagesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut time_range__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::TimeRange => { if time_range__.is_some() { return Err(serde::de::Error::duplicate_field("timeRange")); } - time_range__ = map.next_value()?; + time_range__ = map_.next_value()?; } } } @@ -13204,25 +13208,25 @@ impl<'de> serde::Deserialize<'de> for ListImagesResponse { formatter.write_str("struct librarian.sephirah.v1.ListImagesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut ids__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Ids => { if ids__.is_some() { return Err(serde::de::Error::duplicate_field("ids")); } - ids__ = Some(map.next_value()?); + ids__ = Some(map_.next_value()?); } } } @@ -13304,18 +13308,18 @@ impl<'de> serde::Deserialize<'de> for ListLinkAccountsRequest { formatter.write_str("struct librarian.sephirah.v1.ListLinkAccountsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut user_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::UserId => { if user_id__.is_some() { return Err(serde::de::Error::duplicate_field("userId")); } - user_id__ = map.next_value()?; + user_id__ = map_.next_value()?; } } } @@ -13395,18 +13399,18 @@ impl<'de> serde::Deserialize<'de> for ListLinkAccountsResponse { formatter.write_str("struct librarian.sephirah.v1.ListLinkAccountsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut accounts__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Accounts => { if accounts__.is_some() { return Err(serde::de::Error::duplicate_field("accounts")); } - accounts__ = Some(map.next_value()?); + accounts__ = Some(map_.next_value()?); } } } @@ -13496,25 +13500,25 @@ impl<'de> serde::Deserialize<'de> for ListNotifyFlowsRequest { formatter.write_str("struct librarian.sephirah.v1.ListNotifyFlowsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut id_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } } } @@ -13604,25 +13608,25 @@ impl<'de> serde::Deserialize<'de> for ListNotifyFlowsResponse { formatter.write_str("struct librarian.sephirah.v1.ListNotifyFlowsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut flows__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Flows => { if flows__.is_some() { return Err(serde::de::Error::duplicate_field("flows")); } - flows__ = Some(map.next_value()?); + flows__ = Some(map_.next_value()?); } } } @@ -13667,8 +13671,8 @@ impl serde::Serialize for ListNotifyTargetsRequest { } if !self.status_filter.is_empty() { let v = self.status_filter.iter().cloned().map(|v| { - NotifyTargetStatus::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + NotifyTargetStatus::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("statusFilter", &v)?; } @@ -13737,7 +13741,7 @@ impl<'de> serde::Deserialize<'de> for ListNotifyTargetsRequest { formatter.write_str("struct librarian.sephirah.v1.ListNotifyTargetsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -13745,31 +13749,31 @@ impl<'de> serde::Deserialize<'de> for ListNotifyTargetsRequest { let mut id_filter__ = None; let mut destination_filter__ = None; let mut status_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::DestinationFilter => { if destination_filter__.is_some() { return Err(serde::de::Error::duplicate_field("destinationFilter")); } - destination_filter__ = Some(map.next_value()?); + destination_filter__ = Some(map_.next_value()?); } GeneratedField::StatusFilter => { if status_filter__.is_some() { return Err(serde::de::Error::duplicate_field("statusFilter")); } - status_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + status_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } } } @@ -13861,25 +13865,25 @@ impl<'de> serde::Deserialize<'de> for ListNotifyTargetsResponse { formatter.write_str("struct librarian.sephirah.v1.ListNotifyTargetsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut targets__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Targets => { if targets__.is_some() { return Err(serde::de::Error::duplicate_field("targets")); } - targets__ = Some(map.next_value()?); + targets__ = Some(map_.next_value()?); } } } @@ -13960,18 +13964,18 @@ impl<'de> serde::Deserialize<'de> for ListPorterContextsRequest { formatter.write_str("struct librarian.sephirah.v1.ListPorterContextsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } } } @@ -14060,25 +14064,25 @@ impl<'de> serde::Deserialize<'de> for ListPorterContextsResponse { formatter.write_str("struct librarian.sephirah.v1.ListPorterContextsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut contexts__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Contexts => { if contexts__.is_some() { return Err(serde::de::Error::duplicate_field("contexts")); } - contexts__ = Some(map.next_value()?); + contexts__ = Some(map_.next_value()?); } } } @@ -14159,18 +14163,18 @@ impl<'de> serde::Deserialize<'de> for ListPortersRequest { formatter.write_str("struct librarian.sephirah.v1.ListPortersRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } } } @@ -14259,25 +14263,25 @@ impl<'de> serde::Deserialize<'de> for ListPortersResponse { formatter.write_str("struct librarian.sephirah.v1.ListPortersResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut porters__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Porters => { if porters__.is_some() { return Err(serde::de::Error::duplicate_field("porters")); } - porters__ = Some(map.next_value()?); + porters__ = Some(map_.next_value()?); } } } @@ -14347,12 +14351,12 @@ impl<'de> serde::Deserialize<'de> for ListRegisteredDevicesRequest { formatter.write_str("struct librarian.sephirah.v1.ListRegisteredDevicesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(ListRegisteredDevicesRequest { }) @@ -14429,18 +14433,18 @@ impl<'de> serde::Deserialize<'de> for ListRegisteredDevicesResponse { formatter.write_str("struct librarian.sephirah.v1.ListRegisteredDevicesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut devices__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Devices => { if devices__.is_some() { return Err(serde::de::Error::duplicate_field("devices")); } - devices__ = Some(map.next_value()?); + devices__ = Some(map_.next_value()?); } } } @@ -14550,7 +14554,7 @@ impl<'de> serde::Deserialize<'de> for ListSharedAppSaveFilesRequest { formatter.write_str("struct librarian.sephirah.v1.ListSharedAppSaveFilesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -14558,31 +14562,31 @@ impl<'de> serde::Deserialize<'de> for ListSharedAppSaveFilesRequest { let mut id_filter__ = None; let mut shared_app_save_id_filter__ = None; let mut user_id_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::SharedAppSaveIdFilter => { if shared_app_save_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("sharedAppSaveIdFilter")); } - shared_app_save_id_filter__ = Some(map.next_value()?); + shared_app_save_id_filter__ = Some(map_.next_value()?); } GeneratedField::UserIdFilter => { if user_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("userIdFilter")); } - user_id_filter__ = Some(map.next_value()?); + user_id_filter__ = Some(map_.next_value()?); } } } @@ -14675,25 +14679,25 @@ impl<'de> serde::Deserialize<'de> for ListSharedAppSaveFilesResponse { formatter.write_str("struct librarian.sephirah.v1.ListSharedAppSaveFilesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut shared_app_save_files__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::SharedAppSaveFiles => { if shared_app_save_files__.is_some() { return Err(serde::de::Error::duplicate_field("sharedAppSaveFiles")); } - shared_app_save_files__ = Some(map.next_value()?); + shared_app_save_files__ = Some(map_.next_value()?); } } } @@ -14794,32 +14798,32 @@ impl<'de> serde::Deserialize<'de> for ListSharedAppSavesRequest { formatter.write_str("struct librarian.sephirah.v1.ListSharedAppSavesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut id_filter__ = None; let mut app_info_id_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::AppInfoIdFilter => { if app_info_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoIdFilter")); } - app_info_id_filter__ = Some(map.next_value()?); + app_info_id_filter__ = Some(map_.next_value()?); } } } @@ -14911,25 +14915,25 @@ impl<'de> serde::Deserialize<'de> for ListSharedAppSavesResponse { formatter.write_str("struct librarian.sephirah.v1.ListSharedAppSavesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut shared_app_saves__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::SharedAppSaves => { if shared_app_saves__.is_some() { return Err(serde::de::Error::duplicate_field("sharedAppSaves")); } - shared_app_saves__ = Some(map.next_value()?); + shared_app_saves__ = Some(map_.next_value()?); } } } @@ -14968,22 +14972,22 @@ impl serde::Serialize for ListSystemNotificationsRequest { } if !self.type_filter.is_empty() { let v = self.type_filter.iter().cloned().map(|v| { - SystemNotificationType::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + SystemNotificationType::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("typeFilter", &v)?; } if !self.level_filter.is_empty() { let v = self.level_filter.iter().cloned().map(|v| { - SystemNotificationLevel::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + SystemNotificationLevel::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("levelFilter", &v)?; } if !self.status_filter.is_empty() { let v = self.status_filter.iter().cloned().map(|v| { - SystemNotificationStatus::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + SystemNotificationStatus::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("statusFilter", &v)?; } @@ -15052,7 +15056,7 @@ impl<'de> serde::Deserialize<'de> for ListSystemNotificationsRequest { formatter.write_str("struct librarian.sephirah.v1.ListSystemNotificationsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -15060,31 +15064,31 @@ impl<'de> serde::Deserialize<'de> for ListSystemNotificationsRequest { let mut type_filter__ = None; let mut level_filter__ = None; let mut status_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::TypeFilter => { if type_filter__.is_some() { return Err(serde::de::Error::duplicate_field("typeFilter")); } - type_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + type_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } GeneratedField::LevelFilter => { if level_filter__.is_some() { return Err(serde::de::Error::duplicate_field("levelFilter")); } - level_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + level_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } GeneratedField::StatusFilter => { if status_filter__.is_some() { return Err(serde::de::Error::duplicate_field("statusFilter")); } - status_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + status_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } } } @@ -15176,25 +15180,25 @@ impl<'de> serde::Deserialize<'de> for ListSystemNotificationsResponse { formatter.write_str("struct librarian.sephirah.v1.ListSystemNotificationsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut notifications__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Notifications => { if notifications__.is_some() { return Err(serde::de::Error::duplicate_field("notifications")); } - notifications__ = Some(map.next_value()?); + notifications__ = Some(map_.next_value()?); } } } @@ -15295,32 +15299,32 @@ impl<'de> serde::Deserialize<'de> for ListTagsRequest { formatter.write_str("struct librarian.sephirah.v1.ListTagsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut id_filter__ = None; let mut creator_id_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::IdFilter => { if id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("idFilter")); } - id_filter__ = Some(map.next_value()?); + id_filter__ = Some(map_.next_value()?); } GeneratedField::CreatorIdFilter => { if creator_id_filter__.is_some() { return Err(serde::de::Error::duplicate_field("creatorIdFilter")); } - creator_id_filter__ = Some(map.next_value()?); + creator_id_filter__ = Some(map_.next_value()?); } } } @@ -15411,25 +15415,25 @@ impl<'de> serde::Deserialize<'de> for ListTagsResponse { formatter.write_str("struct librarian.sephirah.v1.ListTagsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut tags__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Tags => { if tags__.is_some() { return Err(serde::de::Error::duplicate_field("tags")); } - tags__ = Some(map.next_value()?); + tags__ = Some(map_.next_value()?); } } } @@ -15499,12 +15503,12 @@ impl<'de> serde::Deserialize<'de> for ListUserSessionsRequest { formatter.write_str("struct librarian.sephirah.v1.ListUserSessionsRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(ListUserSessionsRequest { }) @@ -15581,18 +15585,18 @@ impl<'de> serde::Deserialize<'de> for ListUserSessionsResponse { formatter.write_str("struct librarian.sephirah.v1.ListUserSessionsResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut sessions__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Sessions => { if sessions__.is_some() { return Err(serde::de::Error::duplicate_field("sessions")); } - sessions__ = Some(map.next_value()?); + sessions__ = Some(map_.next_value()?); } } } @@ -15627,15 +15631,15 @@ impl serde::Serialize for ListUsersRequest { } if !self.type_filter.is_empty() { let v = self.type_filter.iter().cloned().map(|v| { - UserType::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + UserType::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("typeFilter", &v)?; } if !self.status_filter.is_empty() { let v = self.status_filter.iter().cloned().map(|v| { - UserStatus::from_i32(v) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", v))) + UserStatus::try_from(v) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", v))) }).collect::, _>>()?; struct_ser.serialize_field("statusFilter", &v)?; } @@ -15700,32 +15704,32 @@ impl<'de> serde::Deserialize<'de> for ListUsersRequest { formatter.write_str("struct librarian.sephirah.v1.ListUsersRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut type_filter__ = None; let mut status_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::TypeFilter => { if type_filter__.is_some() { return Err(serde::de::Error::duplicate_field("typeFilter")); } - type_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + type_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } GeneratedField::StatusFilter => { if status_filter__.is_some() { return Err(serde::de::Error::duplicate_field("statusFilter")); } - status_filter__ = Some(map.next_value::>()?.into_iter().map(|x| x as i32).collect()); + status_filter__ = Some(map_.next_value::>()?.into_iter().map(|x| x as i32).collect()); } } } @@ -15816,25 +15820,25 @@ impl<'de> serde::Deserialize<'de> for ListUsersResponse { formatter.write_str("struct librarian.sephirah.v1.ListUsersResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut users__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Users => { if users__.is_some() { return Err(serde::de::Error::duplicate_field("users")); } - users__ = Some(map.next_value()?); + users__ = Some(map_.next_value()?); } } } @@ -15904,12 +15908,12 @@ impl<'de> serde::Deserialize<'de> for ListenServerEventRequest { formatter.write_str("struct librarian.sephirah.v1.ListenServerEventRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(ListenServerEventRequest { }) @@ -15937,8 +15941,8 @@ impl serde::Serialize for ListenServerEventResponse { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.ListenServerEventResponse", len)?; if self.event != 0 { - let v = ServerEvent::from_i32(self.event) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.event)))?; + let v = ServerEvent::try_from(self.event) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.event)))?; struct_ser.serialize_field("event", &v)?; } if let Some(v) = self.occur_time.as_ref() { @@ -16007,32 +16011,32 @@ impl<'de> serde::Deserialize<'de> for ListenServerEventResponse { formatter.write_str("struct librarian.sephirah.v1.ListenServerEventResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut event__ = None; let mut occur_time__ = None; let mut payload__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Event => { if event__.is_some() { return Err(serde::de::Error::duplicate_field("event")); } - event__ = Some(map.next_value::()? as i32); + event__ = Some(map_.next_value::()? as i32); } GeneratedField::OccurTime => { if occur_time__.is_some() { return Err(serde::de::Error::duplicate_field("occurTime")); } - occur_time__ = map.next_value()?; + occur_time__ = map_.next_value()?; } GeneratedField::Payload => { if payload__.is_some() { return Err(serde::de::Error::duplicate_field("payload")); } - payload__ = Some(map.next_value()?); + payload__ = Some(map_.next_value()?); } } } @@ -16123,25 +16127,25 @@ impl<'de> serde::Deserialize<'de> for MergeAppInfosRequest { formatter.write_str("struct librarian.sephirah.v1.MergeAppInfosRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut base__ = None; let mut merged__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Base => { if base__.is_some() { return Err(serde::de::Error::duplicate_field("base")); } - base__ = map.next_value()?; + base__ = map_.next_value()?; } GeneratedField::Merged => { if merged__.is_some() { return Err(serde::de::Error::duplicate_field("merged")); } - merged__ = map.next_value()?; + merged__ = map_.next_value()?; } } } @@ -16211,12 +16215,12 @@ impl<'de> serde::Deserialize<'de> for MergeAppInfosResponse { formatter.write_str("struct librarian.sephirah.v1.MergeAppInfosResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(MergeAppInfosResponse { }) @@ -16304,25 +16308,25 @@ impl<'de> serde::Deserialize<'de> for NotifyFilter { formatter.write_str("struct librarian.sephirah.v1.NotifyFilter") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut exclude_keywords__ = None; let mut include_keywords__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ExcludeKeywords => { if exclude_keywords__.is_some() { return Err(serde::de::Error::duplicate_field("excludeKeywords")); } - exclude_keywords__ = Some(map.next_value()?); + exclude_keywords__ = Some(map_.next_value()?); } GeneratedField::IncludeKeywords => { if include_keywords__.is_some() { return Err(serde::de::Error::duplicate_field("includeKeywords")); } - include_keywords__ = Some(map.next_value()?); + include_keywords__ = Some(map_.next_value()?); } } } @@ -16378,8 +16382,8 @@ impl serde::Serialize for NotifyFlow { struct_ser.serialize_field("targets", &self.targets)?; } if self.status != 0 { - let v = NotifyFlowStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = NotifyFlowStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -16450,7 +16454,7 @@ impl<'de> serde::Deserialize<'de> for NotifyFlow { formatter.write_str("struct librarian.sephirah.v1.NotifyFlow") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -16460,43 +16464,43 @@ impl<'de> serde::Deserialize<'de> for NotifyFlow { let mut sources__ = None; let mut targets__ = None; let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Sources => { if sources__.is_some() { return Err(serde::de::Error::duplicate_field("sources")); } - sources__ = Some(map.next_value()?); + sources__ = Some(map_.next_value()?); } GeneratedField::Targets => { if targets__.is_some() { return Err(serde::de::Error::duplicate_field("targets")); } - targets__ = Some(map.next_value()?); + targets__ = Some(map_.next_value()?); } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -16591,25 +16595,25 @@ impl<'de> serde::Deserialize<'de> for NotifyFlowSource { formatter.write_str("struct librarian.sephirah.v1.NotifyFlowSource") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut filter__ = None; let mut source_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Filter => { if filter__.is_some() { return Err(serde::de::Error::duplicate_field("filter")); } - filter__ = map.next_value()?; + filter__ = map_.next_value()?; } GeneratedField::SourceId => { if source_id__.is_some() { return Err(serde::de::Error::duplicate_field("sourceId")); } - source_id__ = map.next_value()?; + source_id__ = map_.next_value()?; } } } @@ -16661,10 +16665,9 @@ impl<'de> serde::Deserialize<'de> for NotifyFlowStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(NotifyFlowStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -16674,10 +16677,9 @@ impl<'de> serde::Deserialize<'de> for NotifyFlowStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(NotifyFlowStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -16776,25 +16778,25 @@ impl<'de> serde::Deserialize<'de> for NotifyFlowTarget { formatter.write_str("struct librarian.sephirah.v1.NotifyFlowTarget") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut filter__ = None; let mut target_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Filter => { if filter__.is_some() { return Err(serde::de::Error::duplicate_field("filter")); } - filter__ = map.next_value()?; + filter__ = map_.next_value()?; } GeneratedField::TargetId => { if target_id__.is_some() { return Err(serde::de::Error::duplicate_field("targetId")); } - target_id__ = map.next_value()?; + target_id__ = map_.next_value()?; } } } @@ -16844,8 +16846,8 @@ impl serde::Serialize for NotifyTarget { struct_ser.serialize_field("destination", v)?; } if self.status != 0 { - let v = NotifyTargetStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = NotifyTargetStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -16913,7 +16915,7 @@ impl<'de> serde::Deserialize<'de> for NotifyTarget { formatter.write_str("struct librarian.sephirah.v1.NotifyTarget") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -16922,37 +16924,37 @@ impl<'de> serde::Deserialize<'de> for NotifyTarget { let mut description__ = None; let mut destination__ = None; let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Destination => { if destination__.is_some() { return Err(serde::de::Error::duplicate_field("destination")); } - destination__ = map.next_value()?; + destination__ = map_.next_value()?; } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -17007,10 +17009,9 @@ impl<'de> serde::Deserialize<'de> for NotifyTargetStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(NotifyTargetStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -17020,10 +17021,9 @@ impl<'de> serde::Deserialize<'de> for NotifyTargetStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(NotifyTargetStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -17112,18 +17112,18 @@ impl<'de> serde::Deserialize<'de> for PickAppInfoRequest { formatter.write_str("struct librarian.sephirah.v1.PickAppInfoRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut picked__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Picked => { if picked__.is_some() { return Err(serde::de::Error::duplicate_field("picked")); } - picked__ = map.next_value()?; + picked__ = map_.next_value()?; } } } @@ -17192,12 +17192,12 @@ impl<'de> serde::Deserialize<'de> for PickAppInfoResponse { formatter.write_str("struct librarian.sephirah.v1.PickAppInfoResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(PickAppInfoResponse { }) @@ -17274,18 +17274,18 @@ impl<'de> serde::Deserialize<'de> for PinAppSaveFileRequest { formatter.write_str("struct librarian.sephirah.v1.PinAppSaveFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -17354,12 +17354,12 @@ impl<'de> serde::Deserialize<'de> for PinAppSaveFileResponse { formatter.write_str("struct librarian.sephirah.v1.PinAppSaveFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(PinAppSaveFileResponse { }) @@ -17414,13 +17414,13 @@ impl serde::Serialize for Porter { struct_ser.serialize_field("featureSummary", &self.feature_summary)?; } if self.status != 0 { - let v = UserStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = UserStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } if self.connection_status != 0 { - let v = PorterConnectionStatus::from_i32(self.connection_status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.connection_status)))?; + let v = PorterConnectionStatus::try_from(self.connection_status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.connection_status)))?; struct_ser.serialize_field("connectionStatus", &v)?; } struct_ser.end() @@ -17497,7 +17497,7 @@ impl<'de> serde::Deserialize<'de> for Porter { formatter.write_str("struct librarian.sephirah.v1.Porter") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -17508,49 +17508,49 @@ impl<'de> serde::Deserialize<'de> for Porter { let mut feature_summary__ = None; let mut status__ = None; let mut connection_status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Version => { if version__.is_some() { return Err(serde::de::Error::duplicate_field("version")); } - version__ = Some(map.next_value()?); + version__ = Some(map_.next_value()?); } GeneratedField::GlobalName => { if global_name__.is_some() { return Err(serde::de::Error::duplicate_field("globalName")); } - global_name__ = Some(map.next_value()?); + global_name__ = Some(map_.next_value()?); } GeneratedField::FeatureSummary => { if feature_summary__.is_some() { return Err(serde::de::Error::duplicate_field("featureSummary")); } - feature_summary__ = Some(map.next_value()?); + feature_summary__ = Some(map_.next_value()?); } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } GeneratedField::ConnectionStatus => { if connection_status__.is_some() { return Err(serde::de::Error::duplicate_field("connectionStatus")); } - connection_status__ = Some(map.next_value::()? as i32); + connection_status__ = Some(map_.next_value::()? as i32); } } } @@ -17611,10 +17611,9 @@ impl<'de> serde::Deserialize<'de> for PorterConnectionStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(PorterConnectionStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -17624,10 +17623,9 @@ impl<'de> serde::Deserialize<'de> for PorterConnectionStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(PorterConnectionStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -17756,7 +17754,7 @@ impl<'de> serde::Deserialize<'de> for PorterContext { formatter.write_str("struct librarian.sephirah.v1.PorterContext") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -17765,37 +17763,37 @@ impl<'de> serde::Deserialize<'de> for PorterContext { let mut context_json__ = None; let mut name__ = None; let mut description__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::PorterId => { if porter_id__.is_some() { return Err(serde::de::Error::duplicate_field("porterId")); } - porter_id__ = map.next_value()?; + porter_id__ = map_.next_value()?; } GeneratedField::ContextJson => { if context_json__.is_some() { return Err(serde::de::Error::duplicate_field("contextJson")); } - context_json__ = map.next_value()?; + context_json__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } } } @@ -17868,12 +17866,12 @@ impl<'de> serde::Deserialize<'de> for PresignedDownloadFileRequest { formatter.write_str("struct librarian.sephirah.v1.PresignedDownloadFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(PresignedDownloadFileRequest { }) @@ -17951,18 +17949,18 @@ impl<'de> serde::Deserialize<'de> for PresignedDownloadFileResponse { formatter.write_str("struct librarian.sephirah.v1.PresignedDownloadFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut download_url__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::DownloadUrl => { if download_url__.is_some() { return Err(serde::de::Error::duplicate_field("downloadUrl")); } - download_url__ = Some(map.next_value()?); + download_url__ = Some(map_.next_value()?); } } } @@ -18031,12 +18029,12 @@ impl<'de> serde::Deserialize<'de> for PresignedUploadFileRequest { formatter.write_str("struct librarian.sephirah.v1.PresignedUploadFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(PresignedUploadFileRequest { }) @@ -18114,18 +18112,18 @@ impl<'de> serde::Deserialize<'de> for PresignedUploadFileResponse { formatter.write_str("struct librarian.sephirah.v1.PresignedUploadFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut upload_url__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::UploadUrl => { if upload_url__.is_some() { return Err(serde::de::Error::duplicate_field("uploadUrl")); } - upload_url__ = Some(map.next_value()?); + upload_url__ = Some(map_.next_value()?); } } } @@ -18150,8 +18148,8 @@ impl serde::Serialize for PresignedUploadFileStatusRequest { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.PresignedUploadFileStatusRequest", len)?; if self.status != 0 { - let v = FileTransferStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = FileTransferStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -18207,18 +18205,18 @@ impl<'de> serde::Deserialize<'de> for PresignedUploadFileStatusRequest { formatter.write_str("struct librarian.sephirah.v1.PresignedUploadFileStatusRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -18287,12 +18285,12 @@ impl<'de> serde::Deserialize<'de> for PresignedUploadFileStatusResponse { formatter.write_str("struct librarian.sephirah.v1.PresignedUploadFileStatusResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(PresignedUploadFileStatusResponse { }) @@ -18370,18 +18368,18 @@ impl<'de> serde::Deserialize<'de> for PurchaseAppInfoRequest { formatter.write_str("struct librarian.sephirah.v1.PurchaseAppInfoRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfoId => { if app_info_id__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoId")); } - app_info_id__ = map.next_value()?; + app_info_id__ = map_.next_value()?; } } } @@ -18461,18 +18459,18 @@ impl<'de> serde::Deserialize<'de> for PurchaseAppInfoResponse { formatter.write_str("struct librarian.sephirah.v1.PurchaseAppInfoResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -18552,18 +18550,18 @@ impl<'de> serde::Deserialize<'de> for ReadFeedItemRequest { formatter.write_str("struct librarian.sephirah.v1.ReadFeedItemRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -18632,12 +18630,12 @@ impl<'de> serde::Deserialize<'de> for ReadFeedItemResponse { formatter.write_str("struct librarian.sephirah.v1.ReadFeedItemResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(ReadFeedItemResponse { }) @@ -18715,18 +18713,18 @@ impl<'de> serde::Deserialize<'de> for RefreshTokenRequest { formatter.write_str("struct librarian.sephirah.v1.RefreshTokenRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut device_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::DeviceId => { if device_id__.is_some() { return Err(serde::de::Error::duplicate_field("deviceId")); } - device_id__ = map.next_value()?; + device_id__ = map_.next_value()?; } } } @@ -18817,25 +18815,25 @@ impl<'de> serde::Deserialize<'de> for RefreshTokenResponse { formatter.write_str("struct librarian.sephirah.v1.RefreshTokenResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut access_token__ = None; let mut refresh_token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccessToken => { if access_token__.is_some() { return Err(serde::de::Error::duplicate_field("accessToken")); } - access_token__ = Some(map.next_value()?); + access_token__ = Some(map_.next_value()?); } GeneratedField::RefreshToken => { if refresh_token__.is_some() { return Err(serde::de::Error::duplicate_field("refreshToken")); } - refresh_token__ = Some(map.next_value()?); + refresh_token__ = Some(map_.next_value()?); } } } @@ -18917,18 +18915,18 @@ impl<'de> serde::Deserialize<'de> for RegisterDeviceRequest { formatter.write_str("struct librarian.sephirah.v1.RegisterDeviceRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut device_info__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::DeviceInfo => { if device_info__.is_some() { return Err(serde::de::Error::duplicate_field("deviceInfo")); } - device_info__ = map.next_value()?; + device_info__ = map_.next_value()?; } } } @@ -19009,18 +19007,18 @@ impl<'de> serde::Deserialize<'de> for RegisterDeviceResponse { formatter.write_str("struct librarian.sephirah.v1.RegisterDeviceResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut device_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::DeviceId => { if device_id__.is_some() { return Err(serde::de::Error::duplicate_field("deviceId")); } - device_id__ = map.next_value()?; + device_id__ = map_.next_value()?; } } } @@ -19118,32 +19116,32 @@ impl<'de> serde::Deserialize<'de> for RegisterUserRequest { formatter.write_str("struct librarian.sephirah.v1.RegisterUserRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut username__ = None; let mut password__ = None; let mut captcha__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Username => { if username__.is_some() { return Err(serde::de::Error::duplicate_field("username")); } - username__ = Some(map.next_value()?); + username__ = Some(map_.next_value()?); } GeneratedField::Password => { if password__.is_some() { return Err(serde::de::Error::duplicate_field("password")); } - password__ = Some(map.next_value()?); + password__ = Some(map_.next_value()?); } GeneratedField::Captcha => { if captcha__.is_some() { return Err(serde::de::Error::duplicate_field("captcha")); } - captcha__ = map.next_value()?; + captcha__ = map_.next_value()?; } } } @@ -19234,25 +19232,25 @@ impl<'de> serde::Deserialize<'de> for register_user_request::Captcha { formatter.write_str("struct librarian.sephirah.v1.RegisterUserRequest.Captcha") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut value__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = Some(map.next_value()?); + id__ = Some(map_.next_value()?); } GeneratedField::Value => { if value__.is_some() { return Err(serde::de::Error::duplicate_field("value")); } - value__ = Some(map.next_value()?); + value__ = Some(map_.next_value()?); } } } @@ -19344,25 +19342,25 @@ impl<'de> serde::Deserialize<'de> for RegisterUserResponse { formatter.write_str("struct librarian.sephirah.v1.RegisterUserResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut stage__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Captcha => { if stage__.is_some() { return Err(serde::de::Error::duplicate_field("captcha")); } - stage__ = map.next_value::<::std::option::Option<_>>()?.map(register_user_response::Stage::Captcha) + stage__ = map_.next_value::<::std::option::Option<_>>()?.map(register_user_response::Stage::Captcha) ; } GeneratedField::RefreshToken => { if stage__.is_some() { return Err(serde::de::Error::duplicate_field("refreshToken")); } - stage__ = map.next_value::<::std::option::Option<_>>()?.map(register_user_response::Stage::RefreshToken); + stage__ = map_.next_value::<::std::option::Option<_>>()?.map(register_user_response::Stage::RefreshToken); } } } @@ -19393,6 +19391,7 @@ impl serde::Serialize for register_user_response::ImageCaptcha { struct_ser.serialize_field("id", &self.id)?; } if !self.image.is_empty() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("image", pbjson::private::base64::encode(&self.image).as_str())?; } struct_ser.end() @@ -19451,26 +19450,26 @@ impl<'de> serde::Deserialize<'de> for register_user_response::ImageCaptcha { formatter.write_str("struct librarian.sephirah.v1.RegisterUserResponse.ImageCaptcha") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut image__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = Some(map.next_value()?); + id__ = Some(map_.next_value()?); } GeneratedField::Image => { if image__.is_some() { return Err(serde::de::Error::duplicate_field("image")); } image__ = - Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) ; } } @@ -19552,18 +19551,18 @@ impl<'de> serde::Deserialize<'de> for RemoveAppCategoryRequest { formatter.write_str("struct librarian.sephirah.v1.RemoveAppCategoryRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -19632,12 +19631,12 @@ impl<'de> serde::Deserialize<'de> for RemoveAppCategoryResponse { formatter.write_str("struct librarian.sephirah.v1.RemoveAppCategoryResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(RemoveAppCategoryResponse { }) @@ -19714,18 +19713,18 @@ impl<'de> serde::Deserialize<'de> for RemoveAppSaveFileRequest { formatter.write_str("struct librarian.sephirah.v1.RemoveAppSaveFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -19794,12 +19793,12 @@ impl<'de> serde::Deserialize<'de> for RemoveAppSaveFileResponse { formatter.write_str("struct librarian.sephirah.v1.RemoveAppSaveFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(RemoveAppSaveFileResponse { }) @@ -19887,25 +19886,25 @@ impl<'de> serde::Deserialize<'de> for RemoveFeedItemFromCollectionRequest { formatter.write_str("struct librarian.sephirah.v1.RemoveFeedItemFromCollectionRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut feed_item_id__ = None; let mut collection_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FeedItemId => { if feed_item_id__.is_some() { return Err(serde::de::Error::duplicate_field("feedItemId")); } - feed_item_id__ = map.next_value()?; + feed_item_id__ = map_.next_value()?; } GeneratedField::CollectionId => { if collection_id__.is_some() { return Err(serde::de::Error::duplicate_field("collectionId")); } - collection_id__ = map.next_value()?; + collection_id__ = map_.next_value()?; } } } @@ -19975,12 +19974,12 @@ impl<'de> serde::Deserialize<'de> for RemoveFeedItemFromCollectionResponse { formatter.write_str("struct librarian.sephirah.v1.RemoveFeedItemFromCollectionResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(RemoveFeedItemFromCollectionResponse { }) @@ -20057,18 +20056,18 @@ impl<'de> serde::Deserialize<'de> for RemoveSharedAppSaveFileRequest { formatter.write_str("struct librarian.sephirah.v1.RemoveSharedAppSaveFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -20137,12 +20136,12 @@ impl<'de> serde::Deserialize<'de> for RemoveSharedAppSaveFileResponse { formatter.write_str("struct librarian.sephirah.v1.RemoveSharedAppSaveFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(RemoveSharedAppSaveFileResponse { }) @@ -20219,18 +20218,18 @@ impl<'de> serde::Deserialize<'de> for RemoveSharedAppSaveRequest { formatter.write_str("struct librarian.sephirah.v1.RemoveSharedAppSaveRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -20299,12 +20298,12 @@ impl<'de> serde::Deserialize<'de> for RemoveSharedAppSaveResponse { formatter.write_str("struct librarian.sephirah.v1.RemoveSharedAppSaveResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(RemoveSharedAppSaveResponse { }) @@ -20382,18 +20381,18 @@ impl<'de> serde::Deserialize<'de> for ReportAppBinariesRequest { formatter.write_str("struct librarian.sephirah.v1.ReportAppBinariesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_binaries__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppBinaries => { if app_binaries__.is_some() { return Err(serde::de::Error::duplicate_field("appBinaries")); } - app_binaries__ = Some(map.next_value()?); + app_binaries__ = Some(map_.next_value()?); } } } @@ -20462,12 +20461,12 @@ impl<'de> serde::Deserialize<'de> for ReportAppBinariesResponse { formatter.write_str("struct librarian.sephirah.v1.ReportAppBinariesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(ReportAppBinariesResponse { }) @@ -20553,25 +20552,25 @@ impl<'de> serde::Deserialize<'de> for SearchAppInfosRequest { formatter.write_str("struct librarian.sephirah.v1.SearchAppInfosRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut query__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Query => { if query__.is_some() { return Err(serde::de::Error::duplicate_field("query")); } - query__ = Some(map.next_value()?); + query__ = Some(map_.next_value()?); } } } @@ -20662,25 +20661,25 @@ impl<'de> serde::Deserialize<'de> for SearchAppInfosResponse { formatter.write_str("struct librarian.sephirah.v1.SearchAppInfosResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } @@ -20770,25 +20769,25 @@ impl<'de> serde::Deserialize<'de> for SearchImagesRequest { formatter.write_str("struct librarian.sephirah.v1.SearchImagesRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut keywords__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Keywords => { if keywords__.is_some() { return Err(serde::de::Error::duplicate_field("keywords")); } - keywords__ = Some(map.next_value()?); + keywords__ = Some(map_.next_value()?); } } } @@ -20878,25 +20877,25 @@ impl<'de> serde::Deserialize<'de> for SearchImagesResponse { formatter.write_str("struct librarian.sephirah.v1.SearchImagesResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut ids__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Ids => { if ids__.is_some() { return Err(serde::de::Error::duplicate_field("ids")); } - ids__ = Some(map.next_value()?); + ids__ = Some(map_.next_value()?); } } } @@ -20996,32 +20995,32 @@ impl<'de> serde::Deserialize<'de> for SearchNewAppInfosRequest { formatter.write_str("struct librarian.sephirah.v1.SearchNewAppInfosRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut name__ = None; let mut source_filter__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::SourceFilter => { if source_filter__.is_some() { return Err(serde::de::Error::duplicate_field("sourceFilter")); } - source_filter__ = Some(map.next_value()?); + source_filter__ = Some(map_.next_value()?); } } } @@ -21113,25 +21112,25 @@ impl<'de> serde::Deserialize<'de> for SearchNewAppInfosResponse { formatter.write_str("struct librarian.sephirah.v1.SearchNewAppInfosResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut paging__ = None; let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Paging => { if paging__.is_some() { return Err(serde::de::Error::duplicate_field("paging")); } - paging__ = map.next_value()?; + paging__ = map_.next_value()?; } GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } @@ -21233,32 +21232,32 @@ impl<'de> serde::Deserialize<'de> for ServerBinarySummary { formatter.write_str("struct librarian.sephirah.v1.ServerBinarySummary") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut source_code_address__ = None; let mut build_version__ = None; let mut build_date__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SourceCodeAddress => { if source_code_address__.is_some() { return Err(serde::de::Error::duplicate_field("sourceCodeAddress")); } - source_code_address__ = Some(map.next_value()?); + source_code_address__ = Some(map_.next_value()?); } GeneratedField::BuildVersion => { if build_version__.is_some() { return Err(serde::de::Error::duplicate_field("buildVersion")); } - build_version__ = Some(map.next_value()?); + build_version__ = Some(map_.next_value()?); } GeneratedField::BuildDate => { if build_date__.is_some() { return Err(serde::de::Error::duplicate_field("buildDate")); } - build_date__ = Some(map.next_value()?); + build_date__ = Some(map_.next_value()?); } } } @@ -21311,10 +21310,9 @@ impl<'de> serde::Deserialize<'de> for ServerEvent { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(ServerEvent::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -21324,10 +21322,9 @@ impl<'de> serde::Deserialize<'de> for ServerEvent { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(ServerEvent::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -21457,7 +21454,7 @@ impl<'de> serde::Deserialize<'de> for ServerFeatureSummary { formatter.write_str("struct librarian.sephirah.v1.ServerFeatureSummary") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -21466,37 +21463,37 @@ impl<'de> serde::Deserialize<'de> for ServerFeatureSummary { let mut feed_sources__ = None; let mut notify_destinations__ = None; let mut feed_item_actions__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccountPlatforms => { if account_platforms__.is_some() { return Err(serde::de::Error::duplicate_field("accountPlatforms")); } - account_platforms__ = Some(map.next_value()?); + account_platforms__ = Some(map_.next_value()?); } GeneratedField::AppInfoSources => { if app_info_sources__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoSources")); } - app_info_sources__ = Some(map.next_value()?); + app_info_sources__ = Some(map_.next_value()?); } GeneratedField::FeedSources => { if feed_sources__.is_some() { return Err(serde::de::Error::duplicate_field("feedSources")); } - feed_sources__ = Some(map.next_value()?); + feed_sources__ = Some(map_.next_value()?); } GeneratedField::NotifyDestinations => { if notify_destinations__.is_some() { return Err(serde::de::Error::duplicate_field("notifyDestinations")); } - notify_destinations__ = Some(map.next_value()?); + notify_destinations__ = Some(map_.next_value()?); } GeneratedField::FeedItemActions => { if feed_item_actions__.is_some() { return Err(serde::de::Error::duplicate_field("feedItemActions")); } - feed_item_actions__ = Some(map.next_value()?); + feed_item_actions__ = Some(map_.next_value()?); } } } @@ -21619,7 +21616,7 @@ impl<'de> serde::Deserialize<'de> for ServerInstanceSummary { formatter.write_str("struct librarian.sephirah.v1.ServerInstanceSummary") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -21628,37 +21625,37 @@ impl<'de> serde::Deserialize<'de> for ServerInstanceSummary { let mut website_url__ = None; let mut logo_url__ = None; let mut background_url__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::WebsiteUrl => { if website_url__.is_some() { return Err(serde::de::Error::duplicate_field("websiteUrl")); } - website_url__ = Some(map.next_value()?); + website_url__ = Some(map_.next_value()?); } GeneratedField::LogoUrl => { if logo_url__.is_some() { return Err(serde::de::Error::duplicate_field("logoUrl")); } - logo_url__ = Some(map.next_value()?); + logo_url__ = Some(map_.next_value()?); } GeneratedField::BackgroundUrl => { if background_url__.is_some() { return Err(serde::de::Error::duplicate_field("backgroundUrl")); } - background_url__ = Some(map.next_value()?); + background_url__ = Some(map_.next_value()?); } } } @@ -21742,18 +21739,18 @@ impl<'de> serde::Deserialize<'de> for ServerProtocolSummary { formatter.write_str("struct librarian.sephirah.v1.ServerProtocolSummary") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut version__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Version => { if version__.is_some() { return Err(serde::de::Error::duplicate_field("version")); } - version__ = Some(map.next_value()?); + version__ = Some(map_.next_value()?); } } } @@ -21787,14 +21784,16 @@ impl serde::Serialize for SetAppSaveFileCapacityDefaultRequest { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.SetAppSaveFileCapacityDefaultRequest", len)?; if self.count != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("count", ToString::to_string(&self.count).as_str())?; } if self.size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sizeBytes", ToString::to_string(&self.size_bytes).as_str())?; } if self.strategy != 0 { - let v = AppSaveFileCapacityStrategy::from_i32(self.strategy) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.strategy)))?; + let v = AppSaveFileCapacityStrategy::try_from(self.strategy) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.strategy)))?; struct_ser.serialize_field("strategy", &v)?; } if let Some(v) = self.entity.as_ref() { @@ -21867,7 +21866,7 @@ impl<'de> serde::Deserialize<'de> for SetAppSaveFileCapacityDefaultRequest { formatter.write_str("struct librarian.sephirah.v1.SetAppSaveFileCapacityDefaultRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -21875,14 +21874,14 @@ impl<'de> serde::Deserialize<'de> for SetAppSaveFileCapacityDefaultRequest { let mut size_bytes__ = None; let mut strategy__ = None; let mut entity__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Count => { if count__.is_some() { return Err(serde::de::Error::duplicate_field("count")); } count__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::SizeBytes => { @@ -21890,20 +21889,20 @@ impl<'de> serde::Deserialize<'de> for SetAppSaveFileCapacityDefaultRequest { return Err(serde::de::Error::duplicate_field("sizeBytes")); } size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Strategy => { if strategy__.is_some() { return Err(serde::de::Error::duplicate_field("strategy")); } - strategy__ = Some(map.next_value::()? as i32); + strategy__ = Some(map_.next_value::()? as i32); } GeneratedField::App => { if entity__.is_some() { return Err(serde::de::Error::duplicate_field("app")); } - entity__ = map.next_value::<::std::option::Option<_>>()?.map(set_app_save_file_capacity_default_request::Entity::App); + entity__ = map_.next_value::<::std::option::Option<_>>()?.map(set_app_save_file_capacity_default_request::Entity::App); } } } @@ -21975,12 +21974,12 @@ impl<'de> serde::Deserialize<'de> for SetAppSaveFileCapacityDefaultResponse { formatter.write_str("struct librarian.sephirah.v1.SetAppSaveFileCapacityDefaultResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(SetAppSaveFileCapacityDefaultResponse { }) @@ -22011,14 +22010,16 @@ impl serde::Serialize for SetAppSaveFileCapacityRequest { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.SetAppSaveFileCapacityRequest", len)?; if self.count != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("count", ToString::to_string(&self.count).as_str())?; } if self.size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sizeBytes", ToString::to_string(&self.size_bytes).as_str())?; } if self.strategy != 0 { - let v = AppSaveFileCapacityStrategy::from_i32(self.strategy) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.strategy)))?; + let v = AppSaveFileCapacityStrategy::try_from(self.strategy) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.strategy)))?; struct_ser.serialize_field("strategy", &v)?; } if let Some(v) = self.entity.as_ref() { @@ -22098,7 +22099,7 @@ impl<'de> serde::Deserialize<'de> for SetAppSaveFileCapacityRequest { formatter.write_str("struct librarian.sephirah.v1.SetAppSaveFileCapacityRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -22106,14 +22107,14 @@ impl<'de> serde::Deserialize<'de> for SetAppSaveFileCapacityRequest { let mut size_bytes__ = None; let mut strategy__ = None; let mut entity__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Count => { if count__.is_some() { return Err(serde::de::Error::duplicate_field("count")); } count__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::SizeBytes => { @@ -22121,26 +22122,26 @@ impl<'de> serde::Deserialize<'de> for SetAppSaveFileCapacityRequest { return Err(serde::de::Error::duplicate_field("sizeBytes")); } size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Strategy => { if strategy__.is_some() { return Err(serde::de::Error::duplicate_field("strategy")); } - strategy__ = Some(map.next_value::()? as i32); + strategy__ = Some(map_.next_value::()? as i32); } GeneratedField::User => { if entity__.is_some() { return Err(serde::de::Error::duplicate_field("user")); } - entity__ = map.next_value::<::std::option::Option<_>>()?.map(set_app_save_file_capacity_request::Entity::User); + entity__ = map_.next_value::<::std::option::Option<_>>()?.map(set_app_save_file_capacity_request::Entity::User); } GeneratedField::AppId => { if entity__.is_some() { return Err(serde::de::Error::duplicate_field("appId")); } - entity__ = map.next_value::<::std::option::Option<_>>()?.map(set_app_save_file_capacity_request::Entity::AppId) + entity__ = map_.next_value::<::std::option::Option<_>>()?.map(set_app_save_file_capacity_request::Entity::AppId) ; } } @@ -22213,12 +22214,12 @@ impl<'de> serde::Deserialize<'de> for SetAppSaveFileCapacityResponse { formatter.write_str("struct librarian.sephirah.v1.SetAppSaveFileCapacityResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(SetAppSaveFileCapacityResponse { }) @@ -22249,11 +22250,12 @@ impl serde::Serialize for SetFileCapacityRequest { struct_ser.serialize_field("userId", v)?; } if self.file_type != 0 { - let v = FileType::from_i32(self.file_type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.file_type)))?; + let v = FileType::try_from(self.file_type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.file_type)))?; struct_ser.serialize_field("fileType", &v)?; } if self.size_bytes != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("sizeBytes", ToString::to_string(&self.size_bytes).as_str())?; } struct_ser.end() @@ -22318,33 +22320,33 @@ impl<'de> serde::Deserialize<'de> for SetFileCapacityRequest { formatter.write_str("struct librarian.sephirah.v1.SetFileCapacityRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut user_id__ = None; let mut file_type__ = None; let mut size_bytes__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::UserId => { if user_id__.is_some() { return Err(serde::de::Error::duplicate_field("userId")); } - user_id__ = map.next_value()?; + user_id__ = map_.next_value()?; } GeneratedField::FileType => { if file_type__.is_some() { return Err(serde::de::Error::duplicate_field("fileType")); } - file_type__ = Some(map.next_value::()? as i32); + file_type__ = Some(map_.next_value::()? as i32); } GeneratedField::SizeBytes => { if size_bytes__.is_some() { return Err(serde::de::Error::duplicate_field("sizeBytes")); } size_bytes__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -22416,12 +22418,12 @@ impl<'de> serde::Deserialize<'de> for SetFileCapacityResponse { formatter.write_str("struct librarian.sephirah.v1.SetFileCapacityResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(SetFileCapacityResponse { }) @@ -22526,7 +22528,7 @@ impl<'de> serde::Deserialize<'de> for SharedAppSave { formatter.write_str("struct librarian.sephirah.v1.SharedAppSave") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -22534,31 +22536,31 @@ impl<'de> serde::Deserialize<'de> for SharedAppSave { let mut name__ = None; let mut description__ = None; let mut app_info_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::AppInfoId => { if app_info_id__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoId")); } - app_info_id__ = map.next_value()?; + app_info_id__ = map_.next_value()?; } } } @@ -22698,7 +22700,7 @@ impl<'de> serde::Deserialize<'de> for SharedAppSaveFile { formatter.write_str("struct librarian.sephirah.v1.SharedAppSaveFile") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -22709,49 +22711,49 @@ impl<'de> serde::Deserialize<'de> for SharedAppSaveFile { let mut shared_app_save_id__ = None; let mut file_metadata_id__ = None; let mut user_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Public => { if public__.is_some() { return Err(serde::de::Error::duplicate_field("public")); } - public__ = Some(map.next_value()?); + public__ = Some(map_.next_value()?); } GeneratedField::SharedAppSaveId => { if shared_app_save_id__.is_some() { return Err(serde::de::Error::duplicate_field("sharedAppSaveId")); } - shared_app_save_id__ = map.next_value()?; + shared_app_save_id__ = map_.next_value()?; } GeneratedField::FileMetadataId => { if file_metadata_id__.is_some() { return Err(serde::de::Error::duplicate_field("fileMetadataId")); } - file_metadata_id__ = map.next_value()?; + file_metadata_id__ = map_.next_value()?; } GeneratedField::UserId => { if user_id__.is_some() { return Err(serde::de::Error::duplicate_field("userId")); } - user_id__ = map.next_value()?; + user_id__ = map_.next_value()?; } } } @@ -22826,12 +22828,12 @@ impl<'de> serde::Deserialize<'de> for SimpleDownloadFileRequest { formatter.write_str("struct librarian.sephirah.v1.SimpleDownloadFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(SimpleDownloadFileRequest { }) @@ -22853,6 +22855,7 @@ impl serde::Serialize for SimpleDownloadFileResponse { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.SimpleDownloadFileResponse", len)?; if !self.data.is_empty() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("data", pbjson::private::base64::encode(&self.data).as_str())?; } struct_ser.end() @@ -22908,19 +22911,19 @@ impl<'de> serde::Deserialize<'de> for SimpleDownloadFileResponse { formatter.write_str("struct librarian.sephirah.v1.SimpleDownloadFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut data__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Data => { if data__.is_some() { return Err(serde::de::Error::duplicate_field("data")); } data__ = - Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) ; } } @@ -22946,6 +22949,7 @@ impl serde::Serialize for SimpleUploadFileRequest { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.SimpleUploadFileRequest", len)?; if !self.data.is_empty() { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("data", pbjson::private::base64::encode(&self.data).as_str())?; } struct_ser.end() @@ -23001,19 +23005,19 @@ impl<'de> serde::Deserialize<'de> for SimpleUploadFileRequest { formatter.write_str("struct librarian.sephirah.v1.SimpleUploadFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut data__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Data => { if data__.is_some() { return Err(serde::de::Error::duplicate_field("data")); } data__ = - Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) ; } } @@ -23039,8 +23043,8 @@ impl serde::Serialize for SimpleUploadFileResponse { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.SimpleUploadFileResponse", len)?; if self.status != 0 { - let v = FileTransferStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = FileTransferStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -23096,18 +23100,18 @@ impl<'de> serde::Deserialize<'de> for SimpleUploadFileResponse { formatter.write_str("struct librarian.sephirah.v1.SimpleUploadFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -23198,25 +23202,25 @@ impl<'de> serde::Deserialize<'de> for SumAppInstRunTimeRequest { formatter.write_str("struct librarian.sephirah.v1.SumAppInstRunTimeRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_inst_id__ = None; let mut time_aggregation__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInstId => { if app_inst_id__.is_some() { return Err(serde::de::Error::duplicate_field("appInstId")); } - app_inst_id__ = map.next_value()?; + app_inst_id__ = map_.next_value()?; } GeneratedField::TimeAggregation => { if time_aggregation__.is_some() { return Err(serde::de::Error::duplicate_field("timeAggregation")); } - time_aggregation__ = map.next_value()?; + time_aggregation__ = map_.next_value()?; } } } @@ -23298,18 +23302,18 @@ impl<'de> serde::Deserialize<'de> for SumAppInstRunTimeResponse { formatter.write_str("struct librarian.sephirah.v1.SumAppInstRunTimeResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut run_time_groups__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::RunTimeGroups => { if run_time_groups__.is_some() { return Err(serde::de::Error::duplicate_field("runTimeGroups")); } - run_time_groups__ = Some(map.next_value()?); + run_time_groups__ = Some(map_.next_value()?); } } } @@ -23399,25 +23403,25 @@ impl<'de> serde::Deserialize<'de> for sum_app_inst_run_time_response::Group { formatter.write_str("struct librarian.sephirah.v1.SumAppInstRunTimeResponse.Group") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut time_range__ = None; let mut duration__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::TimeRange => { if time_range__.is_some() { return Err(serde::de::Error::duplicate_field("timeRange")); } - time_range__ = map.next_value()?; + time_range__ = map_.next_value()?; } GeneratedField::Duration => { if duration__.is_some() { return Err(serde::de::Error::duplicate_field("duration")); } - duration__ = map.next_value()?; + duration__ = map_.next_value()?; } } } @@ -23499,18 +23503,18 @@ impl<'de> serde::Deserialize<'de> for SyncAccountAppInfosRequest { formatter.write_str("struct librarian.sephirah.v1.SyncAccountAppInfosRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut account_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccountId => { if account_id__.is_some() { return Err(serde::de::Error::duplicate_field("accountId")); } - account_id__ = map.next_value()?; + account_id__ = map_.next_value()?; } } } @@ -23579,12 +23583,12 @@ impl<'de> serde::Deserialize<'de> for SyncAccountAppInfosResponse { formatter.write_str("struct librarian.sephirah.v1.SyncAccountAppInfosResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(SyncAccountAppInfosResponse { }) @@ -23672,25 +23676,25 @@ impl<'de> serde::Deserialize<'de> for SyncAppInfosRequest { formatter.write_str("struct librarian.sephirah.v1.SyncAppInfosRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info_ids__ = None; let mut wait_data__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfoIds => { if app_info_ids__.is_some() { return Err(serde::de::Error::duplicate_field("appInfoIds")); } - app_info_ids__ = Some(map.next_value()?); + app_info_ids__ = Some(map_.next_value()?); } GeneratedField::WaitData => { if wait_data__.is_some() { return Err(serde::de::Error::duplicate_field("waitData")); } - wait_data__ = map.next_value()?; + wait_data__ = map_.next_value()?; } } } @@ -23772,18 +23776,18 @@ impl<'de> serde::Deserialize<'de> for SyncAppInfosResponse { formatter.write_str("struct librarian.sephirah.v1.SyncAppInfosResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_infos__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfos => { if app_infos__.is_some() { return Err(serde::de::Error::duplicate_field("appInfos")); } - app_infos__ = Some(map.next_value()?); + app_infos__ = Some(map_.next_value()?); } } } @@ -23832,18 +23836,18 @@ impl serde::Serialize for SystemNotification { struct_ser.serialize_field("id", v)?; } if self.r#type != 0 { - let v = SystemNotificationType::from_i32(self.r#type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; + let v = SystemNotificationType::try_from(self.r#type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; struct_ser.serialize_field("type", &v)?; } if self.level != 0 { - let v = SystemNotificationLevel::from_i32(self.level) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.level)))?; + let v = SystemNotificationLevel::try_from(self.level) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.level)))?; struct_ser.serialize_field("level", &v)?; } if self.status != 0 { - let v = SystemNotificationStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = SystemNotificationStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } if !self.title.is_empty() { @@ -23934,7 +23938,7 @@ impl<'de> serde::Deserialize<'de> for SystemNotification { formatter.write_str("struct librarian.sephirah.v1.SystemNotification") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -23946,55 +23950,55 @@ impl<'de> serde::Deserialize<'de> for SystemNotification { let mut content__ = None; let mut create_time__ = None; let mut update_time__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Type => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("type")); } - r#type__ = Some(map.next_value::()? as i32); + r#type__ = Some(map_.next_value::()? as i32); } GeneratedField::Level => { if level__.is_some() { return Err(serde::de::Error::duplicate_field("level")); } - level__ = Some(map.next_value::()? as i32); + level__ = Some(map_.next_value::()? as i32); } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } GeneratedField::Title => { if title__.is_some() { return Err(serde::de::Error::duplicate_field("title")); } - title__ = Some(map.next_value()?); + title__ = Some(map_.next_value()?); } GeneratedField::Content => { if content__.is_some() { return Err(serde::de::Error::duplicate_field("content")); } - content__ = Some(map.next_value()?); + content__ = Some(map_.next_value()?); } GeneratedField::CreateTime => { if create_time__.is_some() { return Err(serde::de::Error::duplicate_field("createTime")); } - create_time__ = map.next_value()?; + create_time__ = map_.next_value()?; } GeneratedField::UpdateTime => { if update_time__.is_some() { return Err(serde::de::Error::duplicate_field("updateTime")); } - update_time__ = map.next_value()?; + update_time__ = map_.next_value()?; } } } @@ -24056,10 +24060,9 @@ impl<'de> serde::Deserialize<'de> for SystemNotificationLevel { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(SystemNotificationLevel::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -24069,10 +24072,9 @@ impl<'de> serde::Deserialize<'de> for SystemNotificationLevel { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(SystemNotificationLevel::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -24136,10 +24138,9 @@ impl<'de> serde::Deserialize<'de> for SystemNotificationStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(SystemNotificationStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -24149,10 +24150,9 @@ impl<'de> serde::Deserialize<'de> for SystemNotificationStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(SystemNotificationStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -24213,10 +24213,9 @@ impl<'de> serde::Deserialize<'de> for SystemNotificationType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(SystemNotificationType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -24226,10 +24225,9 @@ impl<'de> serde::Deserialize<'de> for SystemNotificationType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(SystemNotificationType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -24297,10 +24295,9 @@ impl<'de> serde::Deserialize<'de> for SystemType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(SystemType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -24310,10 +24307,9 @@ impl<'de> serde::Deserialize<'de> for SystemType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(SystemType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -24443,7 +24439,7 @@ impl<'de> serde::Deserialize<'de> for Tag { formatter.write_str("struct librarian.sephirah.v1.Tag") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -24452,37 +24448,37 @@ impl<'de> serde::Deserialize<'de> for Tag { let mut description__ = None; let mut creator_id__ = None; let mut public__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::CreatorId => { if creator_id__.is_some() { return Err(serde::de::Error::duplicate_field("creatorId")); } - creator_id__ = map.next_value()?; + creator_id__ = map_.next_value()?; } GeneratedField::Public => { if public__.is_some() { return Err(serde::de::Error::duplicate_field("public")); } - public__ = Some(map.next_value()?); + public__ = Some(map_.next_value()?); } } } @@ -24567,18 +24563,18 @@ impl<'de> serde::Deserialize<'de> for UnAssignAppRequest { formatter.write_str("struct librarian.sephirah.v1.UnAssignAppRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppId => { if app_id__.is_some() { return Err(serde::de::Error::duplicate_field("appId")); } - app_id__ = map.next_value()?; + app_id__ = map_.next_value()?; } } } @@ -24647,12 +24643,12 @@ impl<'de> serde::Deserialize<'de> for UnAssignAppResponse { formatter.write_str("struct librarian.sephirah.v1.UnAssignAppResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UnAssignAppResponse { }) @@ -24730,18 +24726,18 @@ impl<'de> serde::Deserialize<'de> for UnLinkAccountRequest { formatter.write_str("struct librarian.sephirah.v1.UnLinkAccountRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut account_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AccountId => { if account_id__.is_some() { return Err(serde::de::Error::duplicate_field("accountId")); } - account_id__ = map.next_value()?; + account_id__ = map_.next_value()?; } } } @@ -24810,12 +24806,12 @@ impl<'de> serde::Deserialize<'de> for UnLinkAccountResponse { formatter.write_str("struct librarian.sephirah.v1.UnLinkAccountResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UnLinkAccountResponse { }) @@ -24892,18 +24888,18 @@ impl<'de> serde::Deserialize<'de> for UnpinAppSaveFileRequest { formatter.write_str("struct librarian.sephirah.v1.UnpinAppSaveFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } } } @@ -24972,12 +24968,12 @@ impl<'de> serde::Deserialize<'de> for UnpinAppSaveFileResponse { formatter.write_str("struct librarian.sephirah.v1.UnpinAppSaveFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UnpinAppSaveFileResponse { }) @@ -25055,18 +25051,18 @@ impl<'de> serde::Deserialize<'de> for UpdateAppCategoryRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateAppCategoryRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_category__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppCategory => { if app_category__.is_some() { return Err(serde::de::Error::duplicate_field("appCategory")); } - app_category__ = map.next_value()?; + app_category__ = map_.next_value()?; } } } @@ -25135,12 +25131,12 @@ impl<'de> serde::Deserialize<'de> for UpdateAppCategoryResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateAppCategoryResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateAppCategoryResponse { }) @@ -25218,18 +25214,18 @@ impl<'de> serde::Deserialize<'de> for UpdateAppInfoRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateAppInfoRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_info__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInfo => { if app_info__.is_some() { return Err(serde::de::Error::duplicate_field("appInfo")); } - app_info__ = map.next_value()?; + app_info__ = map_.next_value()?; } } } @@ -25298,12 +25294,12 @@ impl<'de> serde::Deserialize<'de> for UpdateAppInfoResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateAppInfoResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateAppInfoResponse { }) @@ -25381,18 +25377,18 @@ impl<'de> serde::Deserialize<'de> for UpdateAppInstRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateAppInstRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app_inst__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AppInst => { if app_inst__.is_some() { return Err(serde::de::Error::duplicate_field("appInst")); } - app_inst__ = map.next_value()?; + app_inst__ = map_.next_value()?; } } } @@ -25461,12 +25457,12 @@ impl<'de> serde::Deserialize<'de> for UpdateAppInstResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateAppInstResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateAppInstResponse { }) @@ -25543,18 +25539,18 @@ impl<'de> serde::Deserialize<'de> for UpdateAppRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateAppRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut app__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::App => { if app__.is_some() { return Err(serde::de::Error::duplicate_field("app")); } - app__ = map.next_value()?; + app__ = map_.next_value()?; } } } @@ -25623,12 +25619,12 @@ impl<'de> serde::Deserialize<'de> for UpdateAppResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateAppResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateAppResponse { }) @@ -25706,18 +25702,18 @@ impl<'de> serde::Deserialize<'de> for UpdateFeedActionSetRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateFeedActionSetRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut action_set__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ActionSet => { if action_set__.is_some() { return Err(serde::de::Error::duplicate_field("actionSet")); } - action_set__ = map.next_value()?; + action_set__ = map_.next_value()?; } } } @@ -25786,12 +25782,12 @@ impl<'de> serde::Deserialize<'de> for UpdateFeedActionSetResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateFeedActionSetResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateFeedActionSetResponse { }) @@ -25868,18 +25864,18 @@ impl<'de> serde::Deserialize<'de> for UpdateFeedConfigRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateFeedConfigRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut config__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Config => { if config__.is_some() { return Err(serde::de::Error::duplicate_field("config")); } - config__ = map.next_value()?; + config__ = map_.next_value()?; } } } @@ -25948,12 +25944,12 @@ impl<'de> serde::Deserialize<'de> for UpdateFeedConfigResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateFeedConfigResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateFeedConfigResponse { }) @@ -26030,18 +26026,18 @@ impl<'de> serde::Deserialize<'de> for UpdateFeedItemCollectionRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateFeedItemCollectionRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut collection__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Collection => { if collection__.is_some() { return Err(serde::de::Error::duplicate_field("collection")); } - collection__ = map.next_value()?; + collection__ = map_.next_value()?; } } } @@ -26110,12 +26106,12 @@ impl<'de> serde::Deserialize<'de> for UpdateFeedItemCollectionResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateFeedItemCollectionResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateFeedItemCollectionResponse { }) @@ -26210,32 +26206,32 @@ impl<'de> serde::Deserialize<'de> for UpdateImageRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateImageRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut name__ = None; let mut description__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } } } @@ -26306,12 +26302,12 @@ impl<'de> serde::Deserialize<'de> for UpdateImageResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateImageResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateImageResponse { }) @@ -26388,18 +26384,18 @@ impl<'de> serde::Deserialize<'de> for UpdateNotifyFlowRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateNotifyFlowRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut flow__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Flow => { if flow__.is_some() { return Err(serde::de::Error::duplicate_field("flow")); } - flow__ = map.next_value()?; + flow__ = map_.next_value()?; } } } @@ -26468,12 +26464,12 @@ impl<'de> serde::Deserialize<'de> for UpdateNotifyFlowResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateNotifyFlowResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateNotifyFlowResponse { }) @@ -26550,18 +26546,18 @@ impl<'de> serde::Deserialize<'de> for UpdateNotifyTargetRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateNotifyTargetRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut target__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Target => { if target__.is_some() { return Err(serde::de::Error::duplicate_field("target")); } - target__ = map.next_value()?; + target__ = map_.next_value()?; } } } @@ -26630,12 +26626,12 @@ impl<'de> serde::Deserialize<'de> for UpdateNotifyTargetResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateNotifyTargetResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateNotifyTargetResponse { }) @@ -26722,25 +26718,25 @@ impl<'de> serde::Deserialize<'de> for UpdatePorterContextRequest { formatter.write_str("struct librarian.sephirah.v1.UpdatePorterContextRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut porter_id__ = None; let mut context__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::PorterId => { if porter_id__.is_some() { return Err(serde::de::Error::duplicate_field("porterId")); } - porter_id__ = map.next_value()?; + porter_id__ = map_.next_value()?; } GeneratedField::Context => { if context__.is_some() { return Err(serde::de::Error::duplicate_field("context")); } - context__ = map.next_value()?; + context__ = map_.next_value()?; } } } @@ -26810,12 +26806,12 @@ impl<'de> serde::Deserialize<'de> for UpdatePorterContextResponse { formatter.write_str("struct librarian.sephirah.v1.UpdatePorterContextResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdatePorterContextResponse { }) @@ -26843,8 +26839,8 @@ impl serde::Serialize for UpdatePorterStatusRequest { struct_ser.serialize_field("porterId", v)?; } if self.status != 0 { - let v = UserStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = UserStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -26904,25 +26900,25 @@ impl<'de> serde::Deserialize<'de> for UpdatePorterStatusRequest { formatter.write_str("struct librarian.sephirah.v1.UpdatePorterStatusRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut porter_id__ = None; let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::PorterId => { if porter_id__.is_some() { return Err(serde::de::Error::duplicate_field("porterId")); } - porter_id__ = map.next_value()?; + porter_id__ = map_.next_value()?; } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -26992,12 +26988,12 @@ impl<'de> serde::Deserialize<'de> for UpdatePorterStatusResponse { formatter.write_str("struct librarian.sephirah.v1.UpdatePorterStatusResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdatePorterStatusResponse { }) @@ -27075,18 +27071,18 @@ impl<'de> serde::Deserialize<'de> for UpdateSharedAppSaveFileRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateSharedAppSaveFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut shared_app_save_file__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SharedAppSaveFile => { if shared_app_save_file__.is_some() { return Err(serde::de::Error::duplicate_field("sharedAppSaveFile")); } - shared_app_save_file__ = map.next_value()?; + shared_app_save_file__ = map_.next_value()?; } } } @@ -27155,12 +27151,12 @@ impl<'de> serde::Deserialize<'de> for UpdateSharedAppSaveFileResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateSharedAppSaveFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateSharedAppSaveFileResponse { }) @@ -27238,18 +27234,18 @@ impl<'de> serde::Deserialize<'de> for UpdateSharedAppSaveRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateSharedAppSaveRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut shared_app_save__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::SharedAppSave => { if shared_app_save__.is_some() { return Err(serde::de::Error::duplicate_field("sharedAppSave")); } - shared_app_save__ = map.next_value()?; + shared_app_save__ = map_.next_value()?; } } } @@ -27318,12 +27314,12 @@ impl<'de> serde::Deserialize<'de> for UpdateSharedAppSaveResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateSharedAppSaveResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateSharedAppSaveResponse { }) @@ -27351,8 +27347,8 @@ impl serde::Serialize for UpdateSystemNotificationRequest { struct_ser.serialize_field("id", v)?; } if self.status != 0 { - let v = SystemNotificationStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = SystemNotificationStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -27411,25 +27407,25 @@ impl<'de> serde::Deserialize<'de> for UpdateSystemNotificationRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateSystemNotificationRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -27499,12 +27495,12 @@ impl<'de> serde::Deserialize<'de> for UpdateSystemNotificationResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateSystemNotificationResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateSystemNotificationResponse { }) @@ -27581,18 +27577,18 @@ impl<'de> serde::Deserialize<'de> for UpdateTagRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateTagRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut tag__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Tag => { if tag__.is_some() { return Err(serde::de::Error::duplicate_field("tag")); } - tag__ = map.next_value()?; + tag__ = map_.next_value()?; } } } @@ -27661,12 +27657,12 @@ impl<'de> serde::Deserialize<'de> for UpdateTagResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateTagResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateTagResponse { }) @@ -27752,25 +27748,25 @@ impl<'de> serde::Deserialize<'de> for UpdateUserRequest { formatter.write_str("struct librarian.sephirah.v1.UpdateUserRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut user__ = None; let mut password__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::User => { if user__.is_some() { return Err(serde::de::Error::duplicate_field("user")); } - user__ = map.next_value()?; + user__ = map_.next_value()?; } GeneratedField::Password => { if password__.is_some() { return Err(serde::de::Error::duplicate_field("password")); } - password__ = map.next_value()?; + password__ = map_.next_value()?; } } } @@ -27840,12 +27836,12 @@ impl<'de> serde::Deserialize<'de> for UpdateUserResponse { formatter.write_str("struct librarian.sephirah.v1.UpdateUserResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - while map.next_key::()?.is_some() { - let _ = map.next_value::()?; + while map_.next_key::()?.is_some() { + let _ = map_.next_value::()?; } Ok(UpdateUserResponse { }) @@ -27933,25 +27929,25 @@ impl<'de> serde::Deserialize<'de> for UploadAppSaveFileRequest { formatter.write_str("struct librarian.sephirah.v1.UploadAppSaveFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut file_metadata__ = None; let mut app_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FileMetadata => { if file_metadata__.is_some() { return Err(serde::de::Error::duplicate_field("fileMetadata")); } - file_metadata__ = map.next_value()?; + file_metadata__ = map_.next_value()?; } GeneratedField::AppId => { if app_id__.is_some() { return Err(serde::de::Error::duplicate_field("appId")); } - app_id__ = map.next_value()?; + app_id__ = map_.next_value()?; } } } @@ -28033,18 +28029,18 @@ impl<'de> serde::Deserialize<'de> for UploadAppSaveFileResponse { formatter.write_str("struct librarian.sephirah.v1.UploadAppSaveFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut upload_token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::UploadToken => { if upload_token__.is_some() { return Err(serde::de::Error::duplicate_field("uploadToken")); } - upload_token__ = Some(map.next_value()?); + upload_token__ = Some(map_.next_value()?); } } } @@ -28136,25 +28132,25 @@ impl<'de> serde::Deserialize<'de> for UploadFileRequest { formatter.write_str("struct librarian.sephirah.v1.UploadFileRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut content__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FileChunk => { if content__.is_some() { return Err(serde::de::Error::duplicate_field("fileChunk")); } - content__ = map.next_value::<::std::option::Option<_>>()?.map(upload_file_request::Content::FileChunk) + content__ = map_.next_value::<::std::option::Option<_>>()?.map(upload_file_request::Content::FileChunk) ; } GeneratedField::RequireFileStatus => { if content__.is_some() { return Err(serde::de::Error::duplicate_field("requireFileStatus")); } - content__ = map.next_value::<::std::option::Option<_>>()?.map(upload_file_request::Content::RequireFileStatus); + content__ = map_.next_value::<::std::option::Option<_>>()?.map(upload_file_request::Content::RequireFileStatus); } } } @@ -28246,25 +28242,25 @@ impl<'de> serde::Deserialize<'de> for UploadFileResponse { formatter.write_str("struct librarian.sephirah.v1.UploadFileResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut content__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ChunkStatus => { if content__.is_some() { return Err(serde::de::Error::duplicate_field("chunkStatus")); } - content__ = map.next_value::<::std::option::Option<_>>()?.map(upload_file_response::Content::ChunkStatus) + content__ = map_.next_value::<::std::option::Option<_>>()?.map(upload_file_response::Content::ChunkStatus) ; } GeneratedField::FileStatus => { if content__.is_some() { return Err(serde::de::Error::duplicate_field("fileStatus")); } - content__ = map.next_value::<::std::option::Option<_>>()?.map(upload_file_response::Content::FileStatus) + content__ = map_.next_value::<::std::option::Option<_>>()?.map(upload_file_response::Content::FileStatus) ; } } @@ -28293,11 +28289,12 @@ impl serde::Serialize for upload_file_response::ChunkStatus { } let mut struct_ser = serializer.serialize_struct("librarian.sephirah.v1.UploadFileResponse.ChunkStatus", len)?; if self.chunk_number != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("chunkNumber", ToString::to_string(&self.chunk_number).as_str())?; } if self.status != 0 { - let v = ChunkTransferStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = ChunkTransferStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -28357,27 +28354,27 @@ impl<'de> serde::Deserialize<'de> for upload_file_response::ChunkStatus { formatter.write_str("struct librarian.sephirah.v1.UploadFileResponse.ChunkStatus") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut chunk_number__ = None; let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::ChunkNumber => { if chunk_number__.is_some() { return Err(serde::de::Error::duplicate_field("chunkNumber")); } chunk_number__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -28409,8 +28406,8 @@ impl serde::Serialize for upload_file_response::FileStatus { struct_ser.serialize_field("missingChunkList", &self.missing_chunk_list.iter().map(ToString::to_string).collect::>())?; } if self.status != 0 { - let v = FileTransferStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = FileTransferStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -28470,20 +28467,20 @@ impl<'de> serde::Deserialize<'de> for upload_file_response::FileStatus { formatter.write_str("struct librarian.sephirah.v1.UploadFileResponse.FileStatus") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut missing_chunk_list__ = None; let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::MissingChunkList => { if missing_chunk_list__.is_some() { return Err(serde::de::Error::duplicate_field("missingChunkList")); } missing_chunk_list__ = - Some(map.next_value::>>()? + Some(map_.next_value::>>()? .into_iter().map(|x| x.0).collect()) ; } @@ -28491,7 +28488,7 @@ impl<'de> serde::Deserialize<'de> for upload_file_response::FileStatus { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -28591,32 +28588,32 @@ impl<'de> serde::Deserialize<'de> for UploadImageRequest { formatter.write_str("struct librarian.sephirah.v1.UploadImageRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut file_metadata__ = None; let mut name__ = None; let mut description__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::FileMetadata => { if file_metadata__.is_some() { return Err(serde::de::Error::duplicate_field("fileMetadata")); } - file_metadata__ = map.next_value()?; + file_metadata__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } } } @@ -28699,18 +28696,18 @@ impl<'de> serde::Deserialize<'de> for UploadImageResponse { formatter.write_str("struct librarian.sephirah.v1.UploadImageResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut upload_token__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::UploadToken => { if upload_token__.is_some() { return Err(serde::de::Error::duplicate_field("uploadToken")); } - upload_token__ = Some(map.next_value()?); + upload_token__ = Some(map_.next_value()?); } } } @@ -28756,13 +28753,13 @@ impl serde::Serialize for User { struct_ser.serialize_field("password", &self.password)?; } if self.r#type != 0 { - let v = UserType::from_i32(self.r#type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; + let v = UserType::try_from(self.r#type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; struct_ser.serialize_field("type", &v)?; } if self.status != 0 { - let v = UserStatus::from_i32(self.status) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; + let v = UserStatus::try_from(self.status) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.status)))?; struct_ser.serialize_field("status", &v)?; } struct_ser.end() @@ -28830,7 +28827,7 @@ impl<'de> serde::Deserialize<'de> for User { formatter.write_str("struct librarian.sephirah.v1.User") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -28839,37 +28836,37 @@ impl<'de> serde::Deserialize<'de> for User { let mut password__ = None; let mut r#type__ = None; let mut status__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Username => { if username__.is_some() { return Err(serde::de::Error::duplicate_field("username")); } - username__ = Some(map.next_value()?); + username__ = Some(map_.next_value()?); } GeneratedField::Password => { if password__.is_some() { return Err(serde::de::Error::duplicate_field("password")); } - password__ = Some(map.next_value()?); + password__ = Some(map_.next_value()?); } GeneratedField::Type => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("type")); } - r#type__ = Some(map.next_value::()? as i32); + r#type__ = Some(map_.next_value::()? as i32); } GeneratedField::Status => { if status__.is_some() { return Err(serde::de::Error::duplicate_field("status")); } - status__ = Some(map.next_value::()? as i32); + status__ = Some(map_.next_value::()? as i32); } } } @@ -28993,7 +28990,7 @@ impl<'de> serde::Deserialize<'de> for UserSession { formatter.write_str("struct librarian.sephirah.v1.UserSession") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -29002,37 +28999,37 @@ impl<'de> serde::Deserialize<'de> for UserSession { let mut device_info__ = None; let mut create_time__ = None; let mut expire_time__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::UserId => { if user_id__.is_some() { return Err(serde::de::Error::duplicate_field("userId")); } - user_id__ = map.next_value()?; + user_id__ = map_.next_value()?; } GeneratedField::DeviceInfo => { if device_info__.is_some() { return Err(serde::de::Error::duplicate_field("deviceInfo")); } - device_info__ = map.next_value()?; + device_info__ = map_.next_value()?; } GeneratedField::CreateTime => { if create_time__.is_some() { return Err(serde::de::Error::duplicate_field("createTime")); } - create_time__ = map.next_value()?; + create_time__ = map_.next_value()?; } GeneratedField::ExpireTime => { if expire_time__.is_some() { return Err(serde::de::Error::duplicate_field("expireTime")); } - expire_time__ = map.next_value()?; + expire_time__ = map_.next_value()?; } } } @@ -29087,10 +29084,9 @@ impl<'de> serde::Deserialize<'de> for UserStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(UserStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -29100,10 +29096,9 @@ impl<'de> serde::Deserialize<'de> for UserStatus { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(UserStatus::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -29167,10 +29162,9 @@ impl<'de> serde::Deserialize<'de> for UserType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(UserType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -29180,10 +29174,9 @@ impl<'de> serde::Deserialize<'de> for UserType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(UserType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) diff --git a/src/librarian.sephirah.v1.tonic.rs b/src/librarian.sephirah.v1.tonic.rs index a334b497..cf897708 100644 --- a/src/librarian.sephirah.v1.tonic.rs +++ b/src/librarian.sephirah.v1.tonic.rs @@ -3776,7 +3776,7 @@ pub mod librarian_sephirah_service_server { tonic::Status, >; /// Server streaming response type for the ListenServerEvent method. - type ListenServerEventStream: futures_core::Stream< + type ListenServerEventStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result< super::ListenServerEventResponse, tonic::Status, @@ -4003,7 +4003,7 @@ pub mod librarian_sephirah_service_server { tonic::Status, >; /// Server streaming response type for the UploadFile method. - type UploadFileStream: futures_core::Stream< + type UploadFileStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > + Send @@ -4015,7 +4015,7 @@ pub mod librarian_sephirah_service_server { request: tonic::Request>, ) -> std::result::Result, tonic::Status>; /// Server streaming response type for the DownloadFile method. - type DownloadFileStream: futures_core::Stream< + type DownloadFileStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > + Send @@ -4030,7 +4030,7 @@ pub mod librarian_sephirah_service_server { tonic::Status, >; /// Server streaming response type for the SimpleUploadFile method. - type SimpleUploadFileStream: futures_core::Stream< + type SimpleUploadFileStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result< super::SimpleUploadFileResponse, tonic::Status, @@ -4051,7 +4051,7 @@ pub mod librarian_sephirah_service_server { tonic::Status, >; /// Server streaming response type for the SimpleDownloadFile method. - type SimpleDownloadFileStream: futures_core::Stream< + type SimpleDownloadFileStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result< super::SimpleDownloadFileResponse, tonic::Status, @@ -4949,7 +4949,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_server_information(request).await + ::get_server_information( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -4997,7 +5001,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).listen_server_event(request).await + ::listen_server_event( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5042,7 +5050,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).get_token(request).await }; + let fut = async move { + ::get_token(&inner, request) + .await + }; Box::pin(fut) } } @@ -5087,7 +5098,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).refresh_token(request).await + ::refresh_token( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5133,7 +5148,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).acquire_user_token(request).await + ::acquire_user_token( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5179,7 +5198,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).register_user(request).await + ::register_user( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5225,7 +5248,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).register_device(request).await + ::register_device( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5273,7 +5300,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_registered_devices(request).await + ::list_registered_devices( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5319,7 +5350,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_user_sessions(request).await + ::list_user_sessions( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5365,7 +5400,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).delete_user_session(request).await + ::delete_user_session( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5410,7 +5449,13 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).create_user(request).await }; + let fut = async move { + ::create_user( + &inner, + request, + ) + .await + }; Box::pin(fut) } } @@ -5454,7 +5499,13 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).update_user(request).await }; + let fut = async move { + ::update_user( + &inner, + request, + ) + .await + }; Box::pin(fut) } } @@ -5498,7 +5549,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).get_user(request).await }; + let fut = async move { + ::get_user(&inner, request) + .await + }; Box::pin(fut) } } @@ -5542,7 +5596,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).list_users(request).await }; + let fut = async move { + ::list_users(&inner, request) + .await + }; Box::pin(fut) } } @@ -5587,7 +5644,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).link_account(request).await + ::link_account( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5633,7 +5694,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).un_link_account(request).await + ::un_link_account( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5679,7 +5744,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_link_accounts(request).await + ::list_link_accounts( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5725,7 +5794,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_porters(request).await + ::list_porters( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5773,7 +5846,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_porter_status(request).await + ::update_porter_status( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5821,7 +5898,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_porter_context(request).await + ::create_porter_context( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5869,7 +5950,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_porter_contexts(request).await + ::list_porter_contexts( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5917,7 +6002,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_porter_context(request).await + ::update_porter_context( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -5963,7 +6052,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).set_file_capacity(request).await + ::set_file_capacity( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6009,7 +6102,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_file_capacity(request).await + ::get_file_capacity( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6057,7 +6154,13 @@ pub mod librarian_sephirah_service_server { >, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).upload_file(request).await }; + let fut = async move { + ::upload_file( + &inner, + request, + ) + .await + }; Box::pin(fut) } } @@ -6105,7 +6208,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).download_file(request).await + ::download_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6154,7 +6261,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).simple_upload_file(request).await + ::simple_upload_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6204,7 +6315,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).simple_download_file(request).await + ::simple_download_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6252,7 +6367,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).presigned_upload_file(request).await + ::presigned_upload_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6303,7 +6422,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).presigned_upload_file_status(request).await + ::presigned_upload_file_status( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6351,7 +6474,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).presigned_download_file(request).await + ::presigned_download_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6397,7 +6524,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).upload_image(request).await + ::upload_image( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6443,7 +6574,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_image(request).await + ::update_image( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6488,7 +6623,13 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).list_images(request).await }; + let fut = async move { + ::list_images( + &inner, + request, + ) + .await + }; Box::pin(fut) } } @@ -6533,7 +6674,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).search_images(request).await + ::search_images( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6578,7 +6723,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).get_image(request).await }; + let fut = async move { + ::get_image(&inner, request) + .await + }; Box::pin(fut) } } @@ -6623,7 +6771,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).download_image(request).await + ::download_image( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6669,7 +6821,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_app_info(request).await + ::create_app_info( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6715,7 +6871,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_app_info(request).await + ::update_app_info( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6761,7 +6921,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_app_infos(request).await + ::list_app_infos( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6807,7 +6971,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).merge_app_infos(request).await + ::merge_app_infos( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6853,7 +7021,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).pick_app_info(request).await + ::pick_app_info( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6899,7 +7071,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).sync_app_infos(request).await + ::sync_app_infos( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6947,7 +7123,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).sync_account_app_infos(request).await + ::sync_account_app_infos( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -6993,7 +7173,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).search_app_infos(request).await + ::search_app_infos( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7039,7 +7223,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).search_new_app_infos(request).await + ::search_new_app_infos( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7085,7 +7273,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_app_info(request).await + ::get_app_info( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7131,7 +7323,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_bound_app_infos(request).await + ::get_bound_app_infos( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7177,7 +7373,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).purchase_app_info(request).await + ::purchase_app_info( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7225,7 +7425,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_purchased_app_infos(request).await + ::get_purchased_app_infos( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7270,7 +7474,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).create_app(request).await }; + let fut = async move { + ::create_app(&inner, request) + .await + }; Box::pin(fut) } } @@ -7314,7 +7521,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).update_app(request).await }; + let fut = async move { + ::update_app(&inner, request) + .await + }; Box::pin(fut) } } @@ -7358,7 +7568,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).list_apps(request).await }; + let fut = async move { + ::list_apps(&inner, request) + .await + }; Box::pin(fut) } } @@ -7402,7 +7615,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).assign_app(request).await }; + let fut = async move { + ::assign_app(&inner, request) + .await + }; Box::pin(fut) } } @@ -7447,7 +7663,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).un_assign_app(request).await + ::un_assign_app( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7493,7 +7713,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).report_app_binaries(request).await + ::report_app_binaries( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7539,7 +7763,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).download_app_binary(request).await + ::download_app_binary( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7585,7 +7813,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_app_inst(request).await + ::create_app_inst( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7631,7 +7863,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_app_inst(request).await + ::update_app_inst( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7677,7 +7913,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_app_insts(request).await + ::list_app_insts( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7723,7 +7963,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).add_app_inst_run_time(request).await + ::add_app_inst_run_time( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7769,7 +8013,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).sum_app_inst_run_time(request).await + ::sum_app_inst_run_time( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7815,7 +8063,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).upload_app_save_file(request).await + ::upload_app_save_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7863,7 +8115,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).download_app_save_file(request).await + ::download_app_save_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7909,7 +8165,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_app_save_files(request).await + ::list_app_save_files( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -7955,7 +8215,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).remove_app_save_file(request).await + ::remove_app_save_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8001,7 +8265,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).pin_app_save_file(request).await + ::pin_app_save_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8047,7 +8315,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).unpin_app_save_file(request).await + ::unpin_app_save_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8095,7 +8367,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).set_app_save_file_capacity(request).await + ::set_app_save_file_capacity( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8143,7 +8419,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_app_save_file_capacity(request).await + ::get_app_save_file_capacity( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8194,7 +8474,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).set_app_save_file_capacity_default(request).await + ::set_app_save_file_capacity_default( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8245,7 +8529,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_app_save_file_capacity_default(request).await + ::get_app_save_file_capacity_default( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8293,7 +8581,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_shared_app_save(request).await + ::create_shared_app_save( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8341,7 +8633,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_shared_app_save(request).await + ::update_shared_app_save( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8389,7 +8685,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_shared_app_saves(request).await + ::list_shared_app_saves( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8437,7 +8737,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).remove_shared_app_save(request).await + ::remove_shared_app_save( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8487,7 +8791,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_shared_app_save_file(request).await + ::create_shared_app_save_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8537,7 +8845,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_shared_app_save_file(request).await + ::update_shared_app_save_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8585,7 +8897,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_shared_app_save_files(request).await + ::list_shared_app_save_files( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8635,7 +8951,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).remove_shared_app_save_file(request).await + ::remove_shared_app_save_file( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8681,7 +9001,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_app_categories(request).await + ::list_app_categories( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8727,7 +9051,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_app_category(request).await + ::create_app_category( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8773,7 +9101,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_app_category(request).await + ::update_app_category( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8819,7 +9151,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).remove_app_category(request).await + ::remove_app_category( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8867,7 +9203,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_notify_target(request).await + ::create_notify_target( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8915,7 +9255,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_notify_target(request).await + ::update_notify_target( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -8961,7 +9305,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_notify_targets(request).await + ::list_notify_targets( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9007,7 +9355,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_notify_flow(request).await + ::create_notify_flow( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9053,7 +9405,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_notify_flow(request).await + ::update_notify_flow( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9099,7 +9455,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_notify_flows(request).await + ::list_notify_flows( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9149,7 +9509,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_system_notifications(request).await + ::list_system_notifications( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9199,7 +9563,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_system_notification(request).await + ::update_system_notification( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9245,7 +9613,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_feed_config(request).await + ::create_feed_config( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9291,7 +9663,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_feed_config(request).await + ::update_feed_config( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9337,7 +9713,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_feed_configs(request).await + ::list_feed_configs( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9385,7 +9765,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_feed_action_set(request).await + ::create_feed_action_set( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9433,7 +9817,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_feed_action_set(request).await + ::update_feed_action_set( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9481,7 +9869,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_feed_action_sets(request).await + ::list_feed_action_sets( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9529,7 +9921,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_feed_categories(request).await + ::list_feed_categories( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9575,7 +9971,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_feed_platforms(request).await + ::list_feed_platforms( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9621,7 +10021,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_feed_items(request).await + ::list_feed_items( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9667,7 +10071,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).group_feed_items(request).await + ::group_feed_items( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9713,7 +10121,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_feed_item(request).await + ::get_feed_item( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9759,7 +10171,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).get_batch_feed_items(request).await + ::get_batch_feed_items( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9805,7 +10221,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).read_feed_item(request).await + ::read_feed_item( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9855,7 +10275,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).create_feed_item_collection(request).await + ::create_feed_item_collection( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9905,7 +10329,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).update_feed_item_collection(request).await + ::update_feed_item_collection( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -9955,7 +10383,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_feed_item_collections(request).await + ::list_feed_item_collections( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -10005,7 +10437,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).add_feed_item_to_collection(request).await + ::add_feed_item_to_collection( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -10056,7 +10492,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).remove_feed_item_from_collection(request).await + ::remove_feed_item_from_collection( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -10107,7 +10547,11 @@ pub mod librarian_sephirah_service_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).list_feed_items_in_collection(request).await + ::list_feed_items_in_collection( + &inner, + request, + ) + .await }; Box::pin(fut) } @@ -10152,7 +10596,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).create_tag(request).await }; + let fut = async move { + ::create_tag(&inner, request) + .await + }; Box::pin(fut) } } @@ -10196,7 +10643,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).update_tag(request).await }; + let fut = async move { + ::update_tag(&inner, request) + .await + }; Box::pin(fut) } } @@ -10240,7 +10690,10 @@ pub mod librarian_sephirah_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).list_tags(request).await }; + let fut = async move { + ::list_tags(&inner, request) + .await + }; Box::pin(fut) } } diff --git a/src/librarian.v1.serde.rs b/src/librarian.v1.serde.rs index 9fde21d0..38a7f803 100644 --- a/src/librarian.v1.serde.rs +++ b/src/librarian.v1.serde.rs @@ -125,7 +125,7 @@ impl<'de> serde::Deserialize<'de> for Account { formatter.write_str("struct librarian.v1.Account") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -136,49 +136,49 @@ impl<'de> serde::Deserialize<'de> for Account { let mut profile_url__ = None; let mut avatar_url__ = None; let mut latest_update_time__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Platform => { if platform__.is_some() { return Err(serde::de::Error::duplicate_field("platform")); } - platform__ = Some(map.next_value()?); + platform__ = Some(map_.next_value()?); } GeneratedField::PlatformAccountId => { if platform_account_id__.is_some() { return Err(serde::de::Error::duplicate_field("platformAccountId")); } - platform_account_id__ = Some(map.next_value()?); + platform_account_id__ = Some(map_.next_value()?); } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::ProfileUrl => { if profile_url__.is_some() { return Err(serde::de::Error::duplicate_field("profileUrl")); } - profile_url__ = Some(map.next_value()?); + profile_url__ = Some(map_.next_value()?); } GeneratedField::AvatarUrl => { if avatar_url__.is_some() { return Err(serde::de::Error::duplicate_field("avatarUrl")); } - avatar_url__ = Some(map.next_value()?); + avatar_url__ = Some(map_.next_value()?); } GeneratedField::LatestUpdateTime => { if latest_update_time__.is_some() { return Err(serde::de::Error::duplicate_field("latestUpdateTime")); } - latest_update_time__ = map.next_value()?; + latest_update_time__ = map_.next_value()?; } } } @@ -233,10 +233,9 @@ impl<'de> serde::Deserialize<'de> for AccountAppRelationType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(AccountAppRelationType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -246,10 +245,9 @@ impl<'de> serde::Deserialize<'de> for AccountAppRelationType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(AccountAppRelationType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -347,25 +345,25 @@ impl<'de> serde::Deserialize<'de> for AccountId { formatter.write_str("struct librarian.v1.AccountID") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut platform__ = None; let mut platform_account_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Platform => { if platform__.is_some() { return Err(serde::de::Error::duplicate_field("platform")); } - platform__ = Some(map.next_value()?); + platform__ = Some(map_.next_value()?); } GeneratedField::PlatformAccountId => { if platform_account_id__.is_some() { return Err(serde::de::Error::duplicate_field("platformAccountId")); } - platform_account_id__ = Some(map.next_value()?); + platform_account_id__ = Some(map_.next_value()?); } } } @@ -451,8 +449,8 @@ impl serde::Serialize for AppInfo { struct_ser.serialize_field("name", &self.name)?; } if self.r#type != 0 { - let v = AppType::from_i32(self.r#type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; + let v = AppType::try_from(self.r#type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; struct_ser.serialize_field("type", &v)?; } if !self.short_description.is_empty() { @@ -572,7 +570,7 @@ impl<'de> serde::Deserialize<'de> for AppInfo { formatter.write_str("struct librarian.v1.AppInfo") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -590,91 +588,91 @@ impl<'de> serde::Deserialize<'de> for AppInfo { let mut cover_image_url__ = None; let mut tags__ = None; let mut alt_names__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Internal => { if internal__.is_some() { return Err(serde::de::Error::duplicate_field("internal")); } - internal__ = Some(map.next_value()?); + internal__ = Some(map_.next_value()?); } GeneratedField::Source => { if source__.is_some() { return Err(serde::de::Error::duplicate_field("source")); } - source__ = Some(map.next_value()?); + source__ = Some(map_.next_value()?); } GeneratedField::SourceAppId => { if source_app_id__.is_some() { return Err(serde::de::Error::duplicate_field("sourceAppId")); } - source_app_id__ = Some(map.next_value()?); + source_app_id__ = Some(map_.next_value()?); } GeneratedField::SourceUrl => { if source_url__.is_some() { return Err(serde::de::Error::duplicate_field("sourceUrl")); } - source_url__ = map.next_value()?; + source_url__ = map_.next_value()?; } GeneratedField::Details => { if details__.is_some() { return Err(serde::de::Error::duplicate_field("details")); } - details__ = map.next_value()?; + details__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Type => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("type")); } - r#type__ = Some(map.next_value::()? as i32); + r#type__ = Some(map_.next_value::()? as i32); } GeneratedField::ShortDescription => { if short_description__.is_some() { return Err(serde::de::Error::duplicate_field("shortDescription")); } - short_description__ = Some(map.next_value()?); + short_description__ = Some(map_.next_value()?); } GeneratedField::IconImageUrl => { if icon_image_url__.is_some() { return Err(serde::de::Error::duplicate_field("iconImageUrl")); } - icon_image_url__ = Some(map.next_value()?); + icon_image_url__ = Some(map_.next_value()?); } GeneratedField::BackgroundImageUrl => { if background_image_url__.is_some() { return Err(serde::de::Error::duplicate_field("backgroundImageUrl")); } - background_image_url__ = Some(map.next_value()?); + background_image_url__ = Some(map_.next_value()?); } GeneratedField::CoverImageUrl => { if cover_image_url__.is_some() { return Err(serde::de::Error::duplicate_field("coverImageUrl")); } - cover_image_url__ = Some(map.next_value()?); + cover_image_url__ = Some(map_.next_value()?); } GeneratedField::Tags => { if tags__.is_some() { return Err(serde::de::Error::duplicate_field("tags")); } - tags__ = Some(map.next_value()?); + tags__ = Some(map_.next_value()?); } GeneratedField::AltNames => { if alt_names__.is_some() { return Err(serde::de::Error::duplicate_field("altNames")); } - alt_names__ = Some(map.next_value()?); + alt_names__ = Some(map_.next_value()?); } } } @@ -814,7 +812,7 @@ impl<'de> serde::Deserialize<'de> for AppInfoDetails { formatter.write_str("struct librarian.v1.AppInfoDetails") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -824,43 +822,43 @@ impl<'de> serde::Deserialize<'de> for AppInfoDetails { let mut publisher__ = None; let mut version__ = None; let mut image_urls__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::ReleaseDate => { if release_date__.is_some() { return Err(serde::de::Error::duplicate_field("releaseDate")); } - release_date__ = Some(map.next_value()?); + release_date__ = Some(map_.next_value()?); } GeneratedField::Developer => { if developer__.is_some() { return Err(serde::de::Error::duplicate_field("developer")); } - developer__ = Some(map.next_value()?); + developer__ = Some(map_.next_value()?); } GeneratedField::Publisher => { if publisher__.is_some() { return Err(serde::de::Error::duplicate_field("publisher")); } - publisher__ = Some(map.next_value()?); + publisher__ = Some(map_.next_value()?); } GeneratedField::Version => { if version__.is_some() { return Err(serde::de::Error::duplicate_field("version")); } - version__ = Some(map.next_value()?); + version__ = Some(map_.next_value()?); } GeneratedField::ImageUrls => { if image_urls__.is_some() { return Err(serde::de::Error::duplicate_field("imageUrls")); } - image_urls__ = Some(map.next_value()?); + image_urls__ = Some(map_.next_value()?); } } } @@ -964,32 +962,32 @@ impl<'de> serde::Deserialize<'de> for AppInfoId { formatter.write_str("struct librarian.v1.AppInfoID") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut internal__ = None; let mut source__ = None; let mut source_app_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Internal => { if internal__.is_some() { return Err(serde::de::Error::duplicate_field("internal")); } - internal__ = Some(map.next_value()?); + internal__ = Some(map_.next_value()?); } GeneratedField::Source => { if source__.is_some() { return Err(serde::de::Error::duplicate_field("source")); } - source__ = Some(map.next_value()?); + source__ = Some(map_.next_value()?); } GeneratedField::SourceAppId => { if source_app_id__.is_some() { return Err(serde::de::Error::duplicate_field("sourceAppId")); } - source_app_id__ = Some(map.next_value()?); + source_app_id__ = Some(map_.next_value()?); } } } @@ -1052,8 +1050,8 @@ impl serde::Serialize for AppInfoMixed { struct_ser.serialize_field("name", &self.name)?; } if self.r#type != 0 { - let v = AppType::from_i32(self.r#type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; + let v = AppType::try_from(self.r#type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.r#type)))?; struct_ser.serialize_field("type", &v)?; } if !self.short_description.is_empty() { @@ -1159,7 +1157,7 @@ impl<'de> serde::Deserialize<'de> for AppInfoMixed { formatter.write_str("struct librarian.v1.AppInfoMixed") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1173,67 +1171,67 @@ impl<'de> serde::Deserialize<'de> for AppInfoMixed { let mut cover_image_url__ = None; let mut tags__ = None; let mut alt_names__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Details => { if details__.is_some() { return Err(serde::de::Error::duplicate_field("details")); } - details__ = map.next_value()?; + details__ = map_.next_value()?; } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Type => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("type")); } - r#type__ = Some(map.next_value::()? as i32); + r#type__ = Some(map_.next_value::()? as i32); } GeneratedField::ShortDescription => { if short_description__.is_some() { return Err(serde::de::Error::duplicate_field("shortDescription")); } - short_description__ = Some(map.next_value()?); + short_description__ = Some(map_.next_value()?); } GeneratedField::IconImageUrl => { if icon_image_url__.is_some() { return Err(serde::de::Error::duplicate_field("iconImageUrl")); } - icon_image_url__ = Some(map.next_value()?); + icon_image_url__ = Some(map_.next_value()?); } GeneratedField::BackgroundImageUrl => { if background_image_url__.is_some() { return Err(serde::de::Error::duplicate_field("backgroundImageUrl")); } - background_image_url__ = Some(map.next_value()?); + background_image_url__ = Some(map_.next_value()?); } GeneratedField::CoverImageUrl => { if cover_image_url__.is_some() { return Err(serde::de::Error::duplicate_field("coverImageUrl")); } - cover_image_url__ = Some(map.next_value()?); + cover_image_url__ = Some(map_.next_value()?); } GeneratedField::Tags => { if tags__.is_some() { return Err(serde::de::Error::duplicate_field("tags")); } - tags__ = Some(map.next_value()?); + tags__ = Some(map_.next_value()?); } GeneratedField::AltNames => { if alt_names__.is_some() { return Err(serde::de::Error::duplicate_field("altNames")); } - alt_names__ = Some(map.next_value()?); + alt_names__ = Some(map_.next_value()?); } } } @@ -1291,10 +1289,9 @@ impl<'de> serde::Deserialize<'de> for AppType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(AppType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -1304,10 +1301,9 @@ impl<'de> serde::Deserialize<'de> for AppType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(AppType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -1442,7 +1438,7 @@ impl<'de> serde::Deserialize<'de> for FeatureFlag { formatter.write_str("struct librarian.v1.FeatureFlag") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1452,43 +1448,43 @@ impl<'de> serde::Deserialize<'de> for FeatureFlag { let mut description__ = None; let mut config_json_schema__ = None; let mut require_context__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = Some(map.next_value()?); + id__ = Some(map_.next_value()?); } GeneratedField::Region => { if region__.is_some() { return Err(serde::de::Error::duplicate_field("region")); } - region__ = Some(map.next_value()?); + region__ = Some(map_.next_value()?); } GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::ConfigJsonSchema => { if config_json_schema__.is_some() { return Err(serde::de::Error::duplicate_field("configJsonSchema")); } - config_json_schema__ = Some(map.next_value()?); + config_json_schema__ = Some(map_.next_value()?); } GeneratedField::RequireContext => { if require_context__.is_some() { return Err(serde::de::Error::duplicate_field("requireContext")); } - require_context__ = Some(map.next_value()?); + require_context__ = Some(map_.next_value()?); } } } @@ -1602,7 +1598,7 @@ impl<'de> serde::Deserialize<'de> for FeatureRequest { formatter.write_str("struct librarian.v1.FeatureRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1610,31 +1606,31 @@ impl<'de> serde::Deserialize<'de> for FeatureRequest { let mut region__ = None; let mut config_json__ = None; let mut context_id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = Some(map.next_value()?); + id__ = Some(map_.next_value()?); } GeneratedField::Region => { if region__.is_some() { return Err(serde::de::Error::duplicate_field("region")); } - region__ = Some(map.next_value()?); + region__ = Some(map_.next_value()?); } GeneratedField::ConfigJson => { if config_json__.is_some() { return Err(serde::de::Error::duplicate_field("configJson")); } - config_json__ = Some(map.next_value()?); + config_json__ = Some(map_.next_value()?); } GeneratedField::ContextId => { if context_id__.is_some() { return Err(serde::de::Error::duplicate_field("contextId")); } - context_id__ = map.next_value()?; + context_id__ = map_.next_value()?; } } } @@ -1780,7 +1776,7 @@ impl<'de> serde::Deserialize<'de> for Feed { formatter.write_str("struct librarian.v1.Feed") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -1792,55 +1788,55 @@ impl<'de> serde::Deserialize<'de> for Feed { let mut language__ = None; let mut image__ = None; let mut authors__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Title => { if title__.is_some() { return Err(serde::de::Error::duplicate_field("title")); } - title__ = Some(map.next_value()?); + title__ = Some(map_.next_value()?); } GeneratedField::Link => { if link__.is_some() { return Err(serde::de::Error::duplicate_field("link")); } - link__ = Some(map.next_value()?); + link__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Items => { if items__.is_some() { return Err(serde::de::Error::duplicate_field("items")); } - items__ = Some(map.next_value()?); + items__ = Some(map_.next_value()?); } GeneratedField::Language => { if language__.is_some() { return Err(serde::de::Error::duplicate_field("language")); } - language__ = Some(map.next_value()?); + language__ = Some(map_.next_value()?); } GeneratedField::Image => { if image__.is_some() { return Err(serde::de::Error::duplicate_field("image")); } - image__ = map.next_value()?; + image__ = map_.next_value()?; } GeneratedField::Authors => { if authors__.is_some() { return Err(serde::de::Error::duplicate_field("authors")); } - authors__ = Some(map.next_value()?); + authors__ = Some(map_.next_value()?); } } } @@ -1945,32 +1941,32 @@ impl<'de> serde::Deserialize<'de> for FeedEnclosure { formatter.write_str("struct librarian.v1.FeedEnclosure") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut url__ = None; let mut length__ = None; let mut r#type__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Url => { if url__.is_some() { return Err(serde::de::Error::duplicate_field("url")); } - url__ = Some(map.next_value()?); + url__ = Some(map_.next_value()?); } GeneratedField::Length => { if length__.is_some() { return Err(serde::de::Error::duplicate_field("length")); } - length__ = Some(map.next_value()?); + length__ = Some(map_.next_value()?); } GeneratedField::Type => { if r#type__.is_some() { return Err(serde::de::Error::duplicate_field("type")); } - r#type__ = Some(map.next_value()?); + r#type__ = Some(map_.next_value()?); } } } @@ -2061,25 +2057,25 @@ impl<'de> serde::Deserialize<'de> for FeedImage { formatter.write_str("struct librarian.v1.FeedImage") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut url__ = None; let mut title__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Url => { if url__.is_some() { return Err(serde::de::Error::duplicate_field("url")); } - url__ = Some(map.next_value()?); + url__ = Some(map_.next_value()?); } GeneratedField::Title => { if title__.is_some() { return Err(serde::de::Error::duplicate_field("title")); } - title__ = Some(map.next_value()?); + title__ = Some(map_.next_value()?); } } } @@ -2189,6 +2185,7 @@ impl serde::Serialize for FeedItem { struct_ser.serialize_field("publishPlatform", &self.publish_platform)?; } if self.read_count != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("readCount", ToString::to_string(&self.read_count).as_str())?; } struct_ser.end() @@ -2290,7 +2287,7 @@ impl<'de> serde::Deserialize<'de> for FeedItem { formatter.write_str("struct librarian.v1.FeedItem") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -2309,98 +2306,98 @@ impl<'de> serde::Deserialize<'de> for FeedItem { let mut enclosures__ = None; let mut publish_platform__ = None; let mut read_count__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } - id__ = map.next_value()?; + id__ = map_.next_value()?; } GeneratedField::Title => { if title__.is_some() { return Err(serde::de::Error::duplicate_field("title")); } - title__ = Some(map.next_value()?); + title__ = Some(map_.next_value()?); } GeneratedField::Authors => { if authors__.is_some() { return Err(serde::de::Error::duplicate_field("authors")); } - authors__ = Some(map.next_value()?); + authors__ = Some(map_.next_value()?); } GeneratedField::Description => { if description__.is_some() { return Err(serde::de::Error::duplicate_field("description")); } - description__ = Some(map.next_value()?); + description__ = Some(map_.next_value()?); } GeneratedField::Content => { if content__.is_some() { return Err(serde::de::Error::duplicate_field("content")); } - content__ = Some(map.next_value()?); + content__ = Some(map_.next_value()?); } GeneratedField::Guid => { if guid__.is_some() { return Err(serde::de::Error::duplicate_field("guid")); } - guid__ = Some(map.next_value()?); + guid__ = Some(map_.next_value()?); } GeneratedField::Link => { if link__.is_some() { return Err(serde::de::Error::duplicate_field("link")); } - link__ = Some(map.next_value()?); + link__ = Some(map_.next_value()?); } GeneratedField::Image => { if image__.is_some() { return Err(serde::de::Error::duplicate_field("image")); } - image__ = map.next_value()?; + image__ = map_.next_value()?; } GeneratedField::Published => { if published__.is_some() { return Err(serde::de::Error::duplicate_field("published")); } - published__ = Some(map.next_value()?); + published__ = Some(map_.next_value()?); } GeneratedField::PublishedParsed => { if published_parsed__.is_some() { return Err(serde::de::Error::duplicate_field("publishedParsed")); } - published_parsed__ = map.next_value()?; + published_parsed__ = map_.next_value()?; } GeneratedField::Updated => { if updated__.is_some() { return Err(serde::de::Error::duplicate_field("updated")); } - updated__ = Some(map.next_value()?); + updated__ = Some(map_.next_value()?); } GeneratedField::UpdatedParsed => { if updated_parsed__.is_some() { return Err(serde::de::Error::duplicate_field("updatedParsed")); } - updated_parsed__ = map.next_value()?; + updated_parsed__ = map_.next_value()?; } GeneratedField::Enclosures => { if enclosures__.is_some() { return Err(serde::de::Error::duplicate_field("enclosures")); } - enclosures__ = Some(map.next_value()?); + enclosures__ = Some(map_.next_value()?); } GeneratedField::PublishPlatform => { if publish_platform__.is_some() { return Err(serde::de::Error::duplicate_field("publishPlatform")); } - publish_platform__ = Some(map.next_value()?); + publish_platform__ = Some(map_.next_value()?); } GeneratedField::ReadCount => { if read_count__.is_some() { return Err(serde::de::Error::duplicate_field("readCount")); } read_count__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -2504,25 +2501,25 @@ impl<'de> serde::Deserialize<'de> for FeedPerson { formatter.write_str("struct librarian.v1.FeedPerson") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut name__ = None; let mut email__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Name => { if name__.is_some() { return Err(serde::de::Error::duplicate_field("name")); } - name__ = Some(map.next_value()?); + name__ = Some(map_.next_value()?); } GeneratedField::Email => { if email__.is_some() { return Err(serde::de::Error::duplicate_field("email")); } - email__ = Some(map.next_value()?); + email__ = Some(map_.next_value()?); } } } @@ -2548,6 +2545,7 @@ impl serde::Serialize for InternalId { } let mut struct_ser = serializer.serialize_struct("librarian.v1.InternalID", len)?; if self.id != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("id", ToString::to_string(&self.id).as_str())?; } struct_ser.end() @@ -2603,19 +2601,19 @@ impl<'de> serde::Deserialize<'de> for InternalId { formatter.write_str("struct librarian.v1.InternalID") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut id__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::Id => { if id__.is_some() { return Err(serde::de::Error::duplicate_field("id")); } id__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -2644,9 +2642,11 @@ impl serde::Serialize for PagingRequest { } let mut struct_ser = serializer.serialize_struct("librarian.v1.PagingRequest", len)?; if self.page_num != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("pageNum", ToString::to_string(&self.page_num).as_str())?; } if self.page_size != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("pageSize", ToString::to_string(&self.page_size).as_str())?; } struct_ser.end() @@ -2707,20 +2707,20 @@ impl<'de> serde::Deserialize<'de> for PagingRequest { formatter.write_str("struct librarian.v1.PagingRequest") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut page_num__ = None; let mut page_size__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::PageNum => { if page_num__.is_some() { return Err(serde::de::Error::duplicate_field("pageNum")); } page_num__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } GeneratedField::PageSize => { @@ -2728,7 +2728,7 @@ impl<'de> serde::Deserialize<'de> for PagingRequest { return Err(serde::de::Error::duplicate_field("pageSize")); } page_size__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -2755,6 +2755,7 @@ impl serde::Serialize for PagingResponse { } let mut struct_ser = serializer.serialize_struct("librarian.v1.PagingResponse", len)?; if self.total_size != 0 { + #[allow(clippy::needless_borrow)] struct_ser.serialize_field("totalSize", ToString::to_string(&self.total_size).as_str())?; } struct_ser.end() @@ -2811,19 +2812,19 @@ impl<'de> serde::Deserialize<'de> for PagingResponse { formatter.write_str("struct librarian.v1.PagingResponse") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut total_size__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::TotalSize => { if total_size__.is_some() { return Err(serde::de::Error::duplicate_field("totalSize")); } total_size__ = - Some(map.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } } @@ -2852,8 +2853,8 @@ impl serde::Serialize for TimeAggregation { } let mut struct_ser = serializer.serialize_struct("librarian.v1.TimeAggregation", len)?; if self.aggregation_type != 0 { - let v = time_aggregation::AggregationType::from_i32(self.aggregation_type) - .ok_or_else(|| serde::ser::Error::custom(format!("Invalid variant {}", self.aggregation_type)))?; + let v = time_aggregation::AggregationType::try_from(self.aggregation_type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.aggregation_type)))?; struct_ser.serialize_field("aggregationType", &v)?; } if let Some(v) = self.time_range.as_ref() { @@ -2917,25 +2918,25 @@ impl<'de> serde::Deserialize<'de> for TimeAggregation { formatter.write_str("struct librarian.v1.TimeAggregation") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut aggregation_type__ = None; let mut time_range__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::AggregationType => { if aggregation_type__.is_some() { return Err(serde::de::Error::duplicate_field("aggregationType")); } - aggregation_type__ = Some(map.next_value::()? as i32); + aggregation_type__ = Some(map_.next_value::()? as i32); } GeneratedField::TimeRange => { if time_range__.is_some() { return Err(serde::de::Error::duplicate_field("timeRange")); } - time_range__ = map.next_value()?; + time_range__ = map_.next_value()?; } } } @@ -2991,10 +2992,9 @@ impl<'de> serde::Deserialize<'de> for time_aggregation::AggregationType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(time_aggregation::AggregationType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -3004,10 +3004,9 @@ impl<'de> serde::Deserialize<'de> for time_aggregation::AggregationType { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(time_aggregation::AggregationType::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -3108,25 +3107,25 @@ impl<'de> serde::Deserialize<'de> for TimeRange { formatter.write_str("struct librarian.v1.TimeRange") } - fn visit_map(self, mut map: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { let mut start_time__ = None; let mut duration__ = None; - while let Some(k) = map.next_key()? { + while let Some(k) = map_.next_key()? { match k { GeneratedField::StartTime => { if start_time__.is_some() { return Err(serde::de::Error::duplicate_field("startTime")); } - start_time__ = map.next_value()?; + start_time__ = map_.next_value()?; } GeneratedField::Duration => { if duration__.is_some() { return Err(serde::de::Error::duplicate_field("duration")); } - duration__ = map.next_value()?; + duration__ = map_.next_value()?; } } } @@ -3176,10 +3175,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownAccountPlatform { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownAccountPlatform::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -3189,10 +3187,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownAccountPlatform { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownAccountPlatform::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -3253,10 +3250,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownAppInfoSource { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownAppInfoSource::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -3266,10 +3262,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownAppInfoSource { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownAppInfoSource::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -3330,10 +3325,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownFeedItemAction { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownFeedItemAction::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -3343,10 +3337,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownFeedItemAction { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownFeedItemAction::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -3404,10 +3397,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownFeedSource { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownFeedSource::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -3417,10 +3409,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownFeedSource { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownFeedSource::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) }) @@ -3477,10 +3468,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownNotifyDestination { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownNotifyDestination::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) }) @@ -3490,10 +3480,9 @@ impl<'de> serde::Deserialize<'de> for WellKnownNotifyDestination { where E: serde::de::Error, { - use std::convert::TryFrom; i32::try_from(v) .ok() - .and_then(WellKnownNotifyDestination::from_i32) + .and_then(|x| x.try_into().ok()) .ok_or_else(|| { serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) })