Client Test

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/create_foo.rs

@@ -1,1 +40,49 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* OperationGenerator.kt:77 */
 /// Orchestration and serialization glue logic for `CreateFoo`.
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* OperationGenerator.kt:84 */
 pub struct CreateFoo;
 /* OperationGenerator.kt:85 */
 impl CreateFoo {
     /// Creates a new `CreateFoo`
     /// /* OperationGenerator.kt:86 */Creates a new `CreateFoo`
     /* OperationGenerator.kt:87 */
     pub fn new() -> Self {
         /* OperationGenerator.kt:88 */
         Self
         /* OperationGenerator.kt:87 */
-18
+    }
     /* OperationGenerator.kt:138 */
     pub(crate) async fn orchestrate(
         runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         input: crate::operation::create_foo::CreateFooInput,
     ) -> ::std::result::Result<
         crate::operation::create_foo::CreateFooOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::create_foo::CreateFooError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {

↧ Expand context

         let map_err = |err: ::aws_smithy_runtime_api::client::result::SdkError<
             ::aws_smithy_runtime_api::client::interceptors::context::Error,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >| {
             err.map_service_error(|err| {
                 err.downcast::<crate::operation::create_foo::CreateFooError>()
                     .expect("correct error type")
             })
         };
         let context = Self::orchestrate_with_stop_point(runtime_plugins, input, ::aws_smithy_runtime::client::orchestrator::StopPoint::None)
             .await
             .map_err(map_err)?;
         let output = context.finalize().map_err(map_err)?;
         ::std::result::Result::Ok(
             output
                 .downcast::<crate::operation::create_foo::CreateFooOutput>()
                 .expect("correct output type"),
-47
+        )
-48
+    }
-49

@@ -57,66 +327,398 @@

↥ Expand context

             .instrument(::tracing::debug_span!(
                 "Rest XML Protocol.CreateFoo",
                 "rpc.service" = "Rest XML Protocol",
                 "rpc.method" = "CreateFoo",
                 "sdk_invocation_id" = ::fastrand::u32(1_000_000..10_000_000),
             ))
             .await
-73
+    }
-74
     pub(crate) fn operation_runtime_plugins(
         client_runtime_plugins: ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         client_config: &crate::config::Config,
         config_override: ::std::option::Option<crate::config::Builder>,
     ) -> ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins {
         let mut runtime_plugins = client_runtime_plugins.with_operation_plugin(Self::new());
         runtime_plugins = runtime_plugins.with_client_plugin(crate::auth_plugin::DefaultAuthOptionsPlugin::new(vec![
             ::aws_smithy_runtime::client::auth::no_auth::NO_AUTH_SCHEME_ID,
         ]));
         if let ::std::option::Option::Some(config_override) = config_override {
             for plugin in config_override.runtime_plugins.iter().cloned() {

                 runtime_plugins = runtime_plugins.with_operation_plugin(plugin);
-87
+            }
             runtime_plugins = runtime_plugins.with_operation_plugin(crate::config::ConfigOverrideRuntimePlugin::new(
                 config_override,
                 client_config.config.clone(),
                 &client_config.runtime_components,
             ));
-93
+        }
         runtime_plugins
-95
+    }
     /* OperationGenerator.kt:85 */
-97
+}
 /* OperationRuntimePluginGenerator.kt:55 */
 impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin for CreateFoo {
     fn config(&self) -> ::std::option::Option<::aws_smithy_types::config_bag::FrozenLayer> {
         let mut cfg = ::aws_smithy_types::config_bag::Layer::new("CreateFoo");
-102
         cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedRequestSerializer::new(
             CreateFooRequestSerializer,
         ));
         cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedResponseDeserializer::new(
             CreateFooResponseDeserializer,
         ));
-109
         cfg.store_put(::aws_smithy_runtime_api::client::auth::AuthSchemeOptionResolverParams::new(
             ::aws_smithy_runtime_api::client::auth::static_resolver::StaticAuthSchemeOptionResolverParams::new(),
         ));
-113
         cfg.store_put(::aws_smithy_runtime_api::client::orchestrator::Metadata::new(
             "CreateFoo",
             "Rest XML Protocol",
         ));
-118
         ::std::option::Option::Some(cfg.freeze())
-120
+    }
-121
     fn runtime_components(
         &self,
         _: &::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,
     ) -> ::std::borrow::Cow<'_, ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder> {
         #[allow(unused_mut)]
         let mut rcb = ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder::new("CreateFoo")
             .with_interceptor(::aws_smithy_runtime::client::stalled_stream_protection::StalledStreamProtectionInterceptor::default())
             .with_interceptor(CreateFooEndpointParamsInterceptor)
             .with_retry_classifier(::aws_smithy_runtime::client::retries::classifiers::TransientErrorClassifier::<
                 crate::operation::create_foo::CreateFooError,
             >::new())
             .with_retry_classifier(::aws_smithy_runtime::client::retries::classifiers::ModeledAsRetryableClassifier::<
                 crate::operation::create_foo::CreateFooError,
             >::new());
-136
         ::std::borrow::Cow::Owned(rcb)
-138
+    }
-139
+}
-140
 /* ResponseDeserializerGenerator.kt:64 */
 #[derive(Debug)]
 struct CreateFooResponseDeserializer;
 impl ::aws_smithy_runtime_api::client::ser_de::DeserializeResponse for CreateFooResponseDeserializer {
     fn deserialize_nonstreaming(
         &self,
         response: &::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
     ) -> ::aws_smithy_runtime_api::client::interceptors::context::OutputOrError {
         let (success, status) = (response.status().is_success(), response.status().as_u16());
         let headers = response.headers();
         let body = response.body().bytes().expect("body loaded");
         #[allow(unused_mut)]
         let mut force_error = false;
-154
         let parse_result = if !success && status != 200 || force_error {
             crate::protocol_serde::shape_create_foo::de_create_foo_http_error(status, headers, body)
         } else {
             crate::protocol_serde::shape_create_foo::de_create_foo_http_response(status, headers, body)
         };
         crate::protocol_serde::type_erase_result(parse_result)
-161
+    }
-162
+}
 /* RequestSerializerGenerator.kt:67 */
 #[derive(Debug)]
 struct CreateFooRequestSerializer;
 impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for CreateFooRequestSerializer {
     #[allow(unused_mut, clippy::let_and_return, clippy::needless_borrow, clippy::useless_conversion)]
     fn serialize_input(
         &self,
         input: ::aws_smithy_runtime_api::client::interceptors::context::Input,
         _cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<::aws_smithy_runtime_api::client::orchestrator::HttpRequest, ::aws_smithy_runtime_api::box_error::BoxError> {
         let input = input.downcast::<crate::operation::create_foo::CreateFooInput>().expect("correct type");
         let _header_serialization_settings = _cfg
             .load::<crate::serialization_settings::HeaderSerializationSettings>()
             .cloned()
             .unwrap_or_default();
         let mut request_builder = {
             fn uri_base(
                 _input: &crate::operation::create_foo::CreateFooInput,
                 output: &mut ::std::string::String,
             ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
                 use ::std::fmt::Write as _;
                 ::std::write!(output, "/reused-input").expect("formatting should succeed");
                 ::std::result::Result::Ok(())
-186
+            }
             #[allow(clippy::unnecessary_wraps)]
             fn update_http_builder(
                 input: &crate::operation::create_foo::CreateFooInput,
                 builder: ::http::request::Builder,
             ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
                 let mut uri = ::std::string::String::new();
                 uri_base(input, &mut uri)?;
                 ::std::result::Result::Ok(builder.method("POST").uri(uri))
-195
+            }
             let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
             builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
             builder
         };
         let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_create_foo::ser_create_foo_op_input(&input)?);
         if let Some(content_length) = body.content_length() {
             let content_length = content_length.to_string();
             request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
-204
+        }
         ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
-206
+    }
-207
+}
 /* EndpointParamsInterceptorGenerator.kt:86 */
 #[derive(Debug)]
 struct CreateFooEndpointParamsInterceptor;
-211
 impl ::aws_smithy_runtime_api::client::interceptors::Intercept for CreateFooEndpointParamsInterceptor {
     fn name(&self) -> &'static str {
         "CreateFooEndpointParamsInterceptor"
-215
+    }
-216
     fn read_before_execution(
         &self,
         context: &::aws_smithy_runtime_api::client::interceptors::context::BeforeSerializationInterceptorContextRef<
             '_,
             ::aws_smithy_runtime_api::client::interceptors::context::Input,
             ::aws_smithy_runtime_api::client::interceptors::context::Output,
             ::aws_smithy_runtime_api::client::interceptors::context::Error,
         >,
         cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<(), ::aws_smithy_runtime_api::box_error::BoxError> {
         let _input = context
             .input()
             .downcast_ref::<CreateFooInput>()
             .ok_or("failed to downcast to CreateFooInput")?;
-231
         let params = crate::config::endpoint::Params::builder().build().map_err(|err| {
             ::aws_smithy_runtime_api::client::interceptors::error::ContextAttachedError::new("endpoint params could not be built", err)
         })?;
         cfg.interceptor_state()
             .store_put(::aws_smithy_runtime_api::client::endpoint::EndpointResolverParams::new(params));
         ::std::result::Result::Ok(())
-238
+    }
-239
+}
-240
 // The get_* functions below are generated from JMESPath expressions in the
 // operationContextParams trait. They target the operation's input shape.
-243
 /* OperationErrorGenerator.kt:79 */
 /// Error type for the `CreateFooError` operation.
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::fmt::Debug)]
 pub enum CreateFooError {
 pub /* OperationErrorGenerator.kt:81 */ enum CreateFooError {
     /* OperationErrorGenerator.kt:88 */
     /// An unexpected error occurred (e.g., invalid JSON returned by the service or an unknown error code).
     #[deprecated(note = "Matching `Unhandled` directly is not forwards compatible. Instead, match using a \
     variable wildcard pattern and check `.code()`:
-255
+     \
     &nbsp;&nbsp;&nbsp;`err if err.code() == Some(\"SpecificExceptionCode\") => { /* handle the error */ }`
-257
+     \
     See [`ProvideErrorMetadata`](#impl-ProvideErrorMetadata-for-CreateFooError) for what information is available for the error.")]
     Unhandled(crate::error::sealed_unhandled::Unhandled),
     /* OperationErrorGenerator.kt:81 */
-261
+}
 /* OperationErrorGenerator.kt:218 */
 impl CreateFooError {
     /* OperationErrorGenerator.kt:219 */
     /// Creates the `CreateFooError::Unhandled` variant from any error type.
     pub fn unhandled(
         err: impl ::std::convert::Into<::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>>,
     ) -> Self {
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source: err.into(),
             meta: ::std::default::Default::default(),
         })
-273
+    }
-274
     /// Creates the `CreateFooError::Unhandled` variant from an [`ErrorMetadata`](::aws_smithy_types::error::ErrorMetadata).
     pub fn generic(err: ::aws_smithy_types::error::ErrorMetadata) -> Self {
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source: err.clone().into(),
             meta: err,
         })
-281
+    }
     ///
     /// /* OperationErrorGenerator.kt:236 */
     /// Returns error metadata, which includes the error code, message,
     /// request ID, and potentially additional information.
     ///
     /* OperationErrorGenerator.kt:242 */
     pub fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
         /* OperationErrorGenerator.kt:243 */
         match self {
             Self::Unhandled(e) => &e.meta,
             /* OperationErrorGenerator.kt:251 */ Self::Unhandled(e) => &e.meta,
             /* OperationErrorGenerator.kt:243 */
-292
+        }
         /* OperationErrorGenerator.kt:242 */
-294
+    }
     /* OperationErrorGenerator.kt:218 */
-296
+}
 /* OperationErrorGenerator.kt:269 */
 impl ::std::error::Error for CreateFooError {
     /* OperationErrorGenerator.kt:270 */
     fn source(&self) -> ::std::option::Option<&(dyn ::std::error::Error + 'static)> {
         /* OperationErrorGenerator.kt:318 */
         match self {
             Self::Unhandled(_inner) => ::std::option::Option::Some(&*_inner.source),
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:279 */
                 ::std::option::Option::Some(&*_inner.source)
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-309
+        }
         /* OperationErrorGenerator.kt:270 */
-311
+    }
     /* OperationErrorGenerator.kt:269 */
-313
+}
 /* OperationErrorGenerator.kt:133 */
 impl ::std::fmt::Display for CreateFooError {
     /* OperationErrorGenerator.kt:134 */
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
         /* OperationErrorGenerator.kt:318 */
         match self {
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:139 */
                 if let ::std::option::Option::Some(code) = ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self) {
                     write!(f, "unhandled error ({code})")
                 } else {
                     f.write_str("unhandled error")
-327
+                }
--
+            }
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-330
+        }
         /* OperationErrorGenerator.kt:134 */
-332
+    }
     /* OperationErrorGenerator.kt:133 */
-334
+}
 /* OperationErrorGenerator.kt:182 */
 impl ::aws_smithy_types::retry::ProvideErrorKind for CreateFooError {
     /* OperationErrorGenerator.kt:186 */
     fn code(&self) -> ::std::option::Option<&str> {
         /* OperationErrorGenerator.kt:187 */
         ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
         /* OperationErrorGenerator.kt:186 */
-342
+    }
     /* OperationErrorGenerator.kt:190 */
     fn retryable_error_kind(&self) -> ::std::option::Option<::aws_smithy_types::retry::ErrorKind> {
         /* OperationErrorGenerator.kt:197 */
         ::std::option::Option::None
         /* OperationErrorGenerator.kt:190 */
-348
+    }
     /* OperationErrorGenerator.kt:182 */
-350
+}
 /* OperationErrorGenerator.kt:163 */
 impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for CreateFooError {
     /* OperationErrorGenerator.kt:164 */
     fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
         /* OperationErrorGenerator.kt:318 */
         match self {
             Self::Unhandled(_inner) => &_inner.meta,
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:168 */
                 &_inner.meta
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-363
+        }
         /* OperationErrorGenerator.kt:164 */
-365
+    }
     /* OperationErrorGenerator.kt:163 */
-367
+}
 /* OperationErrorGenerator.kt:109 */
 impl ::aws_smithy_runtime_api::client::result::CreateUnhandledError for CreateFooError {
     /* OperationErrorGenerator.kt:110 */
     fn create_unhandled_error(
         source: ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
         meta: ::std::option::Option<::aws_smithy_types::error::ErrorMetadata>,
     ) -> Self {
         /* OperationErrorGenerator.kt:121 */
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source,
             meta: meta.unwrap_or_default(),
         })
         /* OperationErrorGenerator.kt:110 */
-381
+    }
     /* OperationErrorGenerator.kt:109 */
-383
+}
-384
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::create_foo::_create_foo_output::CreateFooOutput;
-387
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::create_foo::_create_foo_input::CreateFooInput;
-390
 /* RustModule.kt:172 */
 mod _create_foo_input;
-393
 /* RustModule.kt:172 */
 mod _create_foo_output;
-396
 /// Builders
 /// /* CodegenDelegator.kt:51 */Builders
 pub mod builders;

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/create_foo/_create_foo_input.rs

@@ -1,1 +47,91 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* StructureGenerator.kt:197 */
 #[allow(missing_docs)] // documentation missing in model
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct CreateFooInput {
 pub /* StructureGenerator.kt:201 */ struct CreateFooInput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
     pub input: ::std::option::Option<crate::types::CreateFooInput>,
     /* StructureGenerator.kt:201 */
-13
+}
 /* StructureGenerator.kt:135 */
 impl CreateFooInput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn input(&self) -> ::std::option::Option<&crate::types::CreateFooInput> {
         /* StructureGenerator.kt:170 */
         self.input.as_ref()
         /* StructureGenerator.kt:166 */
-23
+    }
     /* StructureGenerator.kt:135 */
-25
+}
 /* ClientCodegenVisitor.kt:237 */
 impl CreateFooInput {
     /// Creates a new builder-style object to manufacture [`CreateFooInput`](crate::operation::create_foo::CreateFooInput).
     /// /* BuilderGenerator.kt:173 */Creates a new builder-style object to manufacture [`CreateFooInput`](crate::operation::create_foo::CreateFooInput).
     /* BuilderGenerator.kt:175 */
     pub fn builder() -> crate::operation::create_foo::builders::CreateFooInputBuilder {
         /* BuilderGenerator.kt:176 */
         crate::operation::create_foo::builders::CreateFooInputBuilder::default()
         /* BuilderGenerator.kt:175 */
-34
+    }
     /* ClientCodegenVisitor.kt:237 */
-36
+}
-37
 /// A builder for [`CreateFooInput`](crate::operation::create_foo::CreateFooInput).
 /// /* BuilderGenerator.kt:342 */A builder for [`CreateFooInput`](crate::operation::create_foo::CreateFooInput).
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* BuilderGenerator.kt:345 */
 pub struct CreateFooInputBuilder {
     pub(crate) input: ::std::option::Option<crate::types::CreateFooInput>,
     /* BuilderGenerator.kt:275 */ pub(crate) input: ::std::option::Option<crate::types::CreateFooInput>,
     /* BuilderGenerator.kt:345 */
-47
+}
 /* BuilderGenerator.kt:355 */
 impl CreateFooInputBuilder {
     /* BuilderGenerator.kt:286 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:291 */
     pub fn input(mut self, input: crate::types::CreateFooInput) -> Self {
         /* BuilderGenerator.kt:292 */
         self.input = ::std::option::Option::Some(input);
         /* BuilderGenerator.kt:293 */
         self
         /* BuilderGenerator.kt:291 */
-59
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_input(mut self, input: ::std::option::Option<crate::types::CreateFooInput>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.input = input;
         self
         /* BuilderGenerator.kt:314 */
-68
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_input(&self) -> &::std::option::Option<crate::types::CreateFooInput> {
         /* BuilderGenerator.kt:337 */
         &self.input
         /* BuilderGenerator.kt:336 */
-76
+    }
     /// Consumes the builder and constructs a [`CreateFooInput`](crate::operation::create_foo::CreateFooInput).
     /// /* BuilderGenerator.kt:240 */Consumes the builder and constructs a [`CreateFooInput`](crate::operation::create_foo::CreateFooInput).
     /* BuilderGenerator.kt:253 */
     pub fn build(self) -> ::std::result::Result<crate::operation::create_foo::CreateFooInput, ::aws_smithy_types::error::operation::BuildError> {
         ::std::result::Result::Ok(crate::operation::create_foo::CreateFooInput { input: self.input })
         /* BuilderGenerator.kt:254 */
         ::std::result::Result::Ok(
             /* BuilderGenerator.kt:477 */
             crate::operation::create_foo::CreateFooInput {
                 /* BuilderGenerator.kt:481 */ input: self.input,
                 /* BuilderGenerator.kt:477 */
             }, /* BuilderGenerator.kt:254 */
-+
+        )
         /* BuilderGenerator.kt:253 */
-89
+    }
     /* BuilderGenerator.kt:355 */
-91
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/create_foo/_create_foo_output.rs

@@ -1,1 +22,39 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* StructureGenerator.kt:197 */
 #[allow(missing_docs)] // documentation missing in model
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct CreateFooOutput {}
 pub /* StructureGenerator.kt:201 */ struct CreateFooOutput {/* StructureGenerator.kt:201 */}
 /* ClientCodegenVisitor.kt:237 */
 impl CreateFooOutput {
     /// Creates a new builder-style object to manufacture [`CreateFooOutput`](crate::operation::create_foo::CreateFooOutput).
     /// /* BuilderGenerator.kt:173 */Creates a new builder-style object to manufacture [`CreateFooOutput`](crate::operation::create_foo::CreateFooOutput).
     /* BuilderGenerator.kt:175 */
     pub fn builder() -> crate::operation::create_foo::builders::CreateFooOutputBuilder {
         /* BuilderGenerator.kt:176 */
         crate::operation::create_foo::builders::CreateFooOutputBuilder::default()
         /* BuilderGenerator.kt:175 */
-17
+    }
     /* ClientCodegenVisitor.kt:237 */
-19
+}
-20
 /// A builder for [`CreateFooOutput`](crate::operation::create_foo::CreateFooOutput).
 /// /* BuilderGenerator.kt:342 */A builder for [`CreateFooOutput`](crate::operation::create_foo::CreateFooOutput).
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 pub struct CreateFooOutputBuilder {}
 /* BuilderGenerator.kt:345 */
 pub struct CreateFooOutputBuilder {/* BuilderGenerator.kt:345 */}
 /* BuilderGenerator.kt:355 */
 impl CreateFooOutputBuilder {
     /// Consumes the builder and constructs a [`CreateFooOutput`](crate::operation::create_foo::CreateFooOutput).
     /// /* BuilderGenerator.kt:240 */Consumes the builder and constructs a [`CreateFooOutput`](crate::operation::create_foo::CreateFooOutput).
     /* BuilderGenerator.kt:253 */
     pub fn build(self) -> crate::operation::create_foo::CreateFooOutput {
         crate::operation::create_foo::CreateFooOutput {}
         /* BuilderGenerator.kt:477 */
         crate::operation::create_foo::CreateFooOutput {
         /* BuilderGenerator.kt:477 */}
         /* BuilderGenerator.kt:253 */
-37
+    }
     /* BuilderGenerator.kt:355 */
-39
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/create_foo/builders.rs

@@ -1,1 +119,137 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::create_foo::_create_foo_output::CreateFooOutputBuilder;
-4
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::create_foo::_create_foo_input::CreateFooInputBuilder;
-7
 /* FluentBuilderGenerator.kt:408 */
 impl crate::operation::create_foo::builders::CreateFooInputBuilder {
     /// Sends a request with this input using the given client.
     pub async fn send_with(
         self,
         client: &crate::Client,
     ) -> ::std::result::Result<
         crate::operation::create_foo::CreateFooOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::create_foo::CreateFooError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {
         let mut fluent_builder = client.create_foo();
         fluent_builder.inner = self;
         fluent_builder.send().await
-24
+    }
-25
+}
 /// Fluent builder constructing a request to `CreateFoo`.
 /// /* FluentBuilderGenerator.kt:129 */Fluent builder constructing a request to `CreateFoo`.
 ///
 /// This operation triggers a name collision between the synthetic `CreateFooInput` and `CreateFooInput`
 /// /* FluentBuilderGenerator.kt:130 */This operation triggers a name collision between the synthetic `CreateFooInput` and `CreateFooInput`
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::fmt::Debug)]
 /* FluentBuilderGenerator.kt:270 */
 pub struct CreateFooFluentBuilder {
     handle: ::std::sync::Arc<crate::client::Handle>,
     inner: crate::operation::create_foo::builders::CreateFooInputBuilder,
     config_override: ::std::option::Option<crate::config::Builder>,
-36
+}
 /* FluentBuilderGenerator.kt:381 */
 impl crate::client::customize::internal::CustomizableSend<crate::operation::create_foo::CreateFooOutput, crate::operation::create_foo::CreateFooError>
     for CreateFooFluentBuilder
-40
+{
     fn send(
         self,
         config_override: crate::config::Builder,
     ) -> crate::client::customize::internal::BoxFuture<
         crate::client::customize::internal::SendResult<crate::operation::create_foo::CreateFooOutput, crate::operation::create_foo::CreateFooError>,
     > {
         ::std::boxed::Box::pin(async move { self.config_override(config_override).send().await })
-48
+    }
-49
+}
 /* FluentBuilderGenerator.kt:282 */
 impl CreateFooFluentBuilder {
     /* FluentBuilderGenerator.kt:288 */
     /// Creates a new `CreateFooFluentBuilder`.
     pub(crate) fn new(handle: ::std::sync::Arc<crate::client::Handle>) -> Self {
         Self {
             handle,
             inner: ::std::default::Default::default(),
             config_override: ::std::option::Option::None,
-59
+        }
-60
+    }
     /* FluentBuilderGenerator.kt:301 */
     /// Access the CreateFoo as a reference.
     pub fn as_input(&self) -> &crate::operation::create_foo::builders::CreateFooInputBuilder {
         &self.inner
-65
+    }
     /* FluentBuilderGenerator.kt:145 */
     /// Sends the request and returns the response.
     ///
     /// If an error occurs, an `SdkError` will be returned with additional details that
     /// can be matched against.
     ///
     /// By default, any retryable failures will be retried twice. Retry behavior
     /// is configurable with the [RetryConfig](aws_smithy_types::retry::RetryConfig), which can be
     /// set when configuring the client.
     pub async fn send(
         self,
     ) -> ::std::result::Result<
         crate::operation::create_foo::CreateFooOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::create_foo::CreateFooError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {
         let input = self
             .inner
             .build()
             .map_err(::aws_smithy_runtime_api::client::result::SdkError::construction_failure)?;
         let runtime_plugins = crate::operation::create_foo::CreateFoo::operation_runtime_plugins(
             self.handle.runtime_plugins.clone(),
             &self.handle.conf,
             self.config_override,
         );
         crate::operation::create_foo::CreateFoo::orchestrate(&runtime_plugins, input).await
-94
+    }
-95
     /// Consumes this builder, creating a customizable operation that can be modified before being sent.
     pub fn customize(
         self,
     ) -> crate::client::customize::CustomizableOperation<
         crate::operation::create_foo::CreateFooOutput,
         crate::operation::create_foo::CreateFooError,
         Self,
     > {
         crate::client::customize::CustomizableOperation::new(self)
-105
+    }
     /* FluentBuilderGenerator.kt:315 */
     pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
         self.set_config_override(::std::option::Option::Some(config_override.into()));
         self
-110
+    }
-111
     pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
         self.config_override = config_override;
         self
-115
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn input(mut self, input: crate::types::CreateFooInput) -> Self {
         self.inner = self.inner.input(input);
         self
-122
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn set_input(mut self, input: ::std::option::Option<crate::types::CreateFooInput>) -> Self {
         self.inner = self.inner.set_input(input);
         self
-129
+    }
     /* FluentBuilderGenerator.kt:518 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:520 */
     pub fn get_input(&self) -> &::std::option::Option<crate::types::CreateFooInput> {
         self.inner.get_input()
-135
+    }
     /* FluentBuilderGenerator.kt:282 */
-137
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/enum_keys.rs

@@ -1,1 +40,49 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* OperationGenerator.kt:77 */
 /// Orchestration and serialization glue logic for `EnumKeys`.
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* OperationGenerator.kt:84 */
 pub struct EnumKeys;
 /* OperationGenerator.kt:85 */
 impl EnumKeys {
     /// Creates a new `EnumKeys`
     /// /* OperationGenerator.kt:86 */Creates a new `EnumKeys`
     /* OperationGenerator.kt:87 */
     pub fn new() -> Self {
         /* OperationGenerator.kt:88 */
         Self
         /* OperationGenerator.kt:87 */
-18
+    }
     /* OperationGenerator.kt:138 */
     pub(crate) async fn orchestrate(
         runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         input: crate::operation::enum_keys::EnumKeysInput,
     ) -> ::std::result::Result<
         crate::operation::enum_keys::EnumKeysOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::enum_keys::EnumKeysError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {

↧ Expand context

         let map_err =
             |err: ::aws_smithy_runtime_api::client::result::SdkError<
                 ::aws_smithy_runtime_api::client::interceptors::context::Error,
                 ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
             >| { err.map_service_error(|err| err.downcast::<crate::operation::enum_keys::EnumKeysError>().expect("correct error type")) };
         let context = Self::orchestrate_with_stop_point(runtime_plugins, input, ::aws_smithy_runtime::client::orchestrator::StopPoint::None)
             .await
             .map_err(map_err)?;
         let output = context.finalize().map_err(map_err)?;
         ::std::result::Result::Ok(
             output
                 .downcast::<crate::operation::enum_keys::EnumKeysOutput>()
                 .expect("correct output type"),
-43
+        )
-44
+    }
-45
     pub(crate) async fn orchestrate_with_stop_point(
         runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         input: crate::operation::enum_keys::EnumKeysInput,
         stop_point: ::aws_smithy_runtime::client::orchestrator::StopPoint,

@@ -53,62 +257,274 @@

↥ Expand context

             .instrument(::tracing::debug_span!(
                 "Rest XML Protocol.EnumKeys",
                 "rpc.service" = "Rest XML Protocol",
                 "rpc.method" = "EnumKeys",
                 "sdk_invocation_id" = ::fastrand::u32(1_000_000..10_000_000),
             ))
             .await
-69
+    }
-70
     pub(crate) fn operation_runtime_plugins(
         client_runtime_plugins: ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         client_config: &crate::config::Config,
         config_override: ::std::option::Option<crate::config::Builder>,
     ) -> ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins {
         let mut runtime_plugins = client_runtime_plugins.with_operation_plugin(Self::new());
         runtime_plugins = runtime_plugins.with_client_plugin(crate::auth_plugin::DefaultAuthOptionsPlugin::new(vec![
             ::aws_smithy_runtime::client::auth::no_auth::NO_AUTH_SCHEME_ID,
         ]));
         if let ::std::option::Option::Some(config_override) = config_override {
             for plugin in config_override.runtime_plugins.iter().cloned() {

                 runtime_plugins = runtime_plugins.with_operation_plugin(plugin);
-83
+            }
             runtime_plugins = runtime_plugins.with_operation_plugin(crate::config::ConfigOverrideRuntimePlugin::new(
                 config_override,
                 client_config.config.clone(),
                 &client_config.runtime_components,
             ));
-89
+        }
         runtime_plugins
-91
+    }
     /* OperationGenerator.kt:85 */
-93
+}
 /* OperationRuntimePluginGenerator.kt:55 */
 impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin for EnumKeys {
     fn config(&self) -> ::std::option::Option<::aws_smithy_types::config_bag::FrozenLayer> {
         let mut cfg = ::aws_smithy_types::config_bag::Layer::new("EnumKeys");
-98
         cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedRequestSerializer::new(
             EnumKeysRequestSerializer,
         ));
         cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedResponseDeserializer::new(
             EnumKeysResponseDeserializer,
         ));
-105
         cfg.store_put(::aws_smithy_runtime_api::client::auth::AuthSchemeOptionResolverParams::new(
             ::aws_smithy_runtime_api::client::auth::static_resolver::StaticAuthSchemeOptionResolverParams::new(),
         ));
-109
         cfg.store_put(::aws_smithy_runtime_api::client::orchestrator::Metadata::new(
             "EnumKeys",
             "Rest XML Protocol",
         ));
-114
         ::std::option::Option::Some(cfg.freeze())
-116
+    }
-117
     fn runtime_components(
         &self,
         _: &::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,
     ) -> ::std::borrow::Cow<'_, ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder> {
         #[allow(unused_mut)]
         let mut rcb = ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder::new("EnumKeys")
             .with_interceptor(::aws_smithy_runtime::client::stalled_stream_protection::StalledStreamProtectionInterceptor::default())
             .with_interceptor(EnumKeysEndpointParamsInterceptor)
             .with_retry_classifier(::aws_smithy_runtime::client::retries::classifiers::TransientErrorClassifier::<
                 crate::operation::enum_keys::EnumKeysError,
             >::new())
             .with_retry_classifier(::aws_smithy_runtime::client::retries::classifiers::ModeledAsRetryableClassifier::<
                 crate::operation::enum_keys::EnumKeysError,
             >::new());
-132
         ::std::borrow::Cow::Owned(rcb)
-134
+    }
-135
+}
-136
 /* ResponseDeserializerGenerator.kt:64 */
 #[derive(Debug)]
 struct EnumKeysResponseDeserializer;
 impl ::aws_smithy_runtime_api::client::ser_de::DeserializeResponse for EnumKeysResponseDeserializer {
     fn deserialize_nonstreaming(
         &self,
         response: &::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
     ) -> ::aws_smithy_runtime_api::client::interceptors::context::OutputOrError {
         let (success, status) = (response.status().is_success(), response.status().as_u16());
         let headers = response.headers();
         let body = response.body().bytes().expect("body loaded");
         #[allow(unused_mut)]
         let mut force_error = false;
-150
         let parse_result = if !success && status != 200 || force_error {
             crate::protocol_serde::shape_enum_keys::de_enum_keys_http_error(status, headers, body)
         } else {
             crate::protocol_serde::shape_enum_keys::de_enum_keys_http_response(status, headers, body)
         };
         crate::protocol_serde::type_erase_result(parse_result)
-157
+    }
-158
+}
 /* RequestSerializerGenerator.kt:67 */
 #[derive(Debug)]
 struct EnumKeysRequestSerializer;
 impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for EnumKeysRequestSerializer {
     #[allow(unused_mut, clippy::let_and_return, clippy::needless_borrow, clippy::useless_conversion)]
     fn serialize_input(
         &self,
         input: ::aws_smithy_runtime_api::client::interceptors::context::Input,
         _cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<::aws_smithy_runtime_api::client::orchestrator::HttpRequest, ::aws_smithy_runtime_api::box_error::BoxError> {
         let input = input.downcast::<crate::operation::enum_keys::EnumKeysInput>().expect("correct type");
         let _header_serialization_settings = _cfg
             .load::<crate::serialization_settings::HeaderSerializationSettings>()
             .cloned()
             .unwrap_or_default();
         let mut request_builder = {
             fn uri_base(
                 _input: &crate::operation::enum_keys::EnumKeysInput,
                 output: &mut ::std::string::String,
             ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
                 use ::std::fmt::Write as _;
                 ::std::write!(output, "/enumkeys").expect("formatting should succeed");
                 ::std::result::Result::Ok(())
-182
+            }
             #[allow(clippy::unnecessary_wraps)]
             fn update_http_builder(
                 input: &crate::operation::enum_keys::EnumKeysInput,
                 builder: ::http::request::Builder,
             ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
                 let mut uri = ::std::string::String::new();
                 uri_base(input, &mut uri)?;
                 ::std::result::Result::Ok(builder.method("POST").uri(uri))
-191
+            }
             let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
             builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
             builder
         };
         let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_enum_keys::ser_enum_keys_op_input(&input)?);
         if let Some(content_length) = body.content_length() {
             let content_length = content_length.to_string();
             request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
-200
+        }
         ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
-202
+    }
-203
+}
 /* EndpointParamsInterceptorGenerator.kt:86 */
 #[derive(Debug)]
 struct EnumKeysEndpointParamsInterceptor;
-207
 impl ::aws_smithy_runtime_api::client::interceptors::Intercept for EnumKeysEndpointParamsInterceptor {
     fn name(&self) -> &'static str {
         "EnumKeysEndpointParamsInterceptor"
-211
+    }
-212
     fn read_before_execution(
         &self,
         context: &::aws_smithy_runtime_api::client::interceptors::context::BeforeSerializationInterceptorContextRef<
             '_,
             ::aws_smithy_runtime_api::client::interceptors::context::Input,
             ::aws_smithy_runtime_api::client::interceptors::context::Output,
             ::aws_smithy_runtime_api::client::interceptors::context::Error,
         >,
         cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<(), ::aws_smithy_runtime_api::box_error::BoxError> {
         let _input = context
             .input()
             .downcast_ref::<EnumKeysInput>()
             .ok_or("failed to downcast to EnumKeysInput")?;
-227
         let params = crate::config::endpoint::Params::builder().build().map_err(|err| {
             ::aws_smithy_runtime_api::client::interceptors::error::ContextAttachedError::new("endpoint params could not be built", err)
         })?;
         cfg.interceptor_state()
             .store_put(::aws_smithy_runtime_api::client::endpoint::EndpointResolverParams::new(params));
         ::std::result::Result::Ok(())
-234
+    }
-235
+}
-236
 // The get_* functions below are generated from JMESPath expressions in the
 // operationContextParams trait. They target the operation's input shape.
-239
 /* RustType.kt:516 */
 #[allow(unreachable_code, unused_variables)]
 /* RustType.kt:516 */
 #[cfg(test)]
 /* ProtocolTestGenerator.kt:98 */
 mod enum_keys_test {
-246
     /// Test ID: SerEnumMap
     #[::tokio::test]
     #[::tracing_test::traced_test]
     async fn ser_enum_map_request() {
         let (http_client, request_receiver) = ::aws_smithy_http_client::test_util::capture_request(None);
         let config_builder = crate::config::Config::builder().with_test_defaults().endpoint_url("https://example.com");
-253
         let client = crate::Client::from_conf(config_builder.http_client(http_client).build());

↧ Expand context

         let result = client
             .enum_keys()
             .set_data(::std::option::Option::Some({
                 let mut ret = ::std::collections::HashMap::new();
                 ret.insert(
                     "enumvalue".parse::<crate::types::StringEnum>().expect("static value validated to member"),
                     "hello".to_owned(),
                 );
                 ret
             }))
             .send()
             .await;
         let _ = dbg!(result);
         let http_request = request_receiver.expect_request();
         let body = http_request.body().bytes().expect("body should be strict");
         ::aws_smithy_protocol_test::assert_ok(::aws_smithy_protocol_test::validate_body(
             body,
             "<XmlMapEnumKeys><data><entry><key>enumvalue</key><value>hello</value></entry></data></XmlMapEnumKeys>",
             ::aws_smithy_protocol_test::MediaType::from("application/xml"),
         ));

@@ -280,297 +409,485 @@

↥ Expand context

                     "<XmlMapEnumKeys><data><entry><key>enumvalue</key><value>hello</value></entry></data></XmlMapEnumKeys>",
                 ))
                 .unwrap(),
-300
+        )
         .unwrap();
         use ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin;
         use ::aws_smithy_runtime_api::client::ser_de::DeserializeResponse;
-304
         let op = crate::operation::enum_keys::EnumKeys::new();
         let config = op.config().expect("the operation has config");
         let de = config
             .load::<::aws_smithy_runtime_api::client::ser_de::SharedResponseDeserializer>()
             .expect("the config must have a deserializer");
-310
         let parsed = de.deserialize_streaming(&mut http_response);
         let parsed = parsed.unwrap_or_else(|| {
             let http_response = http_response.map(|body| {
                 ::aws_smithy_types::body::SdkBody::from(::bytes::Bytes::copy_from_slice(&::aws_smithy_protocol_test::decode_body_data(
                     body.bytes().unwrap(),
                     ::aws_smithy_protocol_test::MediaType::from("application/xml"),

                 )))
             });
             de.deserialize_nonstreaming(&http_response)
         });
         let parsed = parsed
             .expect("should be successful response")
             .downcast::<crate::operation::enum_keys::EnumKeysOutput>()
             .unwrap();
         ::pretty_assertions::assert_eq!(parsed.data, expected_output.data, "Unexpected value for `data`");
-326
+    }
-+
     /* ProtocolTestGenerator.kt:98 */
-329
+}
-330
 /* OperationErrorGenerator.kt:79 */
 /// Error type for the `EnumKeysError` operation.
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::fmt::Debug)]
 pub enum EnumKeysError {
 pub /* OperationErrorGenerator.kt:81 */ enum EnumKeysError {
     /* OperationErrorGenerator.kt:88 */
     /// An unexpected error occurred (e.g., invalid JSON returned by the service or an unknown error code).
     #[deprecated(note = "Matching `Unhandled` directly is not forwards compatible. Instead, match using a \
     variable wildcard pattern and check `.code()`:
-342
+     \
     &nbsp;&nbsp;&nbsp;`err if err.code() == Some(\"SpecificExceptionCode\") => { /* handle the error */ }`
-344
+     \
     See [`ProvideErrorMetadata`](#impl-ProvideErrorMetadata-for-EnumKeysError) for what information is available for the error.")]
     Unhandled(crate::error::sealed_unhandled::Unhandled),
     /* OperationErrorGenerator.kt:81 */
-348
+}
 /* OperationErrorGenerator.kt:218 */
 impl EnumKeysError {
     /* OperationErrorGenerator.kt:219 */
     /// Creates the `EnumKeysError::Unhandled` variant from any error type.
     pub fn unhandled(
         err: impl ::std::convert::Into<::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>>,
     ) -> Self {
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source: err.into(),
             meta: ::std::default::Default::default(),
         })
-360
+    }
-361
     /// Creates the `EnumKeysError::Unhandled` variant from an [`ErrorMetadata`](::aws_smithy_types::error::ErrorMetadata).
     pub fn generic(err: ::aws_smithy_types::error::ErrorMetadata) -> Self {
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source: err.clone().into(),
             meta: err,
         })
-368
+    }
     ///
     /// /* OperationErrorGenerator.kt:236 */
     /// Returns error metadata, which includes the error code, message,
     /// request ID, and potentially additional information.
     ///
     /* OperationErrorGenerator.kt:242 */
     pub fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
         /* OperationErrorGenerator.kt:243 */
         match self {
             Self::Unhandled(e) => &e.meta,
             /* OperationErrorGenerator.kt:251 */ Self::Unhandled(e) => &e.meta,
             /* OperationErrorGenerator.kt:243 */
-379
+        }
         /* OperationErrorGenerator.kt:242 */
-381
+    }
     /* OperationErrorGenerator.kt:218 */
-383
+}
 /* OperationErrorGenerator.kt:269 */
 impl ::std::error::Error for EnumKeysError {
     /* OperationErrorGenerator.kt:270 */
     fn source(&self) -> ::std::option::Option<&(dyn ::std::error::Error + 'static)> {
         /* OperationErrorGenerator.kt:318 */
         match self {
             Self::Unhandled(_inner) => ::std::option::Option::Some(&*_inner.source),
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:279 */
                 ::std::option::Option::Some(&*_inner.source)
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-396
+        }
         /* OperationErrorGenerator.kt:270 */
-398
+    }
     /* OperationErrorGenerator.kt:269 */
-400
+}
 /* OperationErrorGenerator.kt:133 */
 impl ::std::fmt::Display for EnumKeysError {
     /* OperationErrorGenerator.kt:134 */
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
         /* OperationErrorGenerator.kt:318 */
         match self {
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:139 */
                 if let ::std::option::Option::Some(code) = ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self) {
                     write!(f, "unhandled error ({code})")
                 } else {
                     f.write_str("unhandled error")
-414
+                }
--
+            }
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-417
+        }
         /* OperationErrorGenerator.kt:134 */
-419
+    }
     /* OperationErrorGenerator.kt:133 */
-421
+}
 /* OperationErrorGenerator.kt:182 */
 impl ::aws_smithy_types::retry::ProvideErrorKind for EnumKeysError {
     /* OperationErrorGenerator.kt:186 */
     fn code(&self) -> ::std::option::Option<&str> {
         /* OperationErrorGenerator.kt:187 */
         ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
         /* OperationErrorGenerator.kt:186 */
-429
+    }
     /* OperationErrorGenerator.kt:190 */
     fn retryable_error_kind(&self) -> ::std::option::Option<::aws_smithy_types::retry::ErrorKind> {
         /* OperationErrorGenerator.kt:197 */
         ::std::option::Option::None
         /* OperationErrorGenerator.kt:190 */
-435
+    }
     /* OperationErrorGenerator.kt:182 */
-437
+}
 /* OperationErrorGenerator.kt:163 */
 impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for EnumKeysError {
     /* OperationErrorGenerator.kt:164 */
     fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
         /* OperationErrorGenerator.kt:318 */
         match self {
             Self::Unhandled(_inner) => &_inner.meta,
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:168 */
                 &_inner.meta
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-450
+        }
         /* OperationErrorGenerator.kt:164 */
-452
+    }
     /* OperationErrorGenerator.kt:163 */
-454
+}
 /* OperationErrorGenerator.kt:109 */
 impl ::aws_smithy_runtime_api::client::result::CreateUnhandledError for EnumKeysError {
     /* OperationErrorGenerator.kt:110 */
     fn create_unhandled_error(
         source: ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
         meta: ::std::option::Option<::aws_smithy_types::error::ErrorMetadata>,
     ) -> Self {
         /* OperationErrorGenerator.kt:121 */
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source,
             meta: meta.unwrap_or_default(),
         })
         /* OperationErrorGenerator.kt:110 */
-468
+    }
     /* OperationErrorGenerator.kt:109 */
-470
+}
-471
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::enum_keys::_enum_keys_output::EnumKeysOutput;
-474
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::enum_keys::_enum_keys_input::EnumKeysInput;
-477
 /* RustModule.kt:172 */
 mod _enum_keys_input;
-480
 /* RustModule.kt:172 */
 mod _enum_keys_output;
-483
 /// Builders
 /// /* CodegenDelegator.kt:51 */Builders
 pub mod builders;

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/enum_keys/_enum_keys_input.rs

@@ -1,1 +52,97 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* StructureGenerator.kt:197 */
 #[allow(missing_docs)] // documentation missing in model
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct EnumKeysInput {
 pub /* StructureGenerator.kt:201 */ struct EnumKeysInput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
     pub data: ::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>>,
     /* StructureGenerator.kt:201 */
-13
+}
 /* StructureGenerator.kt:135 */
 impl EnumKeysInput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn data(&self) -> ::std::option::Option<&::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>> {
         /* StructureGenerator.kt:170 */
         self.data.as_ref()
         /* StructureGenerator.kt:166 */
-23
+    }
     /* StructureGenerator.kt:135 */
-25
+}
 /* ClientCodegenVisitor.kt:237 */
 impl EnumKeysInput {
     /// Creates a new builder-style object to manufacture [`EnumKeysInput`](crate::operation::enum_keys::EnumKeysInput).
     /// /* BuilderGenerator.kt:173 */Creates a new builder-style object to manufacture [`EnumKeysInput`](crate::operation::enum_keys::EnumKeysInput).
     /* BuilderGenerator.kt:175 */
     pub fn builder() -> crate::operation::enum_keys::builders::EnumKeysInputBuilder {
         /* BuilderGenerator.kt:176 */
         crate::operation::enum_keys::builders::EnumKeysInputBuilder::default()
         /* BuilderGenerator.kt:175 */
-34
+    }
     /* ClientCodegenVisitor.kt:237 */
-36
+}
-37
 /// A builder for [`EnumKeysInput`](crate::operation::enum_keys::EnumKeysInput).
 /// /* BuilderGenerator.kt:342 */A builder for [`EnumKeysInput`](crate::operation::enum_keys::EnumKeysInput).
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* BuilderGenerator.kt:345 */
 pub struct EnumKeysInputBuilder {
     /* BuilderGenerator.kt:275 */
     pub(crate) data: ::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>>,
     /* BuilderGenerator.kt:345 */
-48
+}
 /* BuilderGenerator.kt:355 */
 impl EnumKeysInputBuilder {
     /// Adds a key-value pair to `data`.
     /// /* BuilderGenerator.kt:436 */Adds a key-value pair to `data`.
     /* BuilderGenerator.kt:437 */
     ///
     /// To override the contents of this collection use [`set_data`](Self::set_data).
     /// /* BuilderGenerator.kt:438 */To override the contents of this collection use [`set_data`](Self::set_data).
     /* BuilderGenerator.kt:439 */
     ///
     /* BuilderGenerator.kt:445 */
     pub fn data(mut self, k: crate::types::StringEnum, v: impl ::std::convert::Into<::std::string::String>) -> Self {
         /* BuilderGenerator.kt:448 */
         let mut hash_map = self.data.unwrap_or_default();
         hash_map.insert(k, v.into());
         self.data = ::std::option::Option::Some(hash_map);
         self
         /* BuilderGenerator.kt:445 */
-65
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_data(mut self, input: ::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.data = input;
         self
         /* BuilderGenerator.kt:314 */
-74
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_data(&self) -> &::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>> {
         /* BuilderGenerator.kt:337 */
         &self.data
         /* BuilderGenerator.kt:336 */
-82
+    }
     /// Consumes the builder and constructs a [`EnumKeysInput`](crate::operation::enum_keys::EnumKeysInput).
     /// /* BuilderGenerator.kt:240 */Consumes the builder and constructs a [`EnumKeysInput`](crate::operation::enum_keys::EnumKeysInput).
     /* BuilderGenerator.kt:253 */
     pub fn build(self) -> ::std::result::Result<crate::operation::enum_keys::EnumKeysInput, ::aws_smithy_types::error::operation::BuildError> {
         ::std::result::Result::Ok(crate::operation::enum_keys::EnumKeysInput { data: self.data })
         /* BuilderGenerator.kt:254 */
         ::std::result::Result::Ok(
             /* BuilderGenerator.kt:477 */
             crate::operation::enum_keys::EnumKeysInput {
                 /* BuilderGenerator.kt:481 */ data: self.data,
                 /* BuilderGenerator.kt:477 */
             }, /* BuilderGenerator.kt:254 */
-+
+        )
         /* BuilderGenerator.kt:253 */
-95
+    }
     /* BuilderGenerator.kt:355 */
-97
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/enum_keys/_enum_keys_output.rs

@@ -1,1 +52,94 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* StructureGenerator.kt:197 */
 #[allow(missing_docs)] // documentation missing in model
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct EnumKeysOutput {
 pub /* StructureGenerator.kt:201 */ struct EnumKeysOutput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
     pub data: ::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>>,
     /* StructureGenerator.kt:201 */
-13
+}
 /* StructureGenerator.kt:135 */
 impl EnumKeysOutput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn data(&self) -> ::std::option::Option<&::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>> {
         /* StructureGenerator.kt:170 */
         self.data.as_ref()
         /* StructureGenerator.kt:166 */
-23
+    }
     /* StructureGenerator.kt:135 */
-25
+}
 /* ClientCodegenVisitor.kt:237 */
 impl EnumKeysOutput {
     /// Creates a new builder-style object to manufacture [`EnumKeysOutput`](crate::operation::enum_keys::EnumKeysOutput).
     /// /* BuilderGenerator.kt:173 */Creates a new builder-style object to manufacture [`EnumKeysOutput`](crate::operation::enum_keys::EnumKeysOutput).
     /* BuilderGenerator.kt:175 */
     pub fn builder() -> crate::operation::enum_keys::builders::EnumKeysOutputBuilder {
         /* BuilderGenerator.kt:176 */
         crate::operation::enum_keys::builders::EnumKeysOutputBuilder::default()
         /* BuilderGenerator.kt:175 */
-34
+    }
     /* ClientCodegenVisitor.kt:237 */
-36
+}
-37
 /// A builder for [`EnumKeysOutput`](crate::operation::enum_keys::EnumKeysOutput).
 /// /* BuilderGenerator.kt:342 */A builder for [`EnumKeysOutput`](crate::operation::enum_keys::EnumKeysOutput).
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* BuilderGenerator.kt:345 */
 pub struct EnumKeysOutputBuilder {
     /* BuilderGenerator.kt:275 */
     pub(crate) data: ::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>>,
     /* BuilderGenerator.kt:345 */
-48
+}
 /* BuilderGenerator.kt:355 */
 impl EnumKeysOutputBuilder {
     /// Adds a key-value pair to `data`.
     /// /* BuilderGenerator.kt:436 */Adds a key-value pair to `data`.
     /* BuilderGenerator.kt:437 */
     ///
     /// To override the contents of this collection use [`set_data`](Self::set_data).
     /// /* BuilderGenerator.kt:438 */To override the contents of this collection use [`set_data`](Self::set_data).
     /* BuilderGenerator.kt:439 */
     ///
     /* BuilderGenerator.kt:445 */
     pub fn data(mut self, k: crate::types::StringEnum, v: impl ::std::convert::Into<::std::string::String>) -> Self {
         /* BuilderGenerator.kt:448 */
         let mut hash_map = self.data.unwrap_or_default();
         hash_map.insert(k, v.into());
         self.data = ::std::option::Option::Some(hash_map);
         self
         /* BuilderGenerator.kt:445 */
-65
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_data(mut self, input: ::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.data = input;
         self
         /* BuilderGenerator.kt:314 */
-74
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_data(&self) -> &::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>> {
         /* BuilderGenerator.kt:337 */
         &self.data
         /* BuilderGenerator.kt:336 */
-82
+    }
     /// Consumes the builder and constructs a [`EnumKeysOutput`](crate::operation::enum_keys::EnumKeysOutput).
     /// /* BuilderGenerator.kt:240 */Consumes the builder and constructs a [`EnumKeysOutput`](crate::operation::enum_keys::EnumKeysOutput).
     /* BuilderGenerator.kt:253 */
     pub fn build(self) -> crate::operation::enum_keys::EnumKeysOutput {
         crate::operation::enum_keys::EnumKeysOutput { data: self.data }
         /* BuilderGenerator.kt:477 */
         crate::operation::enum_keys::EnumKeysOutput {
             /* BuilderGenerator.kt:481 */ data: self.data,
             /* BuilderGenerator.kt:477 */
-+
+        }
         /* BuilderGenerator.kt:253 */
-92
+    }
     /* BuilderGenerator.kt:355 */
-94
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/enum_keys/builders.rs

@@ -1,1 +120,138 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::enum_keys::_enum_keys_output::EnumKeysOutputBuilder;
-4
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::enum_keys::_enum_keys_input::EnumKeysInputBuilder;
-7
 /* FluentBuilderGenerator.kt:408 */
 impl crate::operation::enum_keys::builders::EnumKeysInputBuilder {
     /// Sends a request with this input using the given client.
     pub async fn send_with(
         self,
         client: &crate::Client,
     ) -> ::std::result::Result<
         crate::operation::enum_keys::EnumKeysOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::enum_keys::EnumKeysError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {
         let mut fluent_builder = client.enum_keys();
         fluent_builder.inner = self;
         fluent_builder.send().await
-24
+    }
-25
+}
 /// Fluent builder constructing a request to `EnumKeys`.
 /// /* FluentBuilderGenerator.kt:129 */Fluent builder constructing a request to `EnumKeys`.
 ///
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::fmt::Debug)]
 /* FluentBuilderGenerator.kt:270 */
 pub struct EnumKeysFluentBuilder {
     handle: ::std::sync::Arc<crate::client::Handle>,
     inner: crate::operation::enum_keys::builders::EnumKeysInputBuilder,
     config_override: ::std::option::Option<crate::config::Builder>,
-35
+}
 /* FluentBuilderGenerator.kt:381 */
 impl crate::client::customize::internal::CustomizableSend<crate::operation::enum_keys::EnumKeysOutput, crate::operation::enum_keys::EnumKeysError>
     for EnumKeysFluentBuilder
-39
+{
     fn send(
         self,
         config_override: crate::config::Builder,
     ) -> crate::client::customize::internal::BoxFuture<
         crate::client::customize::internal::SendResult<crate::operation::enum_keys::EnumKeysOutput, crate::operation::enum_keys::EnumKeysError>,
     > {
         ::std::boxed::Box::pin(async move { self.config_override(config_override).send().await })
-47
+    }
-48
+}
 /* FluentBuilderGenerator.kt:282 */
 impl EnumKeysFluentBuilder {
     /* FluentBuilderGenerator.kt:288 */
     /// Creates a new `EnumKeysFluentBuilder`.
     pub(crate) fn new(handle: ::std::sync::Arc<crate::client::Handle>) -> Self {
         Self {
             handle,
             inner: ::std::default::Default::default(),
             config_override: ::std::option::Option::None,
-58
+        }
-59
+    }
     /* FluentBuilderGenerator.kt:301 */
     /// Access the EnumKeys as a reference.
     pub fn as_input(&self) -> &crate::operation::enum_keys::builders::EnumKeysInputBuilder {
         &self.inner
-64
+    }
     /* FluentBuilderGenerator.kt:145 */
     /// Sends the request and returns the response.
     ///
     /// If an error occurs, an `SdkError` will be returned with additional details that
     /// can be matched against.
     ///
     /// By default, any retryable failures will be retried twice. Retry behavior
     /// is configurable with the [RetryConfig](aws_smithy_types::retry::RetryConfig), which can be
     /// set when configuring the client.
     pub async fn send(
         self,
     ) -> ::std::result::Result<
         crate::operation::enum_keys::EnumKeysOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::enum_keys::EnumKeysError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {
         let input = self
             .inner
             .build()
             .map_err(::aws_smithy_runtime_api::client::result::SdkError::construction_failure)?;
         let runtime_plugins = crate::operation::enum_keys::EnumKeys::operation_runtime_plugins(
             self.handle.runtime_plugins.clone(),
             &self.handle.conf,
             self.config_override,
         );
         crate::operation::enum_keys::EnumKeys::orchestrate(&runtime_plugins, input).await
-93
+    }
-94
     /// Consumes this builder, creating a customizable operation that can be modified before being sent.
     pub fn customize(
         self,
     ) -> crate::client::customize::CustomizableOperation<crate::operation::enum_keys::EnumKeysOutput, crate::operation::enum_keys::EnumKeysError, Self>
-99
+    {
         crate::client::customize::CustomizableOperation::new(self)
-101
+    }
     /* FluentBuilderGenerator.kt:315 */
     pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
         self.set_config_override(::std::option::Option::Some(config_override.into()));
         self
-106
+    }
-107
     pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
         self.config_override = config_override;
         self
-111
+    }
     ///
     /// /* FluentBuilderGenerator.kt:466 */
     /// Adds a key-value pair to `data`.
     ///
     /// To override the contents of this collection use [`set_data`](Self::set_data).
     ///
     /* FluentBuilderGenerator.kt:473 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:475 */
     pub fn data(mut self, k: crate::types::StringEnum, v: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.inner = self.inner.data(k, v.into());
         self
-123
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn set_data(mut self, input: ::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>>) -> Self {
         self.inner = self.inner.set_data(input);
         self
-130
+    }
     /* FluentBuilderGenerator.kt:518 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:520 */
     pub fn get_data(&self) -> &::std::option::Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>> {
         self.inner.get_data()
-136
+    }
     /* FluentBuilderGenerator.kt:282 */
-138
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/primitive_int_op_xml.rs

@@ -1,1 +40,49 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* OperationGenerator.kt:77 */
 /// Orchestration and serialization glue logic for `PrimitiveIntOpXml`.
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* OperationGenerator.kt:84 */
 pub struct PrimitiveIntOpXml;
 /* OperationGenerator.kt:85 */
 impl PrimitiveIntOpXml {
     /// Creates a new `PrimitiveIntOpXml`
     /// /* OperationGenerator.kt:86 */Creates a new `PrimitiveIntOpXml`
     /* OperationGenerator.kt:87 */
     pub fn new() -> Self {
         /* OperationGenerator.kt:88 */
         Self
         /* OperationGenerator.kt:87 */
-18
+    }
     /* OperationGenerator.kt:138 */
     pub(crate) async fn orchestrate(
         runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         input: crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput,
     ) -> ::std::result::Result<
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {

↧ Expand context

         let map_err = |err: ::aws_smithy_runtime_api::client::result::SdkError<
             ::aws_smithy_runtime_api::client::interceptors::context::Error,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >| {
             err.map_service_error(|err| {
                 err.downcast::<crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError>()
                     .expect("correct error type")
             })
         };
         let context = Self::orchestrate_with_stop_point(runtime_plugins, input, ::aws_smithy_runtime::client::orchestrator::StopPoint::None)
             .await
             .map_err(map_err)?;
         let output = context.finalize().map_err(map_err)?;
         ::std::result::Result::Ok(
             output
                 .downcast::<crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput>()
                 .expect("correct output type"),
-47
+        )
-48
+    }
-49

@@ -63,72 +388,464 @@

↥ Expand context

         .instrument(::tracing::debug_span!(
             "Rest XML Protocol.PrimitiveIntOpXml",
             "rpc.service" = "Rest XML Protocol",
             "rpc.method" = "PrimitiveIntOpXml",
             "sdk_invocation_id" = ::fastrand::u32(1_000_000..10_000_000),
         ))
         .await
-79
+    }
-80
     pub(crate) fn operation_runtime_plugins(
         client_runtime_plugins: ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         client_config: &crate::config::Config,
         config_override: ::std::option::Option<crate::config::Builder>,
     ) -> ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins {
         let mut runtime_plugins = client_runtime_plugins.with_operation_plugin(Self::new());
         runtime_plugins = runtime_plugins.with_client_plugin(crate::auth_plugin::DefaultAuthOptionsPlugin::new(vec![
             ::aws_smithy_runtime::client::auth::no_auth::NO_AUTH_SCHEME_ID,
         ]));
         if let ::std::option::Option::Some(config_override) = config_override {
             for plugin in config_override.runtime_plugins.iter().cloned() {

                 runtime_plugins = runtime_plugins.with_operation_plugin(plugin);
-93
+            }
             runtime_plugins = runtime_plugins.with_operation_plugin(crate::config::ConfigOverrideRuntimePlugin::new(
                 config_override,
                 client_config.config.clone(),
                 &client_config.runtime_components,
             ));
-99
+        }
         runtime_plugins
-101
+    }
     /* OperationGenerator.kt:85 */
-103
+}
 /* OperationRuntimePluginGenerator.kt:55 */
 impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin for PrimitiveIntOpXml {
     fn config(&self) -> ::std::option::Option<::aws_smithy_types::config_bag::FrozenLayer> {
         let mut cfg = ::aws_smithy_types::config_bag::Layer::new("PrimitiveIntOpXml");
-108
         cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedRequestSerializer::new(
             PrimitiveIntOpXmlRequestSerializer,
         ));
         cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedResponseDeserializer::new(
             PrimitiveIntOpXmlResponseDeserializer,
         ));
-115
         cfg.store_put(::aws_smithy_runtime_api::client::auth::AuthSchemeOptionResolverParams::new(
             ::aws_smithy_runtime_api::client::auth::static_resolver::StaticAuthSchemeOptionResolverParams::new(),
         ));
-119
         cfg.store_put(::aws_smithy_runtime_api::client::orchestrator::Metadata::new(
             "PrimitiveIntOpXml",
             "Rest XML Protocol",
         ));
-124
         ::std::option::Option::Some(cfg.freeze())
-126
+    }
-127
     fn runtime_components(
         &self,
         _: &::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,
     ) -> ::std::borrow::Cow<'_, ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder> {
         #[allow(unused_mut)]
         let mut rcb = ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder::new("PrimitiveIntOpXml")
             .with_interceptor(::aws_smithy_runtime::client::stalled_stream_protection::StalledStreamProtectionInterceptor::default())
             .with_interceptor(PrimitiveIntOpXmlEndpointParamsInterceptor)
             .with_retry_classifier(::aws_smithy_runtime::client::retries::classifiers::TransientErrorClassifier::<
                 crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError,
             >::new())
             .with_retry_classifier(::aws_smithy_runtime::client::retries::classifiers::ModeledAsRetryableClassifier::<
                 crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError,
             >::new());
-142
         ::std::borrow::Cow::Owned(rcb)
-144
+    }
-145
+}
-146
 /* ResponseDeserializerGenerator.kt:64 */
 #[derive(Debug)]
 struct PrimitiveIntOpXmlResponseDeserializer;
 impl ::aws_smithy_runtime_api::client::ser_de::DeserializeResponse for PrimitiveIntOpXmlResponseDeserializer {
     fn deserialize_nonstreaming(
         &self,
         response: &::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
     ) -> ::aws_smithy_runtime_api::client::interceptors::context::OutputOrError {
         let (success, status) = (response.status().is_success(), response.status().as_u16());
         let headers = response.headers();
         let body = response.body().bytes().expect("body loaded");
         #[allow(unused_mut)]
         let mut force_error = false;
-160
         let parse_result = if !success && status != 200 || force_error {
             crate::protocol_serde::shape_primitive_int_op_xml::de_primitive_int_op_xml_http_error(status, headers, body)
         } else {
             crate::protocol_serde::shape_primitive_int_op_xml::de_primitive_int_op_xml_http_response(status, headers, body)
         };
         crate::protocol_serde::type_erase_result(parse_result)
-167
+    }
-168
+}
 /* RequestSerializerGenerator.kt:67 */
 #[derive(Debug)]
 struct PrimitiveIntOpXmlRequestSerializer;
 impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for PrimitiveIntOpXmlRequestSerializer {
     #[allow(unused_mut, clippy::let_and_return, clippy::needless_borrow, clippy::useless_conversion)]
     fn serialize_input(
         &self,
         input: ::aws_smithy_runtime_api::client::interceptors::context::Input,
         _cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<::aws_smithy_runtime_api::client::orchestrator::HttpRequest, ::aws_smithy_runtime_api::box_error::BoxError> {
         let input = input
             .downcast::<crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput>()
             .expect("correct type");
         let _header_serialization_settings = _cfg
             .load::<crate::serialization_settings::HeaderSerializationSettings>()
             .cloned()
             .unwrap_or_default();
         let mut request_builder = {
             fn uri_base(
                 _input: &crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput,
                 output: &mut ::std::string::String,
             ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
                 use ::std::fmt::Write as _;
                 ::std::write!(output, "/primitive-document").expect("formatting should succeed");
                 ::std::result::Result::Ok(())
-194
+            }
             #[allow(clippy::unnecessary_wraps)]
             fn update_http_builder(
                 input: &crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput,
                 builder: ::http::request::Builder,
             ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
                 let mut uri = ::std::string::String::new();
                 uri_base(input, &mut uri)?;
                 ::std::result::Result::Ok(builder.method("POST").uri(uri))
-203
+            }
             let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
             builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
             builder
         };
         let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_primitive_int_op_xml::ser_primitive_int_op_xml_op_input(
             &input,
         )?);
         if let Some(content_length) = body.content_length() {
             let content_length = content_length.to_string();
             request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
-214
+        }
         ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
-216
+    }
-217
+}
 /* EndpointParamsInterceptorGenerator.kt:86 */
 #[derive(Debug)]
 struct PrimitiveIntOpXmlEndpointParamsInterceptor;
-221
 impl ::aws_smithy_runtime_api::client::interceptors::Intercept for PrimitiveIntOpXmlEndpointParamsInterceptor {
     fn name(&self) -> &'static str {
         "PrimitiveIntOpXmlEndpointParamsInterceptor"
-225
+    }
-226
     fn read_before_execution(
         &self,
         context: &::aws_smithy_runtime_api::client::interceptors::context::BeforeSerializationInterceptorContextRef<
             '_,
             ::aws_smithy_runtime_api::client::interceptors::context::Input,
             ::aws_smithy_runtime_api::client::interceptors::context::Output,
             ::aws_smithy_runtime_api::client::interceptors::context::Error,
         >,
         cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<(), ::aws_smithy_runtime_api::box_error::BoxError> {
         let _input = context
             .input()
             .downcast_ref::<PrimitiveIntOpXmlInput>()
             .ok_or("failed to downcast to PrimitiveIntOpXmlInput")?;
-241
         let params = crate::config::endpoint::Params::builder().build().map_err(|err| {
             ::aws_smithy_runtime_api::client::interceptors::error::ContextAttachedError::new("endpoint params could not be built", err)
         })?;
         cfg.interceptor_state()
             .store_put(::aws_smithy_runtime_api::client::endpoint::EndpointResolverParams::new(params));
         ::std::result::Result::Ok(())
-248
+    }
-249
+}
-250
 // The get_* functions below are generated from JMESPath expressions in the
 // operationContextParams trait. They target the operation's input shape.
-253
 /* RustType.kt:516 */
 #[allow(unreachable_code, unused_variables)]
 /* RustType.kt:516 */
 #[cfg(test)]
 /* ProtocolTestGenerator.kt:98 */
 mod primitive_int_op_xml_test {
-260
     /// Primitive ints should not be serialized when they are unset
     /// Test ID: RestXmlSerPrimitiveIntUnset
     #[::tokio::test]
     #[::tracing_test::traced_test]
     async fn rest_xml_ser_primitive_int_unset_request() {
         let (http_client, request_receiver) = ::aws_smithy_http_client::test_util::capture_request(None);
         let config_builder = crate::config::Config::builder().with_test_defaults().endpoint_url("https://example.com");
-268
         let client = crate::Client::from_conf(config_builder.http_client(http_client).build());
         let result = client.primitive_int_op_xml().send().await;
         let _ = dbg!(result);
         let http_request = request_receiver.expect_request();
         let body = http_request.body().bytes().expect("body should be strict");
         ::aws_smithy_protocol_test::assert_ok(::aws_smithy_protocol_test::validate_body(
             body,
             "    <PrimitiveIntDocument>\n    </PrimitiveIntDocument>\n",
             ::aws_smithy_protocol_test::MediaType::from("application/xml"),
         ));
         let uri: ::http::Uri = http_request.uri().parse().expect("invalid URI sent");
         ::pretty_assertions::assert_eq!(http_request.method(), "POST", "method was incorrect");
         ::pretty_assertions::assert_eq!(uri.path(), "/primitive-document", "path was incorrect");
-282
+    }
-283
     /// Primitive ints should not be serialized when they are unset
     /// Test ID: RestXmlSerPrimitiveIntSetToDefault
     #[::tokio::test]
     #[::tracing_test::traced_test]
     async fn rest_xml_ser_primitive_int_set_to_default_request() {
         let (http_client, request_receiver) = ::aws_smithy_http_client::test_util::capture_request(None);
         let config_builder = crate::config::Config::builder().with_test_defaults().endpoint_url("https://example.com");
-291
         let client = crate::Client::from_conf(config_builder.http_client(http_client).build());
         let result = client.primitive_int_op_xml().set_value(::std::option::Option::Some(1)).send().await;
         let _ = dbg!(result);
         let http_request = request_receiver.expect_request();
         let body = http_request.body().bytes().expect("body should be strict");
         ::aws_smithy_protocol_test::assert_ok(::aws_smithy_protocol_test::validate_body(
             body,
             "<PrimitiveIntDocument>\n     <value>1</value>\n</PrimitiveIntDocument>\n",
             ::aws_smithy_protocol_test::MediaType::from("application/xml"),
         ));
         let uri: ::http::Uri = http_request.uri().parse().expect("invalid URI sent");
         ::pretty_assertions::assert_eq!(http_request.method(), "POST", "method was incorrect");
         ::pretty_assertions::assert_eq!(uri.path(), "/primitive-document", "path was incorrect");
-305
+    }
-+
     /* ProtocolTestGenerator.kt:98 */
-308
+}
-309
 /* OperationErrorGenerator.kt:79 */
 /// Error type for the `PrimitiveIntOpXmlError` operation.
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::fmt::Debug)]
 pub enum PrimitiveIntOpXmlError {
 pub /* OperationErrorGenerator.kt:81 */ enum PrimitiveIntOpXmlError {
     /* OperationErrorGenerator.kt:88 */
     /// An unexpected error occurred (e.g., invalid JSON returned by the service or an unknown error code).
     #[deprecated(note = "Matching `Unhandled` directly is not forwards compatible. Instead, match using a \
     variable wildcard pattern and check `.code()`:
-321
+     \
     &nbsp;&nbsp;&nbsp;`err if err.code() == Some(\"SpecificExceptionCode\") => { /* handle the error */ }`
-323
+     \
     See [`ProvideErrorMetadata`](#impl-ProvideErrorMetadata-for-PrimitiveIntOpXmlError) for what information is available for the error.")]
     Unhandled(crate::error::sealed_unhandled::Unhandled),
     /* OperationErrorGenerator.kt:81 */
-327
+}
 /* OperationErrorGenerator.kt:218 */
 impl PrimitiveIntOpXmlError {
     /* OperationErrorGenerator.kt:219 */
     /// Creates the `PrimitiveIntOpXmlError::Unhandled` variant from any error type.
     pub fn unhandled(
         err: impl ::std::convert::Into<::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>>,
     ) -> Self {
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source: err.into(),
             meta: ::std::default::Default::default(),
         })
-339
+    }
-340
     /// Creates the `PrimitiveIntOpXmlError::Unhandled` variant from an [`ErrorMetadata`](::aws_smithy_types::error::ErrorMetadata).
     pub fn generic(err: ::aws_smithy_types::error::ErrorMetadata) -> Self {
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source: err.clone().into(),
             meta: err,
         })
-347
+    }
     ///
     /// /* OperationErrorGenerator.kt:236 */
     /// Returns error metadata, which includes the error code, message,
     /// request ID, and potentially additional information.
     ///
     /* OperationErrorGenerator.kt:242 */
     pub fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
         /* OperationErrorGenerator.kt:243 */
         match self {
             Self::Unhandled(e) => &e.meta,
             /* OperationErrorGenerator.kt:251 */ Self::Unhandled(e) => &e.meta,
             /* OperationErrorGenerator.kt:243 */
-358
+        }
         /* OperationErrorGenerator.kt:242 */
-360
+    }
     /* OperationErrorGenerator.kt:218 */
-362
+}
 /* OperationErrorGenerator.kt:269 */
 impl ::std::error::Error for PrimitiveIntOpXmlError {
     /* OperationErrorGenerator.kt:270 */
     fn source(&self) -> ::std::option::Option<&(dyn ::std::error::Error + 'static)> {
         /* OperationErrorGenerator.kt:318 */
         match self {
             Self::Unhandled(_inner) => ::std::option::Option::Some(&*_inner.source),
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:279 */
                 ::std::option::Option::Some(&*_inner.source)
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-375
+        }
         /* OperationErrorGenerator.kt:270 */
-377
+    }
     /* OperationErrorGenerator.kt:269 */
-379
+}
 /* OperationErrorGenerator.kt:133 */
 impl ::std::fmt::Display for PrimitiveIntOpXmlError {
     /* OperationErrorGenerator.kt:134 */
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
         /* OperationErrorGenerator.kt:318 */
         match self {
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:139 */
                 if let ::std::option::Option::Some(code) = ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self) {
                     write!(f, "unhandled error ({code})")
                 } else {
                     f.write_str("unhandled error")
-393
+                }
--
+            }
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-396
+        }
         /* OperationErrorGenerator.kt:134 */
-398
+    }
     /* OperationErrorGenerator.kt:133 */
-400
+}
 /* OperationErrorGenerator.kt:182 */
 impl ::aws_smithy_types::retry::ProvideErrorKind for PrimitiveIntOpXmlError {
     /* OperationErrorGenerator.kt:186 */
     fn code(&self) -> ::std::option::Option<&str> {
         /* OperationErrorGenerator.kt:187 */
         ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
         /* OperationErrorGenerator.kt:186 */
-408
+    }
     /* OperationErrorGenerator.kt:190 */
     fn retryable_error_kind(&self) -> ::std::option::Option<::aws_smithy_types::retry::ErrorKind> {
         /* OperationErrorGenerator.kt:197 */
         ::std::option::Option::None
         /* OperationErrorGenerator.kt:190 */
-414
+    }
     /* OperationErrorGenerator.kt:182 */
-416
+}
 /* OperationErrorGenerator.kt:163 */
 impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for PrimitiveIntOpXmlError {
     /* OperationErrorGenerator.kt:164 */
     fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
         /* OperationErrorGenerator.kt:318 */
         match self {
             Self::Unhandled(_inner) => &_inner.meta,
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:168 */
                 &_inner.meta
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-429
+        }
         /* OperationErrorGenerator.kt:164 */
-431
+    }
     /* OperationErrorGenerator.kt:163 */
-433
+}
 /* OperationErrorGenerator.kt:109 */
 impl ::aws_smithy_runtime_api::client::result::CreateUnhandledError for PrimitiveIntOpXmlError {
     /* OperationErrorGenerator.kt:110 */
     fn create_unhandled_error(
         source: ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
         meta: ::std::option::Option<::aws_smithy_types::error::ErrorMetadata>,
     ) -> Self {
         /* OperationErrorGenerator.kt:121 */
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source,
             meta: meta.unwrap_or_default(),
         })
         /* OperationErrorGenerator.kt:110 */
-447
+    }
     /* OperationErrorGenerator.kt:109 */
-449
+}
-450
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::primitive_int_op_xml::_primitive_int_op_xml_output::PrimitiveIntOpXmlOutput;
-453
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::primitive_int_op_xml::_primitive_int_op_xml_input::PrimitiveIntOpXmlInput;
-456
 /* RustModule.kt:172 */
 mod _primitive_int_op_xml_input;
-459
 /* RustModule.kt:172 */
 mod _primitive_int_op_xml_output;
-462
 /// Builders
 /// /* CodegenDelegator.kt:51 */Builders
 pub mod builders;

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/primitive_int_op_xml/_primitive_int_op_xml_input.rs

@@ -1,1 +73,133 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* StructureGenerator.kt:197 */
 #[allow(missing_docs)] // documentation missing in model
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct PrimitiveIntOpXmlInput {
     #[allow(missing_docs)] // documentation missing in model
 pub /* StructureGenerator.kt:201 */ struct PrimitiveIntOpXmlInput {
     /* StructureGenerator.kt:231 */ #[allow(missing_docs)] // documentation missing in model
     pub value: ::std::option::Option<i32>,
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
     pub defaulted_value: ::std::option::Option<i32>,
     /* StructureGenerator.kt:201 */
-15
+}
 /* StructureGenerator.kt:135 */
 impl PrimitiveIntOpXmlInput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn value(&self) -> ::std::option::Option<i32> {
         /* StructureGenerator.kt:168 */
         self.value
         /* StructureGenerator.kt:166 */
-25
+    }
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn defaulted_value(&self) -> ::std::option::Option<i32> {
         /* StructureGenerator.kt:168 */
         self.defaulted_value
         /* StructureGenerator.kt:166 */
-33
+    }
     /* StructureGenerator.kt:135 */
-35
+}
 /* ClientCodegenVisitor.kt:237 */
 impl PrimitiveIntOpXmlInput {
     /// Creates a new builder-style object to manufacture [`PrimitiveIntOpXmlInput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput).
     /// /* BuilderGenerator.kt:173 */Creates a new builder-style object to manufacture [`PrimitiveIntOpXmlInput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput).
     /* BuilderGenerator.kt:175 */
     pub fn builder() -> crate::operation::primitive_int_op_xml::builders::PrimitiveIntOpXmlInputBuilder {
         /* BuilderGenerator.kt:176 */
         crate::operation::primitive_int_op_xml::builders::PrimitiveIntOpXmlInputBuilder::default()
         /* BuilderGenerator.kt:175 */
-44
+    }
     /* ClientCodegenVisitor.kt:237 */
-46
+}
-47
 /// A builder for [`PrimitiveIntOpXmlInput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput).
 /// /* BuilderGenerator.kt:342 */A builder for [`PrimitiveIntOpXmlInput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput).
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* BuilderGenerator.kt:345 */
 pub struct PrimitiveIntOpXmlInputBuilder {
     pub(crate) value: ::std::option::Option<i32>,
     pub(crate) defaulted_value: ::std::option::Option<i32>,
     /* BuilderGenerator.kt:275 */ pub(crate) value: ::std::option::Option<i32>,
     /* BuilderGenerator.kt:275 */ pub(crate) defaulted_value: ::std::option::Option<i32>,
     /* BuilderGenerator.kt:345 */
-58
+}
 /* BuilderGenerator.kt:355 */
 impl PrimitiveIntOpXmlInputBuilder {
     /* BuilderGenerator.kt:286 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:291 */
     pub fn value(mut self, input: i32) -> Self {
         /* BuilderGenerator.kt:292 */
         self.value = ::std::option::Option::Some(input);
         /* BuilderGenerator.kt:293 */
         self
         /* BuilderGenerator.kt:291 */
-70
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_value(mut self, input: ::std::option::Option<i32>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.value = input;
         self
         /* BuilderGenerator.kt:314 */
-79
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_value(&self) -> &::std::option::Option<i32> {
         /* BuilderGenerator.kt:337 */
         &self.value
         /* BuilderGenerator.kt:336 */
-87
+    }
     /* BuilderGenerator.kt:286 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:291 */
     pub fn defaulted_value(mut self, input: i32) -> Self {
         /* BuilderGenerator.kt:292 */
         self.defaulted_value = ::std::option::Option::Some(input);
         /* BuilderGenerator.kt:293 */
         self
         /* BuilderGenerator.kt:291 */
-97
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_defaulted_value(mut self, input: ::std::option::Option<i32>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.defaulted_value = input;
         self
         /* BuilderGenerator.kt:314 */
-106
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_defaulted_value(&self) -> &::std::option::Option<i32> {
         /* BuilderGenerator.kt:337 */
         &self.defaulted_value
         /* BuilderGenerator.kt:336 */
-114
+    }
     /// Consumes the builder and constructs a [`PrimitiveIntOpXmlInput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput).
     /// /* BuilderGenerator.kt:240 */Consumes the builder and constructs a [`PrimitiveIntOpXmlInput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput).
     /* BuilderGenerator.kt:253 */
     pub fn build(
         self,
     ) -> ::std::result::Result<crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput, ::aws_smithy_types::error::operation::BuildError> {
         ::std::result::Result::Ok(crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput {
             value: self.value,
             defaulted_value: self.defaulted_value,
         })
         /* BuilderGenerator.kt:254 */
         ::std::result::Result::Ok(
             /* BuilderGenerator.kt:477 */
             crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlInput {
                 /* BuilderGenerator.kt:481 */ value: self.value,
                 /* BuilderGenerator.kt:481 */
                 defaulted_value: self.defaulted_value,
                 /* BuilderGenerator.kt:477 */
             }, /* BuilderGenerator.kt:254 */
-+
+        )
         /* BuilderGenerator.kt:253 */
-131
+    }
     /* BuilderGenerator.kt:355 */
-133
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/primitive_int_op_xml/_primitive_int_op_xml_output.rs

@@ -1,1 +71,131 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* StructureGenerator.kt:197 */
 #[allow(missing_docs)] // documentation missing in model
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct PrimitiveIntOpXmlOutput {
     #[allow(missing_docs)] // documentation missing in model
 pub /* StructureGenerator.kt:201 */ struct PrimitiveIntOpXmlOutput {
     /* StructureGenerator.kt:231 */ #[allow(missing_docs)] // documentation missing in model
     pub value: ::std::option::Option<i32>,
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
     pub defaulted_value: i32,
     /* StructureGenerator.kt:201 */
-15
+}
 /* StructureGenerator.kt:135 */
 impl PrimitiveIntOpXmlOutput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn value(&self) -> ::std::option::Option<i32> {
         /* StructureGenerator.kt:168 */
         self.value
         /* StructureGenerator.kt:166 */
-25
+    }
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn defaulted_value(&self) -> i32 {
         /* StructureGenerator.kt:168 */
         self.defaulted_value
         /* StructureGenerator.kt:166 */
-33
+    }
     /* StructureGenerator.kt:135 */
-35
+}
 /* ClientCodegenVisitor.kt:237 */
 impl PrimitiveIntOpXmlOutput {
     /// Creates a new builder-style object to manufacture [`PrimitiveIntOpXmlOutput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput).
     /// /* BuilderGenerator.kt:173 */Creates a new builder-style object to manufacture [`PrimitiveIntOpXmlOutput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput).
     /* BuilderGenerator.kt:175 */
     pub fn builder() -> crate::operation::primitive_int_op_xml::builders::PrimitiveIntOpXmlOutputBuilder {
         /* BuilderGenerator.kt:176 */
         crate::operation::primitive_int_op_xml::builders::PrimitiveIntOpXmlOutputBuilder::default()
         /* BuilderGenerator.kt:175 */
-44
+    }
     /* ClientCodegenVisitor.kt:237 */
-46
+}
-47
 /// A builder for [`PrimitiveIntOpXmlOutput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput).
 /// /* BuilderGenerator.kt:342 */A builder for [`PrimitiveIntOpXmlOutput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput).
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* BuilderGenerator.kt:345 */
 pub struct PrimitiveIntOpXmlOutputBuilder {
     pub(crate) value: ::std::option::Option<i32>,
     pub(crate) defaulted_value: ::std::option::Option<i32>,
     /* BuilderGenerator.kt:275 */ pub(crate) value: ::std::option::Option<i32>,
     /* BuilderGenerator.kt:275 */ pub(crate) defaulted_value: ::std::option::Option<i32>,
     /* BuilderGenerator.kt:345 */
-58
+}
 /* BuilderGenerator.kt:355 */
 impl PrimitiveIntOpXmlOutputBuilder {
     /* BuilderGenerator.kt:286 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:291 */
     pub fn value(mut self, input: i32) -> Self {
         /* BuilderGenerator.kt:292 */
         self.value = ::std::option::Option::Some(input);
         /* BuilderGenerator.kt:293 */
         self
         /* BuilderGenerator.kt:291 */
-70
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_value(mut self, input: ::std::option::Option<i32>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.value = input;
         self
         /* BuilderGenerator.kt:314 */
-79
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_value(&self) -> &::std::option::Option<i32> {
         /* BuilderGenerator.kt:337 */
         &self.value
         /* BuilderGenerator.kt:336 */
-87
+    }
     /* BuilderGenerator.kt:286 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:291 */
     pub fn defaulted_value(mut self, input: i32) -> Self {
         /* BuilderGenerator.kt:292 */
         self.defaulted_value = ::std::option::Option::Some(input);
         /* BuilderGenerator.kt:293 */
         self
         /* BuilderGenerator.kt:291 */
-97
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_defaulted_value(mut self, input: ::std::option::Option<i32>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.defaulted_value = input;
         self
         /* BuilderGenerator.kt:314 */
-106
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_defaulted_value(&self) -> &::std::option::Option<i32> {
         /* BuilderGenerator.kt:337 */
         &self.defaulted_value
         /* BuilderGenerator.kt:336 */
-114
+    }
     /// Consumes the builder and constructs a [`PrimitiveIntOpXmlOutput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput).
     /// /* BuilderGenerator.kt:240 */Consumes the builder and constructs a [`PrimitiveIntOpXmlOutput`](crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput).
     /* BuilderGenerator.kt:253 */
     pub fn build(self) -> crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput {
         /* BuilderGenerator.kt:477 */
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput {
             value: self.value,
             defaulted_value: self.defaulted_value.unwrap_or_default(),
             /* BuilderGenerator.kt:481 */ value: self.value,
             /* BuilderGenerator.kt:481 */
             defaulted_value: self
                 .defaulted_value
                 /* BuilderGenerator.kt:487 */
                 .unwrap_or_default(),
             /* BuilderGenerator.kt:477 */
-127
+        }
         /* BuilderGenerator.kt:253 */
-129
+    }
     /* BuilderGenerator.kt:355 */
-131
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/primitive_int_op_xml/builders.rs

@@ -1,1 +138,162 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::primitive_int_op_xml::_primitive_int_op_xml_output::PrimitiveIntOpXmlOutputBuilder;
-4
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::primitive_int_op_xml::_primitive_int_op_xml_input::PrimitiveIntOpXmlInputBuilder;
-7
 /* FluentBuilderGenerator.kt:408 */
 impl crate::operation::primitive_int_op_xml::builders::PrimitiveIntOpXmlInputBuilder {
     /// Sends a request with this input using the given client.
     pub async fn send_with(
         self,
         client: &crate::Client,
     ) -> ::std::result::Result<
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {
         let mut fluent_builder = client.primitive_int_op_xml();
         fluent_builder.inner = self;
         fluent_builder.send().await
-24
+    }
-25
+}
 /// Fluent builder constructing a request to `PrimitiveIntOpXml`.
 /// /* FluentBuilderGenerator.kt:129 */Fluent builder constructing a request to `PrimitiveIntOpXml`.
 ///
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::fmt::Debug)]
 /* FluentBuilderGenerator.kt:270 */
 pub struct PrimitiveIntOpXmlFluentBuilder {
     handle: ::std::sync::Arc<crate::client::Handle>,
     inner: crate::operation::primitive_int_op_xml::builders::PrimitiveIntOpXmlInputBuilder,
     config_override: ::std::option::Option<crate::config::Builder>,
-35
+}
 /* FluentBuilderGenerator.kt:381 */
 impl
     crate::client::customize::internal::CustomizableSend<
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput,
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError,
     > for PrimitiveIntOpXmlFluentBuilder
-42
+{
     fn send(
         self,
         config_override: crate::config::Builder,
     ) -> crate::client::customize::internal::BoxFuture<
         crate::client::customize::internal::SendResult<
             crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput,
             crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError,
         >,
     > {
         ::std::boxed::Box::pin(async move { self.config_override(config_override).send().await })
-53
+    }
-54
+}
 /* FluentBuilderGenerator.kt:282 */
 impl PrimitiveIntOpXmlFluentBuilder {
     /* FluentBuilderGenerator.kt:288 */
     /// Creates a new `PrimitiveIntOpXmlFluentBuilder`.
     pub(crate) fn new(handle: ::std::sync::Arc<crate::client::Handle>) -> Self {
         Self {
             handle,
             inner: ::std::default::Default::default(),
             config_override: ::std::option::Option::None,
-64
+        }
-65
+    }
     /* FluentBuilderGenerator.kt:301 */
     /// Access the PrimitiveIntOpXml as a reference.
     pub fn as_input(&self) -> &crate::operation::primitive_int_op_xml::builders::PrimitiveIntOpXmlInputBuilder {
         &self.inner
-70
+    }
     /* FluentBuilderGenerator.kt:145 */
     /// Sends the request and returns the response.
     ///
     /// If an error occurs, an `SdkError` will be returned with additional details that
     /// can be matched against.
     ///
     /// By default, any retryable failures will be retried twice. Retry behavior
     /// is configurable with the [RetryConfig](aws_smithy_types::retry::RetryConfig), which can be
     /// set when configuring the client.
     pub async fn send(
         self,
     ) -> ::std::result::Result<
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {
         let input = self
             .inner
             .build()
             .map_err(::aws_smithy_runtime_api::client::result::SdkError::construction_failure)?;
         let runtime_plugins = crate::operation::primitive_int_op_xml::PrimitiveIntOpXml::operation_runtime_plugins(
             self.handle.runtime_plugins.clone(),
             &self.handle.conf,
             self.config_override,
         );
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXml::orchestrate(&runtime_plugins, input).await
-99
+    }
-100
     /// Consumes this builder, creating a customizable operation that can be modified before being sent.
     pub fn customize(
         self,
     ) -> crate::client::customize::CustomizableOperation<
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlOutput,
         crate::operation::primitive_int_op_xml::PrimitiveIntOpXmlError,
         Self,
     > {
         crate::client::customize::CustomizableOperation::new(self)
-110
+    }
     /* FluentBuilderGenerator.kt:315 */
     pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
         self.set_config_override(::std::option::Option::Some(config_override.into()));
         self
-115
+    }
-116
     pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
         self.config_override = config_override;
         self
-120
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn value(mut self, input: i32) -> Self {
         self.inner = self.inner.value(input);
         self
-127
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn set_value(mut self, input: ::std::option::Option<i32>) -> Self {
         self.inner = self.inner.set_value(input);
         self
-134
+    }
     /* FluentBuilderGenerator.kt:518 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:520 */
     pub fn get_value(&self) -> &::std::option::Option<i32> {
         self.inner.get_value()
-140
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn defaulted_value(mut self, input: i32) -> Self {
         self.inner = self.inner.defaulted_value(input);
         self
-147
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn set_defaulted_value(mut self, input: ::std::option::Option<i32>) -> Self {
         self.inner = self.inner.set_defaulted_value(input);
         self
-154
+    }
     /* FluentBuilderGenerator.kt:518 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:520 */
     pub fn get_defaulted_value(&self) -> &::std::option::Option<i32> {
         self.inner.get_defaulted_value()
-160
+    }
     /* FluentBuilderGenerator.kt:282 */
-162
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/required_member.rs

@@ -1,1 +40,49 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* OperationGenerator.kt:77 */
 /// Orchestration and serialization glue logic for `RequiredMember`.
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* OperationGenerator.kt:84 */
 pub struct RequiredMember;
 /* OperationGenerator.kt:85 */
 impl RequiredMember {
     /// Creates a new `RequiredMember`
     /// /* OperationGenerator.kt:86 */Creates a new `RequiredMember`
     /* OperationGenerator.kt:87 */
     pub fn new() -> Self {
         /* OperationGenerator.kt:88 */
         Self
         /* OperationGenerator.kt:87 */
-18
+    }
     /* OperationGenerator.kt:138 */
     pub(crate) async fn orchestrate(
         runtime_plugins: &::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         input: crate::operation::required_member::RequiredMemberInput,
     ) -> ::std::result::Result<
         crate::operation::required_member::RequiredMemberOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::required_member::RequiredMemberError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {

↧ Expand context

         let map_err = |err: ::aws_smithy_runtime_api::client::result::SdkError<
             ::aws_smithy_runtime_api::client::interceptors::context::Error,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >| {
             err.map_service_error(|err| {
                 err.downcast::<crate::operation::required_member::RequiredMemberError>()
                     .expect("correct error type")
             })
         };
         let context = Self::orchestrate_with_stop_point(runtime_plugins, input, ::aws_smithy_runtime::client::orchestrator::StopPoint::None)
             .await
             .map_err(map_err)?;
         let output = context.finalize().map_err(map_err)?;
         ::std::result::Result::Ok(
             output
                 .downcast::<crate::operation::required_member::RequiredMemberOutput>()
                 .expect("correct output type"),
-47
+        )
-48
+    }
-49

@@ -57,66 +329,400 @@

↥ Expand context

             .instrument(::tracing::debug_span!(
                 "Rest XML Protocol.RequiredMember",
                 "rpc.service" = "Rest XML Protocol",
                 "rpc.method" = "RequiredMember",
                 "sdk_invocation_id" = ::fastrand::u32(1_000_000..10_000_000),
             ))
             .await
-73
+    }
-74
     pub(crate) fn operation_runtime_plugins(
         client_runtime_plugins: ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins,
         client_config: &crate::config::Config,
         config_override: ::std::option::Option<crate::config::Builder>,
     ) -> ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugins {
         let mut runtime_plugins = client_runtime_plugins.with_operation_plugin(Self::new());
         runtime_plugins = runtime_plugins.with_client_plugin(crate::auth_plugin::DefaultAuthOptionsPlugin::new(vec![
             ::aws_smithy_runtime::client::auth::no_auth::NO_AUTH_SCHEME_ID,
         ]));
         if let ::std::option::Option::Some(config_override) = config_override {
             for plugin in config_override.runtime_plugins.iter().cloned() {

                 runtime_plugins = runtime_plugins.with_operation_plugin(plugin);
-87
+            }
             runtime_plugins = runtime_plugins.with_operation_plugin(crate::config::ConfigOverrideRuntimePlugin::new(
                 config_override,
                 client_config.config.clone(),
                 &client_config.runtime_components,
             ));
-93
+        }
         runtime_plugins
-95
+    }
     /* OperationGenerator.kt:85 */
-97
+}
 /* OperationRuntimePluginGenerator.kt:55 */
 impl ::aws_smithy_runtime_api::client::runtime_plugin::RuntimePlugin for RequiredMember {
     fn config(&self) -> ::std::option::Option<::aws_smithy_types::config_bag::FrozenLayer> {
         let mut cfg = ::aws_smithy_types::config_bag::Layer::new("RequiredMember");
-102
         cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedRequestSerializer::new(
             RequiredMemberRequestSerializer,
         ));
         cfg.store_put(::aws_smithy_runtime_api::client::ser_de::SharedResponseDeserializer::new(
             RequiredMemberResponseDeserializer,
         ));
-109
         cfg.store_put(::aws_smithy_runtime_api::client::auth::AuthSchemeOptionResolverParams::new(
             ::aws_smithy_runtime_api::client::auth::static_resolver::StaticAuthSchemeOptionResolverParams::new(),
         ));
-113
         cfg.store_put(::aws_smithy_runtime_api::client::orchestrator::Metadata::new(
             "RequiredMember",
             "Rest XML Protocol",
         ));
-118
         ::std::option::Option::Some(cfg.freeze())
-120
+    }
-121
     fn runtime_components(
         &self,
         _: &::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder,
     ) -> ::std::borrow::Cow<'_, ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder> {
         #[allow(unused_mut)]
         let mut rcb = ::aws_smithy_runtime_api::client::runtime_components::RuntimeComponentsBuilder::new("RequiredMember")
             .with_interceptor(::aws_smithy_runtime::client::stalled_stream_protection::StalledStreamProtectionInterceptor::default())
             .with_interceptor(RequiredMemberEndpointParamsInterceptor)
             .with_retry_classifier(::aws_smithy_runtime::client::retries::classifiers::TransientErrorClassifier::<
                 crate::operation::required_member::RequiredMemberError,
             >::new())
             .with_retry_classifier(::aws_smithy_runtime::client::retries::classifiers::ModeledAsRetryableClassifier::<
                 crate::operation::required_member::RequiredMemberError,
             >::new());
-136
         ::std::borrow::Cow::Owned(rcb)
-138
+    }
-139
+}
-140
 /* ResponseDeserializerGenerator.kt:64 */
 #[derive(Debug)]
 struct RequiredMemberResponseDeserializer;
 impl ::aws_smithy_runtime_api::client::ser_de::DeserializeResponse for RequiredMemberResponseDeserializer {
     fn deserialize_nonstreaming(
         &self,
         response: &::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
     ) -> ::aws_smithy_runtime_api::client::interceptors::context::OutputOrError {
         let (success, status) = (response.status().is_success(), response.status().as_u16());
         let headers = response.headers();
         let body = response.body().bytes().expect("body loaded");
         #[allow(unused_mut)]
         let mut force_error = false;
-154
         let parse_result = if !success && status != 200 || force_error {
             crate::protocol_serde::shape_required_member::de_required_member_http_error(status, headers, body)
         } else {
             crate::protocol_serde::shape_required_member::de_required_member_http_response(status, headers, body)
         };
         crate::protocol_serde::type_erase_result(parse_result)
-161
+    }
-162
+}
 /* RequestSerializerGenerator.kt:67 */
 #[derive(Debug)]
 struct RequiredMemberRequestSerializer;
 impl ::aws_smithy_runtime_api::client::ser_de::SerializeRequest for RequiredMemberRequestSerializer {
     #[allow(unused_mut, clippy::let_and_return, clippy::needless_borrow, clippy::useless_conversion)]
     fn serialize_input(
         &self,
         input: ::aws_smithy_runtime_api::client::interceptors::context::Input,
         _cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<::aws_smithy_runtime_api::client::orchestrator::HttpRequest, ::aws_smithy_runtime_api::box_error::BoxError> {
         let input = input
             .downcast::<crate::operation::required_member::RequiredMemberInput>()
             .expect("correct type");
         let _header_serialization_settings = _cfg
             .load::<crate::serialization_settings::HeaderSerializationSettings>()
             .cloned()
             .unwrap_or_default();
         let mut request_builder = {
             fn uri_base(
                 _input: &crate::operation::required_member::RequiredMemberInput,
                 output: &mut ::std::string::String,
             ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::BuildError> {
                 use ::std::fmt::Write as _;
                 ::std::write!(output, "/required-member").expect("formatting should succeed");
                 ::std::result::Result::Ok(())
-188
+            }
             #[allow(clippy::unnecessary_wraps)]
             fn update_http_builder(
                 input: &crate::operation::required_member::RequiredMemberInput,
                 builder: ::http::request::Builder,
             ) -> ::std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
                 let mut uri = ::std::string::String::new();
                 uri_base(input, &mut uri)?;
                 ::std::result::Result::Ok(builder.method("GET").uri(uri))
-197
+            }
             let mut builder = update_http_builder(&input, ::http::request::Builder::new())?;
             builder = _header_serialization_settings.set_default_header(builder, ::http::header::CONTENT_TYPE, "application/xml");
             builder
         };
         let body = ::aws_smithy_types::body::SdkBody::from(crate::protocol_serde::shape_required_member::ser_required_member_op_input(&input)?);
         if let Some(content_length) = body.content_length() {
             let content_length = content_length.to_string();
             request_builder = _header_serialization_settings.set_default_header(request_builder, ::http::header::CONTENT_LENGTH, &content_length);
-206
+        }
         ::std::result::Result::Ok(request_builder.body(body).expect("valid request").try_into().unwrap())
-208
+    }
-209
+}
 /* EndpointParamsInterceptorGenerator.kt:86 */
 #[derive(Debug)]
 struct RequiredMemberEndpointParamsInterceptor;
-213
 impl ::aws_smithy_runtime_api::client::interceptors::Intercept for RequiredMemberEndpointParamsInterceptor {
     fn name(&self) -> &'static str {
         "RequiredMemberEndpointParamsInterceptor"
-217
+    }
-218
     fn read_before_execution(
         &self,
         context: &::aws_smithy_runtime_api::client::interceptors::context::BeforeSerializationInterceptorContextRef<
             '_,
             ::aws_smithy_runtime_api::client::interceptors::context::Input,
             ::aws_smithy_runtime_api::client::interceptors::context::Output,
             ::aws_smithy_runtime_api::client::interceptors::context::Error,
         >,
         cfg: &mut ::aws_smithy_types::config_bag::ConfigBag,
     ) -> ::std::result::Result<(), ::aws_smithy_runtime_api::box_error::BoxError> {
         let _input = context
             .input()
             .downcast_ref::<RequiredMemberInput>()
             .ok_or("failed to downcast to RequiredMemberInput")?;
-233
         let params = crate::config::endpoint::Params::builder().build().map_err(|err| {
             ::aws_smithy_runtime_api::client::interceptors::error::ContextAttachedError::new("endpoint params could not be built", err)
         })?;
         cfg.interceptor_state()
             .store_put(::aws_smithy_runtime_api::client::endpoint::EndpointResolverParams::new(params));
         ::std::result::Result::Ok(())
-240
+    }
-241
+}
-242
 // The get_* functions below are generated from JMESPath expressions in the
 // operationContextParams trait. They target the operation's input shape.
-245
 /* OperationErrorGenerator.kt:79 */
 /// Error type for the `RequiredMemberError` operation.
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::fmt::Debug)]
 pub enum RequiredMemberError {
 pub /* OperationErrorGenerator.kt:81 */ enum RequiredMemberError {
     /* OperationErrorGenerator.kt:88 */
     /// An unexpected error occurred (e.g., invalid JSON returned by the service or an unknown error code).
     #[deprecated(note = "Matching `Unhandled` directly is not forwards compatible. Instead, match using a \
     variable wildcard pattern and check `.code()`:
-257
+     \
     &nbsp;&nbsp;&nbsp;`err if err.code() == Some(\"SpecificExceptionCode\") => { /* handle the error */ }`
-259
+     \
     See [`ProvideErrorMetadata`](#impl-ProvideErrorMetadata-for-RequiredMemberError) for what information is available for the error.")]
     Unhandled(crate::error::sealed_unhandled::Unhandled),
     /* OperationErrorGenerator.kt:81 */
-263
+}
 /* OperationErrorGenerator.kt:218 */
 impl RequiredMemberError {
     /* OperationErrorGenerator.kt:219 */
     /// Creates the `RequiredMemberError::Unhandled` variant from any error type.
     pub fn unhandled(
         err: impl ::std::convert::Into<::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>>,
     ) -> Self {
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source: err.into(),
             meta: ::std::default::Default::default(),
         })
-275
+    }
-276
     /// Creates the `RequiredMemberError::Unhandled` variant from an [`ErrorMetadata`](::aws_smithy_types::error::ErrorMetadata).
     pub fn generic(err: ::aws_smithy_types::error::ErrorMetadata) -> Self {
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source: err.clone().into(),
             meta: err,
         })
-283
+    }
     ///
     /// /* OperationErrorGenerator.kt:236 */
     /// Returns error metadata, which includes the error code, message,
     /// request ID, and potentially additional information.
     ///
     /* OperationErrorGenerator.kt:242 */
     pub fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
         /* OperationErrorGenerator.kt:243 */
         match self {
             Self::Unhandled(e) => &e.meta,
             /* OperationErrorGenerator.kt:251 */ Self::Unhandled(e) => &e.meta,
             /* OperationErrorGenerator.kt:243 */
-294
+        }
         /* OperationErrorGenerator.kt:242 */
-296
+    }
     /* OperationErrorGenerator.kt:218 */
-298
+}
 /* OperationErrorGenerator.kt:269 */
 impl ::std::error::Error for RequiredMemberError {
     /* OperationErrorGenerator.kt:270 */
     fn source(&self) -> ::std::option::Option<&(dyn ::std::error::Error + 'static)> {
         /* OperationErrorGenerator.kt:318 */
         match self {
             Self::Unhandled(_inner) => ::std::option::Option::Some(&*_inner.source),
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:279 */
                 ::std::option::Option::Some(&*_inner.source)
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-311
+        }
         /* OperationErrorGenerator.kt:270 */
-313
+    }
     /* OperationErrorGenerator.kt:269 */
-315
+}
 /* OperationErrorGenerator.kt:133 */
 impl ::std::fmt::Display for RequiredMemberError {
     /* OperationErrorGenerator.kt:134 */
     fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
         /* OperationErrorGenerator.kt:318 */
         match self {
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:139 */
                 if let ::std::option::Option::Some(code) = ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self) {
                     write!(f, "unhandled error ({code})")
                 } else {
                     f.write_str("unhandled error")
-329
+                }
--
+            }
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-332
+        }
         /* OperationErrorGenerator.kt:134 */
-334
+    }
     /* OperationErrorGenerator.kt:133 */
-336
+}
 /* OperationErrorGenerator.kt:182 */
 impl ::aws_smithy_types::retry::ProvideErrorKind for RequiredMemberError {
     /* OperationErrorGenerator.kt:186 */
     fn code(&self) -> ::std::option::Option<&str> {
         /* OperationErrorGenerator.kt:187 */
         ::aws_smithy_types::error::metadata::ProvideErrorMetadata::code(self)
         /* OperationErrorGenerator.kt:186 */
-344
+    }
     /* OperationErrorGenerator.kt:190 */
     fn retryable_error_kind(&self) -> ::std::option::Option<::aws_smithy_types::retry::ErrorKind> {
         /* OperationErrorGenerator.kt:197 */
         ::std::option::Option::None
         /* OperationErrorGenerator.kt:190 */
-350
+    }
     /* OperationErrorGenerator.kt:182 */
-352
+}
 /* OperationErrorGenerator.kt:163 */
 impl ::aws_smithy_types::error::metadata::ProvideErrorMetadata for RequiredMemberError {
     /* OperationErrorGenerator.kt:164 */
     fn meta(&self) -> &::aws_smithy_types::error::ErrorMetadata {
         /* OperationErrorGenerator.kt:318 */
         match self {
             Self::Unhandled(_inner) => &_inner.meta,
             /* OperationErrorGenerator.kt:326 */
             Self::Unhandled(_inner) => {
                 /* OperationErrorGenerator.kt:168 */
                 &_inner.meta
                 /* OperationErrorGenerator.kt:326 */
             } /* OperationErrorGenerator.kt:318 */
-365
+        }
         /* OperationErrorGenerator.kt:164 */
-367
+    }
     /* OperationErrorGenerator.kt:163 */
-369
+}
 /* OperationErrorGenerator.kt:109 */
 impl ::aws_smithy_runtime_api::client::result::CreateUnhandledError for RequiredMemberError {
     /* OperationErrorGenerator.kt:110 */
     fn create_unhandled_error(
         source: ::std::boxed::Box<dyn ::std::error::Error + ::std::marker::Send + ::std::marker::Sync + 'static>,
         meta: ::std::option::Option<::aws_smithy_types::error::ErrorMetadata>,
     ) -> Self {
         /* OperationErrorGenerator.kt:121 */
         Self::Unhandled(crate::error::sealed_unhandled::Unhandled {
             source,
             meta: meta.unwrap_or_default(),
         })
         /* OperationErrorGenerator.kt:110 */
-383
+    }
     /* OperationErrorGenerator.kt:109 */
-385
+}
-386
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::required_member::_required_member_output::RequiredMemberOutput;
-389
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::required_member::_required_member_input::RequiredMemberInput;
-392
 /* RustModule.kt:172 */
 mod _required_member_input;
-395
 /* RustModule.kt:172 */
 mod _required_member_output;
-398
 /// Builders
 /// /* CodegenDelegator.kt:51 */Builders
 pub mod builders;

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/required_member/_required_member_input.rs

@@ -1,1 +52,94 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* StructureGenerator.kt:197 */
 #[allow(missing_docs)] // documentation missing in model
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct RequiredMemberInput {
 pub /* StructureGenerator.kt:201 */ struct RequiredMemberInput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
     pub required_string: ::std::option::Option<::std::string::String>,
     /* StructureGenerator.kt:201 */
-13
+}
 /* StructureGenerator.kt:135 */
 impl RequiredMemberInput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn required_string(&self) -> ::std::option::Option<&str> {
         /* StructureGenerator.kt:169 */
         self.required_string.as_deref()
         /* StructureGenerator.kt:166 */
-23
+    }
     /* StructureGenerator.kt:135 */
-25
+}
 /* ClientCodegenVisitor.kt:237 */
 impl RequiredMemberInput {
     /// Creates a new builder-style object to manufacture [`RequiredMemberInput`](crate::operation::required_member::RequiredMemberInput).
     /// /* BuilderGenerator.kt:173 */Creates a new builder-style object to manufacture [`RequiredMemberInput`](crate::operation::required_member::RequiredMemberInput).
     /* BuilderGenerator.kt:175 */
     pub fn builder() -> crate::operation::required_member::builders::RequiredMemberInputBuilder {
         /* BuilderGenerator.kt:176 */
         crate::operation::required_member::builders::RequiredMemberInputBuilder::default()
         /* BuilderGenerator.kt:175 */
-34
+    }
     /* ClientCodegenVisitor.kt:237 */
-36
+}
-37
 /// A builder for [`RequiredMemberInput`](crate::operation::required_member::RequiredMemberInput).
 /// /* BuilderGenerator.kt:342 */A builder for [`RequiredMemberInput`](crate::operation::required_member::RequiredMemberInput).
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* BuilderGenerator.kt:345 */
 pub struct RequiredMemberInputBuilder {
     pub(crate) required_string: ::std::option::Option<::std::string::String>,
     /* BuilderGenerator.kt:275 */ pub(crate) required_string: ::std::option::Option<::std::string::String>,
     /* BuilderGenerator.kt:345 */
-47
+}
 /* BuilderGenerator.kt:355 */
 impl RequiredMemberInputBuilder {
     /* BuilderGenerator.kt:286 */
     #[allow(missing_docs)] // documentation missing in model
     /// This field is required.
     /// /* BuilderGenerator.kt:288 */This field is required.
     /* BuilderGenerator.kt:291 */
     pub fn required_string(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         /* BuilderGenerator.kt:292 */
         self.required_string = ::std::option::Option::Some(input.into());
         /* BuilderGenerator.kt:293 */
         self
         /* BuilderGenerator.kt:291 */
-60
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_required_string(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.required_string = input;
         self
         /* BuilderGenerator.kt:314 */
-69
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_required_string(&self) -> &::std::option::Option<::std::string::String> {
         /* BuilderGenerator.kt:337 */
         &self.required_string
         /* BuilderGenerator.kt:336 */
-77
+    }
     /// Consumes the builder and constructs a [`RequiredMemberInput`](crate::operation::required_member::RequiredMemberInput).
     /// /* BuilderGenerator.kt:240 */Consumes the builder and constructs a [`RequiredMemberInput`](crate::operation::required_member::RequiredMemberInput).
     /* BuilderGenerator.kt:253 */
     pub fn build(
         self,
     ) -> ::std::result::Result<crate::operation::required_member::RequiredMemberInput, ::aws_smithy_types::error::operation::BuildError> {
         ::std::result::Result::Ok(crate::operation::required_member::RequiredMemberInput {
             required_string: self.required_string,
         })
         /* BuilderGenerator.kt:254 */
         ::std::result::Result::Ok(
             /* BuilderGenerator.kt:477 */
             crate::operation::required_member::RequiredMemberInput {
                 /* BuilderGenerator.kt:481 */ required_string: self.required_string,
                 /* BuilderGenerator.kt:477 */
             }, /* BuilderGenerator.kt:254 */
-+
+        )
         /* BuilderGenerator.kt:253 */
-92
+    }
     /* BuilderGenerator.kt:355 */
-94
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/required_member/_required_member_output.rs

@@ -1,1 +60,99 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* StructureGenerator.kt:197 */
 #[allow(missing_docs)] // documentation missing in model
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct RequiredMemberOutput {
 pub /* StructureGenerator.kt:201 */ struct RequiredMemberOutput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
     pub required_string: ::std::string::String,
     /* StructureGenerator.kt:201 */
-13
+}
 /* StructureGenerator.kt:135 */
 impl RequiredMemberOutput {
     /* StructureGenerator.kt:231 */
     #[allow(missing_docs)] // documentation missing in model
                            /* StructureGenerator.kt:166 */
     pub fn required_string(&self) -> &str {
         /* StructureGenerator.kt:171 */
         use std::ops::Deref;
         self.required_string.deref()
         /* StructureGenerator.kt:166 */
-24
+    }
     /* StructureGenerator.kt:135 */
-26
+}
 /* ClientCodegenVisitor.kt:237 */
 impl RequiredMemberOutput {
     /// Creates a new builder-style object to manufacture [`RequiredMemberOutput`](crate::operation::required_member::RequiredMemberOutput).
     /// /* BuilderGenerator.kt:173 */Creates a new builder-style object to manufacture [`RequiredMemberOutput`](crate::operation::required_member::RequiredMemberOutput).
     /* BuilderGenerator.kt:175 */
     pub fn builder() -> crate::operation::required_member::builders::RequiredMemberOutputBuilder {
         /* BuilderGenerator.kt:176 */
         crate::operation::required_member::builders::RequiredMemberOutputBuilder::default()
         /* BuilderGenerator.kt:175 */
-35
+    }
     /* ClientCodegenVisitor.kt:237 */
-37
+}
-38
 /// A builder for [`RequiredMemberOutput`](crate::operation::required_member::RequiredMemberOutput).
 /// /* BuilderGenerator.kt:342 */A builder for [`RequiredMemberOutput`](crate::operation::required_member::RequiredMemberOutput).
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 /* RustType.kt:516 */
 #[non_exhaustive]
 /* BuilderGenerator.kt:345 */
 pub struct RequiredMemberOutputBuilder {
     pub(crate) required_string: ::std::option::Option<::std::string::String>,
     /* BuilderGenerator.kt:275 */ pub(crate) required_string: ::std::option::Option<::std::string::String>,
     /* BuilderGenerator.kt:345 */
-48
+}
 /* BuilderGenerator.kt:355 */
 impl RequiredMemberOutputBuilder {
     /* BuilderGenerator.kt:286 */
     #[allow(missing_docs)] // documentation missing in model
     /// This field is required.
     /// /* BuilderGenerator.kt:288 */This field is required.
     /* BuilderGenerator.kt:291 */
     pub fn required_string(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         /* BuilderGenerator.kt:292 */
         self.required_string = ::std::option::Option::Some(input.into());
         /* BuilderGenerator.kt:293 */
         self
         /* BuilderGenerator.kt:291 */
-61
+    }
     /* BuilderGenerator.kt:312 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:314 */
     pub fn set_required_string(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         /* BuilderGenerator.kt:315 */
         self.required_string = input;
         self
         /* BuilderGenerator.kt:314 */
-70
+    }
     /* BuilderGenerator.kt:334 */
     #[allow(missing_docs)] // documentation missing in model
                            /* BuilderGenerator.kt:336 */
     pub fn get_required_string(&self) -> &::std::option::Option<::std::string::String> {
         /* BuilderGenerator.kt:337 */
         &self.required_string
         /* BuilderGenerator.kt:336 */
-78
+    }
     /// Consumes the builder and constructs a [`RequiredMemberOutput`](crate::operation::required_member::RequiredMemberOutput).
     /// This method will fail if any of the following fields are not set:
     /// - [`required_string`](crate::operation::required_member::builders::RequiredMemberOutputBuilder::required_string)
     /// /* BuilderGenerator.kt:240 */Consumes the builder and constructs a [`RequiredMemberOutput`](crate::operation::required_member::RequiredMemberOutput).
     /// /* BuilderGenerator.kt:243 */This method will fail if any of the following fields are not set:
     /// /* BuilderGenerator.kt:246 */- [`required_string`](crate::operation::required_member::builders::RequiredMemberOutputBuilder::required_string)
     /* BuilderGenerator.kt:253 */
     pub fn build(
         self,
     ) -> ::std::result::Result<crate::operation::required_member::RequiredMemberOutput, ::aws_smithy_types::error::operation::BuildError> {
         ::std::result::Result::Ok(crate::operation::required_member::RequiredMemberOutput {
             required_string: self.required_string.ok_or_else(|| {
                 ::aws_smithy_types::error::operation::BuildError::missing_field(
                     "required_string",
                     "required_string was not specified but it is required when building RequiredMemberOutput",
--
+                )
             })?,
         })
         /* BuilderGenerator.kt:254 */
         ::std::result::Result::Ok(
             /* BuilderGenerator.kt:477 */crate::operation::required_member::RequiredMemberOutput {
                 /* BuilderGenerator.kt:481 */required_string: self.required_string
                     /* BuilderGenerator.kt:494 */.ok_or_else(||
                         /* BuilderGenerator.kt:117 */::aws_smithy_types::error::operation::BuildError::missing_field("required_string", "required_string was not specified but it is required when building RequiredMemberOutput")
                     /* BuilderGenerator.kt:494 */)?
-+
+                ,
             /* BuilderGenerator.kt:477 */}
         /* BuilderGenerator.kt:254 */)
         /* BuilderGenerator.kt:253 */
-97
+    }
     /* BuilderGenerator.kt:355 */
-99
+}

tmp-codegen-diff/codegen-client-test/rest_xml_extras/rust-client-codegen/src/operation/required_member/builders.rs

@@ -1,1 +125,143 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::required_member::_required_member_output::RequiredMemberOutputBuilder;
-4
 /* CodegenDelegator.kt:255 */
 pub use crate::operation::required_member::_required_member_input::RequiredMemberInputBuilder;
-7
 /* FluentBuilderGenerator.kt:408 */
 impl crate::operation::required_member::builders::RequiredMemberInputBuilder {
     /// Sends a request with this input using the given client.
     pub async fn send_with(
         self,
         client: &crate::Client,
     ) -> ::std::result::Result<
         crate::operation::required_member::RequiredMemberOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::required_member::RequiredMemberError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {
         let mut fluent_builder = client.required_member();
         fluent_builder.inner = self;
         fluent_builder.send().await
-24
+    }
-25
+}
 /// Fluent builder constructing a request to `RequiredMember`.
 /// /* FluentBuilderGenerator.kt:129 */Fluent builder constructing a request to `RequiredMember`.
 ///
 /// This operation tests that we can serialize `required` members.
 /// /* FluentBuilderGenerator.kt:130 */This operation tests that we can serialize `required` members.
 /* RustType.kt:516 */
 #[derive(::std::clone::Clone, ::std::fmt::Debug)]
 /* FluentBuilderGenerator.kt:270 */
 pub struct RequiredMemberFluentBuilder {
     handle: ::std::sync::Arc<crate::client::Handle>,
     inner: crate::operation::required_member::builders::RequiredMemberInputBuilder,
     config_override: ::std::option::Option<crate::config::Builder>,
-36
+}
 /* FluentBuilderGenerator.kt:381 */
 impl
     crate::client::customize::internal::CustomizableSend<
         crate::operation::required_member::RequiredMemberOutput,
         crate::operation::required_member::RequiredMemberError,
     > for RequiredMemberFluentBuilder
-43
+{
     fn send(
         self,
         config_override: crate::config::Builder,
     ) -> crate::client::customize::internal::BoxFuture<
         crate::client::customize::internal::SendResult<
             crate::operation::required_member::RequiredMemberOutput,
             crate::operation::required_member::RequiredMemberError,
         >,
     > {
         ::std::boxed::Box::pin(async move { self.config_override(config_override).send().await })
-54
+    }
-55
+}
 /* FluentBuilderGenerator.kt:282 */
 impl RequiredMemberFluentBuilder {
     /* FluentBuilderGenerator.kt:288 */
     /// Creates a new `RequiredMemberFluentBuilder`.
     pub(crate) fn new(handle: ::std::sync::Arc<crate::client::Handle>) -> Self {
         Self {
             handle,
             inner: ::std::default::Default::default(),
             config_override: ::std::option::Option::None,
-65
+        }
-66
+    }
     /* FluentBuilderGenerator.kt:301 */
     /// Access the RequiredMember as a reference.
     pub fn as_input(&self) -> &crate::operation::required_member::builders::RequiredMemberInputBuilder {
         &self.inner
-71
+    }
     /* FluentBuilderGenerator.kt:145 */
     /// Sends the request and returns the response.
     ///
     /// If an error occurs, an `SdkError` will be returned with additional details that
     /// can be matched against.
     ///
     /// By default, any retryable failures will be retried twice. Retry behavior
     /// is configurable with the [RetryConfig](aws_smithy_types::retry::RetryConfig), which can be
     /// set when configuring the client.
     pub async fn send(
         self,
     ) -> ::std::result::Result<
         crate::operation::required_member::RequiredMemberOutput,
         ::aws_smithy_runtime_api::client::result::SdkError<
             crate::operation::required_member::RequiredMemberError,
             ::aws_smithy_runtime_api::client::orchestrator::HttpResponse,
         >,
     > {
         let input = self
             .inner
             .build()
             .map_err(::aws_smithy_runtime_api::client::result::SdkError::construction_failure)?;
         let runtime_plugins = crate::operation::required_member::RequiredMember::operation_runtime_plugins(
             self.handle.runtime_plugins.clone(),
             &self.handle.conf,
             self.config_override,
         );
         crate::operation::required_member::RequiredMember::orchestrate(&runtime_plugins, input).await
-100
+    }
-101
     /// Consumes this builder, creating a customizable operation that can be modified before being sent.
     pub fn customize(
         self,
     ) -> crate::client::customize::CustomizableOperation<
         crate::operation::required_member::RequiredMemberOutput,
         crate::operation::required_member::RequiredMemberError,
         Self,
     > {
         crate::client::customize::CustomizableOperation::new(self)
-111
+    }
     /* FluentBuilderGenerator.kt:315 */
     pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
         self.set_config_override(::std::option::Option::Some(config_override.into()));
         self
-116
+    }
-117
     pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
         self.config_override = config_override;
         self
-121
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn required_string(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.inner = self.inner.required_string(input.into());
         self
-128
+    }
     /* FluentBuilderGenerator.kt:498 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:500 */
     pub fn set_required_string(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.inner = self.inner.set_required_string(input);
         self
-135
+    }
     /* FluentBuilderGenerator.kt:518 */
     #[allow(missing_docs)] // documentation missing in model
                            /* FluentBuilderGenerator.kt:520 */
     pub fn get_required_string(&self) -> &::std::option::Option<::std::string::String> {
         self.inner.get_required_string()
-141
+    }
     /* FluentBuilderGenerator.kt:282 */
-143
+}

Client Test

Files changed: