Client Test

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_case_insensitive_error_operation.rs

@@ -1,0 +70,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_case_insensitive_error_operation_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationOutput,
     crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError,
 > {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "CaseInsensitiveError" => crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError::CaseInsensitiveError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::CaseInsensitiveErrorBuilder::default();
                 output = crate::protocol_serde::shape_case_insensitive_error::de_case_insensitive_error_json_err(_response_body, output)
                     .map_err(crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         "ExtraError" => crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError::ExtraError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ExtraErrorBuilder::default();
                 output = crate::protocol_serde::shape_extra_error::de_extra_error_json_err(_response_body, output)
                     .map_err(crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_case_insensitive_error_operation_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationOutput,
     crate::operation::case_insensitive_error_operation::CaseInsensitiveErrorOperationError,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::case_insensitive_error_operation::builders::CaseInsensitiveErrorOperationOutputBuilder::default();
         output.build()
     })
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_empty_struct.rs

@@ -1,0 +21,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_empty_struct<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<Option<crate::types::EmptyStruct>, ::aws_smithy_json::deserialize::error::DeserializeError>
 where
     I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
--
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             #[allow(unused_mut)]
             let mut builder = crate::types::builders::EmptyStructBuilder::default();
             ::aws_smithy_json::deserialize::token::skip_to_end(tokens)?;
             Ok(Some(builder.build()))
--
+        }
         _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "expected start object or null",
         )),
--
+    }
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_empty_struct_with_content_on_wire_op.rs

@@ -1,0 +91,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_empty_struct_with_content_on_wire_op_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpOutput,
     crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpError,
 > {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ExtraError" => crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpError::ExtraError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ExtraErrorBuilder::default();
                 output = crate::protocol_serde::shape_extra_error::de_extra_error_json_err(_response_body, output)
                     .map_err(crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_empty_struct_with_content_on_wire_op_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpOutput,
     crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpError,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::empty_struct_with_content_on_wire_op::builders::EmptyStructWithContentOnWireOpOutputBuilder::default();
         output = crate::protocol_serde::shape_empty_struct_with_content_on_wire_op::de_empty_struct_with_content_on_wire_op(_response_body, output)
             .map_err(crate::operation::empty_struct_with_content_on_wire_op::EmptyStructWithContentOnWireOpError::unhandled)?;
         output.build()
     })
--
+}
--
 pub(crate) fn de_empty_struct_with_content_on_wire_op(
     _value: &[u8],
     mut builder: crate::operation::empty_struct_with_content_on_wire_op::builders::EmptyStructWithContentOnWireOpOutputBuilder,
 ) -> ::std::result::Result<
     crate::operation::empty_struct_with_content_on_wire_op::builders::EmptyStructWithContentOnWireOpOutputBuilder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(_value)).peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     loop {
         match tokens.next().transpose()? {
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
                 "empty" => {
                     builder = builder.set_empty(crate::protocol_serde::shape_empty_struct::de_empty_struct(tokens, _value)?);
--
+                }
                 _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
             },
             other => {
                 return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                     "expected object key or end object, found: {other:?}"
                 )))
--
+            }
--
+        }
--
+    }
     if tokens.next().is_some() {
         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "found more JSON tokens after completing parsing",
         ));
--
+    }
     Ok(builder)
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_enum_query.rs

@@ -1,0 +63,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_enum_query_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::enum_query::EnumQueryOutput, crate::operation::enum_query::EnumQueryError> {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::enum_query::EnumQueryError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::enum_query::EnumQueryError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ValidationException" => crate::operation::enum_query::EnumQueryError::ValidationError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
                 output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
                     .map_err(crate::operation::enum_query::EnumQueryError::unhandled)?;
                 let output = output.meta(generic);
                 crate::serde_util::validation_exception_correct_errors(output)
                     .build()
                     .map_err(crate::operation::enum_query::EnumQueryError::unhandled)?
             };
             tmp
         }),
         "ExtraError" => crate::operation::enum_query::EnumQueryError::ExtraError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ExtraErrorBuilder::default();
                 output = crate::protocol_serde::shape_extra_error::de_extra_error_json_err(_response_body, output)
                     .map_err(crate::operation::enum_query::EnumQueryError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::enum_query::EnumQueryError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_enum_query_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::enum_query::EnumQueryOutput, crate::operation::enum_query::EnumQueryError> {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::enum_query::builders::EnumQueryOutputBuilder::default();
         output.build()
     })
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_escaped_string_values.rs

@@ -1,0 +126,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_escaped_string_values_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::escaped_string_values::EscapedStringValuesOutput,
     crate::operation::escaped_string_values::EscapedStringValuesError,
 > {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::escaped_string_values::EscapedStringValuesError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::escaped_string_values::EscapedStringValuesError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ValidationException" => crate::operation::escaped_string_values::EscapedStringValuesError::ValidationError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
                 output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
                     .map_err(crate::operation::escaped_string_values::EscapedStringValuesError::unhandled)?;
                 let output = output.meta(generic);
                 crate::serde_util::validation_exception_correct_errors(output)
                     .build()
                     .map_err(crate::operation::escaped_string_values::EscapedStringValuesError::unhandled)?
             };
             tmp
         }),
         "ExtraError" => crate::operation::escaped_string_values::EscapedStringValuesError::ExtraError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ExtraErrorBuilder::default();
                 output = crate::protocol_serde::shape_extra_error::de_extra_error_json_err(_response_body, output)
                     .map_err(crate::operation::escaped_string_values::EscapedStringValuesError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::escaped_string_values::EscapedStringValuesError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_escaped_string_values_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::escaped_string_values::EscapedStringValuesOutput,
     crate::operation::escaped_string_values::EscapedStringValuesError,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::escaped_string_values::builders::EscapedStringValuesOutputBuilder::default();
         output = crate::protocol_serde::shape_escaped_string_values::de_escaped_string_values(_response_body, output)
             .map_err(crate::operation::escaped_string_values::EscapedStringValuesError::unhandled)?;
         output.build()
     })
--
+}
--
 pub fn ser_escaped_string_values_input(
     input: &crate::operation::escaped_string_values::EscapedStringValuesInput,
 ) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
     let mut out = String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     crate::protocol_serde::shape_escaped_string_values_input::ser_escaped_string_values_input_input(&mut object, input)?;
     object.finish();
     Ok(::aws_smithy_types::body::SdkBody::from(out))
--
+}
--
 pub(crate) fn de_escaped_string_values(
     _value: &[u8],
     mut builder: crate::operation::escaped_string_values::builders::EscapedStringValuesOutputBuilder,
 ) -> ::std::result::Result<
     crate::operation::escaped_string_values::builders::EscapedStringValuesOutputBuilder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(_value)).peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     loop {
         match tokens.next().transpose()? {
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
                 "enum" => {
                     builder = builder.set_enum(
                         ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                             .map(|s| s.to_unescaped().map(|u| crate::types::EnumWithEscapedChars::from(u.as_ref())))
                             .transpose()?,
                     );
--
+                }
                 "also\"has\"quotes" => {
                     builder = builder.set_some_string(
                         ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                             .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                             .transpose()?,
                     );
--
+                }
                 _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
             },
             other => {
                 return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                     "expected object key or end object, found: {other:?}"
                 )))
--
+            }
--
+        }
--
+    }
     if tokens.next().is_some() {
         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "found more JSON tokens after completing parsing",
         ));
--
+    }
     Ok(builder)
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_escaped_string_values_input.rs

@@ -1,0 +13,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_escaped_string_values_input_input(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::operation::escaped_string_values::EscapedStringValuesInput,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     if let Some(var_1) = &input.r#enum {
         object.key("enum").string(var_1.as_str());
--
+    }
     if let Some(var_2) = &input.some_string {
         object.key("also\"has\"quotes").string(var_2.as_str());
--
+    }
     Ok(())
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_extra_error.rs

@@ -1,0 +35,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_extra_error_json_err(
     _value: &[u8],
     mut builder: crate::types::error::builders::ExtraErrorBuilder,
 ) -> ::std::result::Result<crate::types::error::builders::ExtraErrorBuilder, ::aws_smithy_json::deserialize::error::DeserializeError> {
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(_value)).peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     loop {
         match tokens.next().transpose()? {
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
                 "Message" => {
                     builder = builder.set_message(
                         ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                             .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                             .transpose()?,
                     );
--
+                }
                 _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
             },
             other => {
                 return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                     "expected object key or end object, found: {other:?}"
                 )))
--
+            }
--
+        }
--
+    }
     if tokens.next().is_some() {
         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "found more JSON tokens after completing parsing",
         ));
--
+    }
     Ok(builder)
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_map_with_enum_key.rs

@@ -1,0 +48,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_map_with_enum_key<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<::std::collections::HashMap<crate::types::StringEnum, ::std::string::String>>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
--
+>
 where
     I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
--
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             let mut map = ::std::collections::HashMap::new();
             loop {
                 match tokens.next().transpose()? {
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         let key = key.to_unescaped().map(|u| crate::types::StringEnum::from(u.as_ref()))?;
                         let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                             .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                             .transpose()?;
                         match value {
                             Some(value) => {
                                 map.insert(key, value);
--
+                            }
                             None => {
                                 return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense map cannot contain null values",
                                 ))
--
+                            }
--
+                        }
--
+                    }
                     other => {
                         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                             "expected object key or end object, found: {other:?}"
                         )))
--
+                    }
--
+                }
--
+            }
             Ok(Some(map))
--
+        }
         _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "expected start object or null",
         )),
--
+    }
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_map_with_enum_key_op.rs

@@ -1,0 +111,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_map_with_enum_key_op_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::map_with_enum_key_op::MapWithEnumKeyOpOutput, crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError>
--
+{
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ValidationException" => crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::ValidationError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
                 output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
                     .map_err(crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::unhandled)?;
                 let output = output.meta(generic);
                 crate::serde_util::validation_exception_correct_errors(output)
                     .build()
                     .map_err(crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::unhandled)?
             };
             tmp
         }),
         "ExtraError" => crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::ExtraError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ExtraErrorBuilder::default();
                 output = crate::protocol_serde::shape_extra_error::de_extra_error_json_err(_response_body, output)
                     .map_err(crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_map_with_enum_key_op_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::map_with_enum_key_op::MapWithEnumKeyOpOutput, crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError>
--
+{
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::map_with_enum_key_op::builders::MapWithEnumKeyOpOutputBuilder::default();
         output = crate::protocol_serde::shape_map_with_enum_key_op::de_map_with_enum_key_op(_response_body, output)
             .map_err(crate::operation::map_with_enum_key_op::MapWithEnumKeyOpError::unhandled)?;
         output.build()
     })
--
+}
--
 pub fn ser_map_with_enum_key_op_input(
     input: &crate::operation::map_with_enum_key_op::MapWithEnumKeyOpInput,
 ) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
     let mut out = String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     crate::protocol_serde::shape_map_with_enum_key_op_input::ser_map_with_enum_key_op_input_input(&mut object, input)?;
     object.finish();
     Ok(::aws_smithy_types::body::SdkBody::from(out))
--
+}
--
 pub(crate) fn de_map_with_enum_key_op(
     _value: &[u8],
     mut builder: crate::operation::map_with_enum_key_op::builders::MapWithEnumKeyOpOutputBuilder,
 ) -> ::std::result::Result<
     crate::operation::map_with_enum_key_op::builders::MapWithEnumKeyOpOutputBuilder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(_value)).peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     loop {
         match tokens.next().transpose()? {
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
                 "map" => {
                     builder = builder.set_map(crate::protocol_serde::shape_map_with_enum_key::de_map_with_enum_key(tokens, _value)?);
--
+                }
                 _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
             },
             other => {
                 return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                     "expected object key or end object, found: {other:?}"
                 )))
--
+            }
--
+        }
--
+    }
     if tokens.next().is_some() {
         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "found more JSON tokens after completing parsing",
         ));
--
+    }
     Ok(builder)
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_map_with_enum_key_op_input.rs

@@ -1,0 +17,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_map_with_enum_key_op_input_input(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::operation::map_with_enum_key_op::MapWithEnumKeyOpInput,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     if let Some(var_1) = &input.map {
         #[allow(unused_mut)]
         let mut object_2 = object.key("map").start_object();
         for (key_3, value_4) in var_1 {
--
+            {
                 object_2.key(key_3.as_str()).string(value_4.as_str());
--
+            }
--
+        }
         object_2.finish();
--
+    }
     Ok(())
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_non_sparse_list.rs

@@ -1,0 +39,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_non_sparse_list<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<Option<::std::vec::Vec<::std::string::String>>, ::aws_smithy_json::deserialize::error::DeserializeError>
 where
     I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
--
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             let mut items = Vec::new();
             loop {
                 match tokens.peek() {
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         tokens.next().transpose().unwrap();
                         break;
--
+                    }
                     _ => {
                         let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                             .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                             .transpose()?;
                         if let Some(value) = value {
                             items.push(value);
                         } else {
                             return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 "dense list cannot contain null values",
                             ));
--
+                        }
--
+                    }
--
+                }
--
+            }
             Ok(Some(items))
--
+        }
         _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "expected start array or null",
         )),
--
+    }
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_non_sparse_map.rs

@@ -1,0 +48,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_non_sparse_map<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<::std::collections::HashMap<::std::string::String, ::std::string::String>>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
--
+>
 where
     I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
--
+{
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             let mut map = ::std::collections::HashMap::new();
             loop {
                 match tokens.next().transpose()? {
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         let key = key.to_unescaped().map(|u| u.into_owned())?;
                         let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                             .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                             .transpose()?;
                         match value {
                             Some(value) => {
                                 map.insert(key, value);
--
+                            }
                             None => {
                                 return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense map cannot contain null values",
                                 ))
--
+                            }
--
+                        }
--
+                    }
                     other => {
                         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                             "expected object key or end object, found: {other:?}"
                         )))
--
+                    }
--
+                }
--
+            }
             Ok(Some(map))
--
+        }
         _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "expected start object or null",
         )),
--
+    }
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_null_in_non_sparse.rs

@@ -1,0 +93,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_null_in_non_sparse_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::null_in_non_sparse::NullInNonSparseOutput, crate::operation::null_in_non_sparse::NullInNonSparseError> {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::null_in_non_sparse::NullInNonSparseError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::null_in_non_sparse::NullInNonSparseError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ExtraError" => crate::operation::null_in_non_sparse::NullInNonSparseError::ExtraError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ExtraErrorBuilder::default();
                 output = crate::protocol_serde::shape_extra_error::de_extra_error_json_err(_response_body, output)
                     .map_err(crate::operation::null_in_non_sparse::NullInNonSparseError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::null_in_non_sparse::NullInNonSparseError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_null_in_non_sparse_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::null_in_non_sparse::NullInNonSparseOutput, crate::operation::null_in_non_sparse::NullInNonSparseError> {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::null_in_non_sparse::builders::NullInNonSparseOutputBuilder::default();
         output = crate::protocol_serde::shape_null_in_non_sparse::de_null_in_non_sparse(_response_body, output)
             .map_err(crate::operation::null_in_non_sparse::NullInNonSparseError::unhandled)?;
         output.build()
     })
--
+}
--
 pub(crate) fn de_null_in_non_sparse(
     _value: &[u8],
     mut builder: crate::operation::null_in_non_sparse::builders::NullInNonSparseOutputBuilder,
 ) -> ::std::result::Result<
     crate::operation::null_in_non_sparse::builders::NullInNonSparseOutputBuilder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(_value)).peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     loop {
         match tokens.next().transpose()? {
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
                 "list" => {
                     builder = builder.set_list(crate::protocol_serde::shape_non_sparse_list::de_non_sparse_list(tokens, _value)?);
--
+                }
                 "map" => {
                     builder = builder.set_map(crate::protocol_serde::shape_non_sparse_map::de_non_sparse_map(tokens, _value)?);
--
+                }
                 "union" => {
                     builder = builder.set_union(crate::protocol_serde::shape_single_element_union::de_single_element_union(
                         tokens, _value,
                     )?);
--
+                }
                 _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
             },
             other => {
                 return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                     "expected object key or end object, found: {other:?}"
                 )))
--
+            }
--
+        }
--
+    }
     if tokens.next().is_some() {
         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "found more JSON tokens after completing parsing",
         ));
--
+    }
     Ok(builder)
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_primitive_int_header.rs

@@ -1,0 +74,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_primitive_int_header_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::primitive_int_header::PrimitiveIntHeaderOutput,
     crate::operation::primitive_int_header::PrimitiveIntHeaderError,
 > {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::primitive_int_header::PrimitiveIntHeaderError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::primitive_int_header::PrimitiveIntHeaderError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ValidationException" => crate::operation::primitive_int_header::PrimitiveIntHeaderError::ValidationError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
                 output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
                     .map_err(crate::operation::primitive_int_header::PrimitiveIntHeaderError::unhandled)?;
                 let output = output.meta(generic);
                 crate::serde_util::validation_exception_correct_errors(output)
                     .build()
                     .map_err(crate::operation::primitive_int_header::PrimitiveIntHeaderError::unhandled)?
             };
             tmp
         }),
         "ExtraError" => crate::operation::primitive_int_header::PrimitiveIntHeaderError::ExtraError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ExtraErrorBuilder::default();
                 output = crate::protocol_serde::shape_extra_error::de_extra_error_json_err(_response_body, output)
                     .map_err(crate::operation::primitive_int_header::PrimitiveIntHeaderError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::primitive_int_header::PrimitiveIntHeaderError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_primitive_int_header_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::primitive_int_header::PrimitiveIntHeaderOutput,
     crate::operation::primitive_int_header::PrimitiveIntHeaderError,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::primitive_int_header::builders::PrimitiveIntHeaderOutputBuilder::default();
         output = output.set_field(
             crate::protocol_serde::shape_primitive_int_header_output::de_field_header(_response_headers).map_err(|_| {
                 crate::operation::primitive_int_header::PrimitiveIntHeaderError::unhandled("Failed to parse field from header `x-field")
             })?,
         );
         crate::serde_util::primitive_int_header_output_output_correct_errors(output).build()
     })
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_primitive_int_header_output.rs

@@ -1,0 +16,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_field_header(
     header_map: &::aws_smithy_runtime_api::http::Headers,
 ) -> ::std::result::Result<::std::option::Option<i32>, ::aws_smithy_http::header::ParseError> {
     let headers = header_map.get_all("x-field");
     let var_1 = ::aws_smithy_http::header::read_many_primitive::<i32>(headers)?;
     if var_1.len() > 1 {
         Err(::aws_smithy_http::header::ParseError::new(format!(
             "expected one item but found {}",
             var_1.len()
         )))
     } else {
         let mut var_1 = var_1;
         Ok(var_1.pop())
--
+    }
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/protocol_serde/shape_primitive_int_op.rs

@@ -1,0 +99,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_primitive_int_op_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::primitive_int_op::PrimitiveIntOpOutput, crate::operation::primitive_int_op::PrimitiveIntOpError> {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::primitive_int_op::PrimitiveIntOpError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::primitive_int_op::PrimitiveIntOpError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ExtraError" => crate::operation::primitive_int_op::PrimitiveIntOpError::ExtraError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ExtraErrorBuilder::default();
                 output = crate::protocol_serde::shape_extra_error::de_extra_error_json_err(_response_body, output)
                     .map_err(crate::operation::primitive_int_op::PrimitiveIntOpError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::primitive_int_op::PrimitiveIntOpError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_primitive_int_op_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::primitive_int_op::PrimitiveIntOpOutput, crate::operation::primitive_int_op::PrimitiveIntOpError> {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::primitive_int_op::builders::PrimitiveIntOpOutputBuilder::default();
         output = crate::protocol_serde::shape_primitive_int_op::de_primitive_int_op(_response_body, output)
             .map_err(crate::operation::primitive_int_op::PrimitiveIntOpError::unhandled)?;
         output.build()
     })
--
+}
--
 pub fn ser_primitive_int_op_input(
     input: &crate::operation::primitive_int_op::PrimitiveIntOpInput,
 ) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
     let mut out = String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     crate::protocol_serde::shape_primitive_int_op_input::ser_primitive_int_op_input_input(&mut object, input)?;
     object.finish();
     Ok(::aws_smithy_types::body::SdkBody::from(out))
--
+}
--
 pub(crate) fn de_primitive_int_op(
     _value: &[u8],
     mut builder: crate::operation::primitive_int_op::builders::PrimitiveIntOpOutputBuilder,
 ) -> ::std::result::Result<
     crate::operation::primitive_int_op::builders::PrimitiveIntOpOutputBuilder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(_value)).peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     loop {
         match tokens.next().transpose()? {
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
                 "value" => {
                     builder = builder.set_value(
                         ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
                             .map(i32::try_from)
                             .transpose()?,
                     );
--
+                }
                 _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
             },
             other => {
                 return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                     "expected object key or end object, found: {other:?}"
                 )))
--
+            }
--
+        }
--
+    }
     if tokens.next().is_some() {
         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "found more JSON tokens after completing parsing",
         ));
--
+    }
     Ok(builder)
--
+}

Client Test

Files changed: