Client Test

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)
--
+}

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

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

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_primitive_int_op_input_input(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::operation::primitive_int_op::PrimitiveIntOpInput,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     if let Some(var_1) = &input.value {
         object.key("value").number(
             #[allow(clippy::useless_conversion)]
             ::aws_smithy_types::Number::NegInt((*var_1).into()),
         );
--
+    }
     Ok(())
--
+}

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

@@ -1,0 +49,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_query_precedence_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::query_precedence::QueryPrecedenceOutput, crate::operation::query_precedence::QueryPrecedenceError> {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::query_precedence::QueryPrecedenceError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::query_precedence::QueryPrecedenceError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ExtraError" => crate::operation::query_precedence::QueryPrecedenceError::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::query_precedence::QueryPrecedenceError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::query_precedence::QueryPrecedenceError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_query_precedence_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::query_precedence::QueryPrecedenceOutput, crate::operation::query_precedence::QueryPrecedenceError> {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::query_precedence::builders::QueryPrecedenceOutputBuilder::default();
         output.build()
     })
--
+}

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

@@ -1,0 +64,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_single_element_union<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<Option<crate::types::SingleElementUnion>, ::aws_smithy_json::deserialize::error::DeserializeError>
 where
     I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
--
+{
     let mut variant = None;
     match tokens.next().transpose()? {
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => return Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => loop {
             match tokens.next().transpose()? {
                 Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                 Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                     if let ::std::option::Option::Some(::std::result::Result::Ok(::aws_smithy_json::deserialize::Token::ValueNull { .. })) =
                         tokens.peek()
--
+                    {
                         let _ = tokens.next().expect("peek returned a token")?;
                         continue;
--
+                    }
                     let key = key.to_unescaped()?;
                     if key == "__type" {
                         ::aws_smithy_json::deserialize::token::skip_value(tokens)?;
                         continue;
--
+                    }
                     if variant.is_some() {
                         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
                             "encountered mixed variants in union",
                         ));
--
+                    }
                     variant = match key.as_ref() {
                         "a" => Some(crate::types::SingleElementUnion::A(
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                                 .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                 .transpose()?
                                 .ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'a' cannot be null"))?,
                         )),
                         _ => {
                             ::aws_smithy_json::deserialize::token::skip_value(tokens)?;
                             Some(crate::types::SingleElementUnion::Unknown)
--
+                        }
                     };
--
+                }
                 other => {
                     return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )))
--
+                }
--
+            }
         },
         _ => {
             return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "expected start object or null",
             ))
--
+        }
--
+    }
     if variant.is_none() {
         return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
             "Union did not contain a valid variant.",
         ));
--
+    }
     Ok(variant)
--
+}

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

@@ -1,0 +50,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_status_response_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::status_response::StatusResponseOutput, crate::operation::status_response::StatusResponseError> {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::status_response::StatusResponseError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::status_response::StatusResponseError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ExtraError" => crate::operation::status_response::StatusResponseError::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::status_response::StatusResponseError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::status_response::StatusResponseError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_status_response_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::status_response::StatusResponseOutput, crate::operation::status_response::StatusResponseError> {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::status_response::builders::StatusResponseOutputBuilder::default();
         output = output.set_field(Some(_response_status as _));
         output.build()
     })
--
+}

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

@@ -1,0 +50,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_string_payload_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::string_payload::StringPayloadOutput, crate::operation::string_payload::StringPayloadError> {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::string_payload::StringPayloadError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::string_payload::StringPayloadError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ExtraError" => crate::operation::string_payload::StringPayloadError::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::string_payload::StringPayloadError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         _ => crate::operation::string_payload::StringPayloadError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_string_payload_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::string_payload::StringPayloadOutput, crate::operation::string_payload::StringPayloadError> {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::string_payload::builders::StringPayloadOutputBuilder::default();
         output = output.set_payload(crate::protocol_serde::shape_string_payload_output::de_payload_payload(_response_body)?);
         output.build()
     })
--
+}

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

@@ -1,0 +10,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn ser_payload_http_payload(
     payload: ::std::option::Option<::std::string::String>,
 ) -> ::std::result::Result<::std::vec::Vec<u8>, ::aws_smithy_types::error::operation::BuildError> {
     let payload = match payload {
         Some(t) => t,
         None => return Ok(Vec::new()),
     };
     Ok(payload.into_bytes())
--
+}

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

@@ -1,0 +11,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_payload_payload(
     body: &[u8],
 ) -> std::result::Result<::std::option::Option<::std::string::String>, crate::operation::string_payload::StringPayloadError> {
     (!body.is_empty())
         .then(|| {
             let body_str = std::str::from_utf8(body).map_err(crate::operation::string_payload::StringPayloadError::unhandled)?;
             Ok(body_str.to_string())
         })
         .transpose()
--
+}

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

@@ -1,0 +40,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_validation_exception_json_err(
     _value: &[u8],
     mut builder: crate::types::error::builders::ValidationErrorBuilder,
 ) -> ::std::result::Result<crate::types::error::builders::ValidationErrorBuilder, ::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()?,
                     );
--
+                }
                 "fieldList" => {
                     builder = builder.set_field_list(
                         crate::protocol_serde::shape_validation_exception_field_list::de_validation_exception_field_list(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_validation_exception_field.rs

@@ -1,0 +51,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_validation_exception_field<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<Option<crate::types::ValidationExceptionField>, ::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::ValidationExceptionFieldBuilder::default();
             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() {
                         "path" => {
                             builder = builder.set_path(
                                 ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?,
                             );
--
+                        }
                         "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:?}"
                         )))
--
+                    }
--
+                }
--
+            }
             Ok(Some(
                 crate::serde_util::validation_exception_field_correct_errors(builder)
                     .build()
                     .map_err(|err| ::aws_smithy_json::deserialize::error::DeserializeError::custom_source("Response was invalid", err))?,
             ))
--
+        }
         _ => 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_validation_exception_field_list.rs

@@ -1,0 +37,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_validation_exception_field_list<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<Option<::std::vec::Vec<crate::types::ValidationExceptionField>>, ::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 = crate::protocol_serde::shape_validation_exception_field::de_validation_exception_field(tokens, _value)?;
                         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/serde_util.rs

@@ -1,0 +30,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn validation_exception_correct_errors(
     mut builder: crate::types::error::builders::ValidationErrorBuilder,
 ) -> crate::types::error::builders::ValidationErrorBuilder {
     if builder.message.is_none() {
         builder.message = Some(Default::default())
--
+    }
     builder
--
+}
--
 pub(crate) fn primitive_int_header_output_output_correct_errors(
     mut builder: crate::operation::primitive_int_header::builders::PrimitiveIntHeaderOutputBuilder,
 ) -> crate::operation::primitive_int_header::builders::PrimitiveIntHeaderOutputBuilder {
     if builder.field.is_none() {
         builder.field = Some(Default::default())
--
+    }
     builder
--
+}
--
 pub(crate) fn validation_exception_field_correct_errors(
     mut builder: crate::types::builders::ValidationExceptionFieldBuilder,
 ) -> crate::types::builders::ValidationExceptionFieldBuilder {
     if builder.path.is_none() {
         builder.path = Some(Default::default())
--
+    }
     if builder.message.is_none() {
         builder.message = Some(Default::default())
--
+    }
     builder
--
+}

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

@@ -1,0 +89,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
--
 #![allow(dead_code)]
--
 use aws_smithy_http::header::set_request_header_if_absent;
 use aws_smithy_types::config_bag::{Storable, StoreReplace};
 use http_1x::header::{HeaderName, CONTENT_LENGTH, CONTENT_TYPE};
--
 /// Configuration for how default protocol headers are serialized
 #[derive(Clone, Debug, Default)]
 pub(crate) struct HeaderSerializationSettings {
     omit_default_content_length: bool,
     omit_default_content_type: bool,
--
+}
--
 impl HeaderSerializationSettings {
     /// Creates new [`HeaderSerializationSettings`]
     pub(crate) fn new() -> Self {
         Default::default()
--
+    }
--
     /// Omit the default `Content-Length` header during serialization
     pub(crate) fn omit_default_content_length(self) -> Self {
         Self {
             omit_default_content_length: true,
             ..self
--
+        }
--
+    }
--
     /// Omit the default `Content-Type` header during serialization
     pub(crate) fn omit_default_content_type(self) -> Self {
         Self {
             omit_default_content_type: true,
             ..self
--
+        }
--
+    }
--
     /// Returns true if the given default header name should be serialized
     fn include_header(&self, header: &HeaderName) -> bool {
         (!self.omit_default_content_length || header != CONTENT_LENGTH) && (!self.omit_default_content_type || header != CONTENT_TYPE)
--
+    }
--
     /// Sets a default header on the given request builder if it should be serialized
     pub(crate) fn set_default_header(
         &self,
         mut request: http_1x::request::Builder,
         header_name: HeaderName,
         value: &str,
     ) -> http_1x::request::Builder {
         if self.include_header(&header_name) {
             request = set_request_header_if_absent(request, header_name, value);
--
+        }
         request
--
+    }
--
+}
--
 impl Storable for HeaderSerializationSettings {
     type Storer = StoreReplace<Self>;
--
+}
--
 #[cfg(test)]
 mod tests {
     use super::*;
--
     #[test]
     fn test_include_header() {
         let settings = HeaderSerializationSettings::default();
         assert!(settings.include_header(&CONTENT_LENGTH));
         assert!(settings.include_header(&CONTENT_TYPE));
--
         let settings = HeaderSerializationSettings::default().omit_default_content_length();
         assert!(!settings.include_header(&CONTENT_LENGTH));
         assert!(settings.include_header(&CONTENT_TYPE));
--
         let settings = HeaderSerializationSettings::default().omit_default_content_type();
         assert!(settings.include_header(&CONTENT_LENGTH));
         assert!(!settings.include_header(&CONTENT_TYPE));
--
         let settings = HeaderSerializationSettings::default()
             .omit_default_content_type()
             .omit_default_content_length();
         assert!(!settings.include_header(&CONTENT_LENGTH));
         assert!(!settings.include_header(&CONTENT_TYPE));
--
+    }
--
+}

tmp-codegen-diff/codegen-client-test/rest_json_extras/rust-client-codegen/src/types/_empty_struct.rs

@@ -1,1 +62,73 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(missing_docs)] // documentation missing in model
 #[non_exhaustive]
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct EmptyStruct {}
 static EMPTYSTRUCT_SCHEMA_ID: ::aws_smithy_schema::ShapeId =
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#EmptyStruct", "aws.protocoltests.restjson", "EmptyStruct");
 static EMPTYSTRUCT_SCHEMA: ::aws_smithy_schema::Schema =
     ::aws_smithy_schema::Schema::new_struct(EMPTYSTRUCT_SCHEMA_ID, ::aws_smithy_schema::ShapeType::Structure, &[]);
 impl EmptyStruct {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &EMPTYSTRUCT_SCHEMA;
-13
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for EmptyStruct {

     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         Ok(())
-21
+    }
-22
+}
 impl EmptyStruct {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&EMPTYSTRUCT_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&EMPTYSTRUCT_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 _ => {}
-40
+            }
             Ok(())
         })?;
         Ok(builder.build())
-44
+    }
-45
+}
 impl EmptyStruct {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         _deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Ok(Self::builder().build())
-+
+    }
-+
+}
 impl EmptyStruct {
     /// Creates a new builder-style object to manufacture [`EmptyStruct`](crate::types::EmptyStruct).
     pub fn builder() -> crate::types::builders::EmptyStructBuilder {
         crate::types::builders::EmptyStructBuilder::default()
-61
+    }
-62
+}
-63
 /// A builder for [`EmptyStruct`](crate::types::EmptyStruct).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct EmptyStructBuilder {}
 impl EmptyStructBuilder {
     /// Consumes the builder and constructs a [`EmptyStruct`](crate::types::EmptyStruct).
     pub fn build(self) -> crate::types::EmptyStruct {
         crate::types::EmptyStruct {}
-72
+    }
-73
+}

Client Test

Files changed: