Skip to content

Commit 413da7a

Browse files
committed
chore: regenerate FromProto conversions
Regenerates prost conversion modules to qualify generated gaxi::prost::FromProto calls with their target model types, using the librarian change in googleapis/librarian qualify-fromproto. For googleapis#7284
1 parent 2dcced8 commit 413da7a

32 files changed

Lines changed: 6817 additions & 3357 deletions

File tree

‎src/bigquery/src/write/generated/convert/storage/convert.rs‎

Lines changed: 72 additions & 72 deletions
Large diffs are not rendered by default.

‎src/firestore/src/generated/convert/firestore/convert.rs‎

Lines changed: 209 additions & 209 deletions
Large diffs are not rendered by default.

‎src/gax-internal/src/generated/convert/protobuf/convert.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl gaxi::prost::FromProto<wkt::descriptor_proto::ExtensionRange> for descripto
3333
wkt::descriptor_proto::ExtensionRange::new()
3434
.set_start(self.start.unwrap_or_default())
3535
.set_end(self.end.unwrap_or_default())
36-
.set_or_clear_options(self.options.map(|v| v.cnv()).transpose()?)
36+
.set_or_clear_options(self.options.map(gaxi::prost::FromProto::<wkt::ExtensionRangeOptions>::cnv).transpose()?)
3737
)
3838
}
3939
}
@@ -102,20 +102,20 @@ impl gaxi::prost::FromProto<wkt::DescriptorProto> for DescriptorProto {
102102
Ok(
103103
wkt::DescriptorProto::new()
104104
.set_name(self.name.unwrap_or_default())
105-
.set_field(self.field.into_iter().map(|v| v.cnv())
105+
.set_field(self.field.into_iter().map(gaxi::prost::FromProto::<wkt::FieldDescriptorProto>::cnv)
106106
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
107-
.set_extension(self.extension.into_iter().map(|v| v.cnv())
107+
.set_extension(self.extension.into_iter().map(gaxi::prost::FromProto::<wkt::FieldDescriptorProto>::cnv)
108108
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
109-
.set_nested_type(self.nested_type.into_iter().map(|v| v.cnv())
109+
.set_nested_type(self.nested_type.into_iter().map(gaxi::prost::FromProto::<wkt::DescriptorProto>::cnv)
110110
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
111-
.set_enum_type(self.enum_type.into_iter().map(|v| v.cnv())
111+
.set_enum_type(self.enum_type.into_iter().map(gaxi::prost::FromProto::<wkt::EnumDescriptorProto>::cnv)
112112
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
113-
.set_extension_range(self.extension_range.into_iter().map(|v| v.cnv())
113+
.set_extension_range(self.extension_range.into_iter().map(gaxi::prost::FromProto::<wkt::descriptor_proto::ExtensionRange>::cnv)
114114
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
115-
.set_or_clear_options(self.options.map(|v| v.cnv()).transpose()?)
116-
.set_reserved_range(self.reserved_range.into_iter().map(|v| v.cnv())
115+
.set_or_clear_options(self.options.map(gaxi::prost::FromProto::<wkt::MessageOptions>::cnv).transpose()?)
116+
.set_reserved_range(self.reserved_range.into_iter().map(gaxi::prost::FromProto::<wkt::descriptor_proto::ReservedRange>::cnv)
117117
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
118-
.set_reserved_name(self.reserved_name.into_iter().map(|v| v.cnv())
118+
.set_reserved_name(self.reserved_name.into_iter().map(gaxi::prost::FromProto::<std::string::String>::cnv)
119119
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
120120
)
121121
}
@@ -182,7 +182,7 @@ impl gaxi::prost::FromProto<wkt::FieldDescriptorProto> for FieldDescriptorProto
182182
.set_extendee(self.extendee.unwrap_or_default())
183183
.set_default_value(self.default_value.unwrap_or_default())
184184
.set_json_name(self.json_name.unwrap_or_default())
185-
.set_or_clear_options(self.options.map(|v| v.cnv()).transpose()?)
185+
.set_or_clear_options(self.options.map(gaxi::prost::FromProto::<wkt::FieldOptions>::cnv).transpose()?)
186186
)
187187
}
188188
}
@@ -234,12 +234,12 @@ impl gaxi::prost::FromProto<wkt::EnumDescriptorProto> for EnumDescriptorProto {
234234
Ok(
235235
wkt::EnumDescriptorProto::new()
236236
.set_name(self.name.unwrap_or_default())
237-
.set_value(self.value.into_iter().map(|v| v.cnv())
237+
.set_value(self.value.into_iter().map(gaxi::prost::FromProto::<wkt::EnumValueDescriptorProto>::cnv)
238238
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
239-
.set_or_clear_options(self.options.map(|v| v.cnv()).transpose()?)
240-
.set_reserved_range(self.reserved_range.into_iter().map(|v| v.cnv())
239+
.set_or_clear_options(self.options.map(gaxi::prost::FromProto::<wkt::EnumOptions>::cnv).transpose()?)
240+
.set_reserved_range(self.reserved_range.into_iter().map(gaxi::prost::FromProto::<wkt::enum_descriptor_proto::EnumReservedRange>::cnv)
241241
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
242-
.set_reserved_name(self.reserved_name.into_iter().map(|v| v.cnv())
242+
.set_reserved_name(self.reserved_name.into_iter().map(gaxi::prost::FromProto::<std::string::String>::cnv)
243243
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
244244
)
245245
}
@@ -262,7 +262,7 @@ impl gaxi::prost::FromProto<wkt::EnumValueDescriptorProto> for EnumValueDescript
262262
wkt::EnumValueDescriptorProto::new()
263263
.set_name(self.name.unwrap_or_default())
264264
.set_number(self.number.unwrap_or_default())
265-
.set_or_clear_options(self.options.map(|v| v.cnv()).transpose()?)
265+
.set_or_clear_options(self.options.map(gaxi::prost::FromProto::<wkt::EnumValueOptions>::cnv).transpose()?)
266266
)
267267
}
268268
}

‎src/gax-internal/src/generated/convert/rpc/convert.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::ErrorInfo> for ErrorInfo {
4646
.set_domain(self.domain)
4747
.set_metadata(self.metadata.into_iter()
4848
.map(|(k, v)| {
49-
gaxi::prost::pair_transpose(k.cnv(), v.cnv())
49+
gaxi::prost::pair_transpose(gaxi::prost::FromProto::<std::string::String>::cnv(k), gaxi::prost::FromProto::<std::string::String>::cnv(v))
5050
}).collect::<std::result::Result<std::collections::HashMap<_, _>, _>>()?)
5151
)
5252
}
@@ -65,7 +65,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::RetryInfo> for RetryInfo {
6565
fn cnv(self) -> std::result::Result<google_cloud_rpc::model::RetryInfo, gaxi::prost::ConvertError> {
6666
Ok(
6767
google_cloud_rpc::model::RetryInfo::new()
68-
.set_or_clear_retry_delay(self.retry_delay.map(|v| v.cnv()).transpose()?)
68+
.set_or_clear_retry_delay(self.retry_delay.map(gaxi::prost::FromProto::<wkt::Duration>::cnv).transpose()?)
6969
)
7070
}
7171
}
@@ -87,7 +87,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::DebugInfo> for DebugInfo {
8787
fn cnv(self) -> std::result::Result<google_cloud_rpc::model::DebugInfo, gaxi::prost::ConvertError> {
8888
Ok(
8989
google_cloud_rpc::model::DebugInfo::new()
90-
.set_stack_entries(self.stack_entries.into_iter().map(|v| v.cnv())
90+
.set_stack_entries(self.stack_entries.into_iter().map(gaxi::prost::FromProto::<std::string::String>::cnv)
9191
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
9292
.set_detail(self.detail)
9393
)
@@ -125,10 +125,10 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::quota_failure::Violation> f
125125
.set_quota_id(self.quota_id)
126126
.set_quota_dimensions(self.quota_dimensions.into_iter()
127127
.map(|(k, v)| {
128-
gaxi::prost::pair_transpose(k.cnv(), v.cnv())
128+
gaxi::prost::pair_transpose(gaxi::prost::FromProto::<std::string::String>::cnv(k), gaxi::prost::FromProto::<std::string::String>::cnv(v))
129129
}).collect::<std::result::Result<std::collections::HashMap<_, _>, _>>()?)
130130
.set_quota_value(self.quota_value)
131-
.set_or_clear_future_quota_value(self.future_quota_value.map(|v| v.cnv()).transpose()?)
131+
.set_or_clear_future_quota_value(self.future_quota_value.map(gaxi::prost::FromProto::<i64>::cnv).transpose()?)
132132
)
133133
}
134134
}
@@ -149,7 +149,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::QuotaFailure> for QuotaFail
149149
fn cnv(self) -> std::result::Result<google_cloud_rpc::model::QuotaFailure, gaxi::prost::ConvertError> {
150150
Ok(
151151
google_cloud_rpc::model::QuotaFailure::new()
152-
.set_violations(self.violations.into_iter().map(|v| v.cnv())
152+
.set_violations(self.violations.into_iter().map(gaxi::prost::FromProto::<google_cloud_rpc::model::quota_failure::Violation>::cnv)
153153
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
154154
)
155155
}
@@ -193,7 +193,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::PreconditionFailure> for Pr
193193
fn cnv(self) -> std::result::Result<google_cloud_rpc::model::PreconditionFailure, gaxi::prost::ConvertError> {
194194
Ok(
195195
google_cloud_rpc::model::PreconditionFailure::new()
196-
.set_violations(self.violations.into_iter().map(|v| v.cnv())
196+
.set_violations(self.violations.into_iter().map(gaxi::prost::FromProto::<google_cloud_rpc::model::precondition_failure::Violation>::cnv)
197197
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
198198
)
199199
}
@@ -218,7 +218,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::bad_request::FieldViolation
218218
.set_field(self.field)
219219
.set_description(self.description)
220220
.set_reason(self.reason)
221-
.set_or_clear_localized_message(self.localized_message.map(|v| v.cnv()).transpose()?)
221+
.set_or_clear_localized_message(self.localized_message.map(gaxi::prost::FromProto::<google_cloud_rpc::model::LocalizedMessage>::cnv).transpose()?)
222222
)
223223
}
224224
}
@@ -239,7 +239,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::BadRequest> for BadRequest
239239
fn cnv(self) -> std::result::Result<google_cloud_rpc::model::BadRequest, gaxi::prost::ConvertError> {
240240
Ok(
241241
google_cloud_rpc::model::BadRequest::new()
242-
.set_field_violations(self.field_violations.into_iter().map(|v| v.cnv())
242+
.set_field_violations(self.field_violations.into_iter().map(gaxi::prost::FromProto::<google_cloud_rpc::model::bad_request::FieldViolation>::cnv)
243243
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
244244
)
245245
}
@@ -325,7 +325,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::Help> for Help {
325325
fn cnv(self) -> std::result::Result<google_cloud_rpc::model::Help, gaxi::prost::ConvertError> {
326326
Ok(
327327
google_cloud_rpc::model::Help::new()
328-
.set_links(self.links.into_iter().map(|v| v.cnv())
328+
.set_links(self.links.into_iter().map(gaxi::prost::FromProto::<google_cloud_rpc::model::help::Link>::cnv)
329329
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
330330
)
331331
}
@@ -372,7 +372,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::HttpRequest> for HttpReques
372372
google_cloud_rpc::model::HttpRequest::new()
373373
.set_method(self.method)
374374
.set_uri(self.uri)
375-
.set_headers(self.headers.into_iter().map(|v| v.cnv())
375+
.set_headers(self.headers.into_iter().map(gaxi::prost::FromProto::<google_cloud_rpc::model::HttpHeader>::cnv)
376376
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
377377
.set_body(self.body)
378378
)
@@ -400,7 +400,7 @@ impl gaxi::prost::FromProto<google_cloud_rpc::model::HttpResponse> for HttpRespo
400400
google_cloud_rpc::model::HttpResponse::new()
401401
.set_status(self.status)
402402
.set_reason(self.reason)
403-
.set_headers(self.headers.into_iter().map(|v| v.cnv())
403+
.set_headers(self.headers.into_iter().map(gaxi::prost::FromProto::<google_cloud_rpc::model::HttpHeader>::cnv)
404404
.collect::<std::result::Result<std::vec::Vec<_>, _>>()?)
405405
.set_body(self.body)
406406
)

0 commit comments

Comments
 (0)