Client Test

tmp-codegen-diff/codegen-client-test/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_do_nothing.rs

@@ -1,0 +26,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_do_nothing_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::do_nothing::DoNothingOutput, crate::operation::do_nothing::DoNothingError> {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::do_nothing::DoNothingError::unhandled)?;
     let generic = generic_builder.build();
     Err(crate::operation::do_nothing::DoNothingError::generic(generic))
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_do_nothing_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::do_nothing::DoNothingOutput, crate::operation::do_nothing::DoNothingError> {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::do_nothing::builders::DoNothingOutputBuilder::default();
         output.build()
     })
--
+}

tmp-codegen-diff/codegen-client-test/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_flavor_text.rs

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

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_flavor_text<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<Option<crate::types::FlavorText>, ::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::FlavorTextBuilder::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() {
                         "flavorText" => {
                             builder = builder.set_flavor_text(
                                 ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?,
                             );
--
+                        }
                         "language" => {
                             builder = builder.set_language(
                                 ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
                                     .map(|s| s.to_unescaped().map(|u| crate::types::Language::from(u.as_ref())))
                                     .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::flavor_text_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/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_flavor_text_entries.rs

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

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_flavor_text_entries<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<Option<::std::vec::Vec<crate::types::FlavorText>>, ::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_flavor_text::de_flavor_text(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/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_get_pokemon_species.rs

@@ -1,0 +110,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_get_pokemon_species_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::get_pokemon_species::GetPokemonSpeciesOutput, crate::operation::get_pokemon_species::GetPokemonSpeciesError>
--
+{
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ResourceNotFoundException" => crate::operation::get_pokemon_species::GetPokemonSpeciesError::ResourceNotFoundError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ResourceNotFoundErrorBuilder::default();
                 output = crate::protocol_serde::shape_resource_not_found_exception::de_resource_not_found_exception_json_err(_response_body, output)
                     .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
                 let output = output.meta(generic);
                 crate::serde_util::resource_not_found_exception_correct_errors(output)
                     .build()
                     .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?
             };
             tmp
         }),
         "ValidationException" => crate::operation::get_pokemon_species::GetPokemonSpeciesError::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::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
                 let output = output.meta(generic);
                 crate::serde_util::validation_exception_correct_errors(output)
                     .build()
                     .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?
             };
             tmp
         }),
         _ => crate::operation::get_pokemon_species::GetPokemonSpeciesError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_get_pokemon_species_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::get_pokemon_species::GetPokemonSpeciesOutput, crate::operation::get_pokemon_species::GetPokemonSpeciesError>
--
+{
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::get_pokemon_species::builders::GetPokemonSpeciesOutputBuilder::default();
         output = crate::protocol_serde::shape_get_pokemon_species::de_get_pokemon_species(_response_body, output)
             .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
         crate::serde_util::get_pokemon_species_output_output_correct_errors(output)
             .build()
             .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?
     })
--
+}
--
 pub(crate) fn de_get_pokemon_species(
     _value: &[u8],
     mut builder: crate::operation::get_pokemon_species::builders::GetPokemonSpeciesOutputBuilder,
 ) -> ::std::result::Result<
     crate::operation::get_pokemon_species::builders::GetPokemonSpeciesOutputBuilder,
     ::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() {
                 "flavorTextEntries" => {
                     builder =
                         builder.set_flavor_text_entries(crate::protocol_serde::shape_flavor_text_entries::de_flavor_text_entries(tokens, _value)?);
--
+                }
                 "name" => {
                     builder = builder.set_name(
                         ::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/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_get_server_statistics.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_get_server_statistics_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::get_server_statistics::GetServerStatisticsOutput,
     crate::operation::get_server_statistics::GetServerStatisticsError,
 > {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::get_server_statistics::GetServerStatisticsError::unhandled)?;
     let generic = generic_builder.build();
     Err(crate::operation::get_server_statistics::GetServerStatisticsError::generic(generic))
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_get_server_statistics_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::get_server_statistics::GetServerStatisticsOutput,
     crate::operation::get_server_statistics::GetServerStatisticsError,
 > {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::get_server_statistics::builders::GetServerStatisticsOutputBuilder::default();
         output = crate::protocol_serde::shape_get_server_statistics::de_get_server_statistics(_response_body, output)
             .map_err(crate::operation::get_server_statistics::GetServerStatisticsError::unhandled)?;
         crate::serde_util::get_server_statistics_output_output_correct_errors(output)
             .build()
             .map_err(crate::operation::get_server_statistics::GetServerStatisticsError::unhandled)?
     })
--
+}
--
 pub(crate) fn de_get_server_statistics(
     _value: &[u8],
     mut builder: crate::operation::get_server_statistics::builders::GetServerStatisticsOutputBuilder,
 ) -> ::std::result::Result<
     crate::operation::get_server_statistics::builders::GetServerStatisticsOutputBuilder,
     ::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() {
                 "calls_count" => {
                     builder = builder.set_calls_count(
                         ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
                             .map(i64::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/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_get_storage.rs

@@ -1,0 +132,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_get_storage_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::get_storage::GetStorageOutput, crate::operation::get_storage::GetStorageError> {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
     let generic = generic_builder.build();
     let error_code = match generic.code() {
         Some(code) => code,
         None => return Err(crate::operation::get_storage::GetStorageError::unhandled(generic)),
     };
--
     let _error_message = generic.message().map(|msg| msg.to_owned());
     Err(match error_code {
         "ResourceNotFoundException" => crate::operation::get_storage::GetStorageError::ResourceNotFoundError({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::ResourceNotFoundErrorBuilder::default();
                 output = crate::protocol_serde::shape_resource_not_found_exception::de_resource_not_found_exception_json_err(_response_body, output)
                     .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
                 let output = output.meta(generic);
                 crate::serde_util::resource_not_found_exception_correct_errors(output)
                     .build()
                     .map_err(crate::operation::get_storage::GetStorageError::unhandled)?
             };
             tmp
         }),
         "StorageAccessNotAuthorized" => crate::operation::get_storage::GetStorageError::StorageAccessNotAuthorized({
             #[allow(unused_mut)]
             let mut tmp = {
                 #[allow(unused_mut)]
                 let mut output = crate::types::error::builders::StorageAccessNotAuthorizedBuilder::default();
                 output =
                     crate::protocol_serde::shape_storage_access_not_authorized::de_storage_access_not_authorized_json_err(_response_body, output)
                         .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
                 let output = output.meta(generic);
                 output.build()
             };
             if tmp.message.is_none() {
                 tmp.message = _error_message;
--
+            }
             tmp
         }),
         "ValidationException" => crate::operation::get_storage::GetStorageError::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::get_storage::GetStorageError::unhandled)?;
                 let output = output.meta(generic);
                 crate::serde_util::validation_exception_correct_errors(output)
                     .build()
                     .map_err(crate::operation::get_storage::GetStorageError::unhandled)?
             };
             tmp
         }),
         _ => crate::operation::get_storage::GetStorageError::generic(generic),
     })
--
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_get_storage_http_response(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<crate::operation::get_storage::GetStorageOutput, crate::operation::get_storage::GetStorageError> {
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::get_storage::builders::GetStorageOutputBuilder::default();
         output = crate::protocol_serde::shape_get_storage::de_get_storage(_response_body, output)
             .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
         crate::serde_util::get_storage_output_output_correct_errors(output)
             .build()
             .map_err(crate::operation::get_storage::GetStorageError::unhandled)?
     })
--
+}
--
 pub fn ser_get_storage_headers(
     input: &crate::operation::get_storage::GetStorageInput,
     mut builder: ::http_1x::request::Builder,
 ) -> std::result::Result<::http_1x::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
     if let ::std::option::Option::Some(inner_1) = &input.passcode {
         let formatted_2 = inner_1.as_str();
         let header_value = formatted_2;
         let header_value: ::http_1x::HeaderValue = header_value.parse().map_err(|err| {
             ::aws_smithy_types::error::operation::BuildError::invalid_field(
                 "passcode",
                 format!("`{}` cannot be used as a header value: {}", &header_value, err),
--
+            )
         })?;
         builder = builder.header("passcode", header_value);
--
+    }
     Ok(builder)
--
+}
--
 pub(crate) fn de_get_storage(
     _value: &[u8],
     mut builder: crate::operation::get_storage::builders::GetStorageOutputBuilder,
 ) -> ::std::result::Result<crate::operation::get_storage::builders::GetStorageOutputBuilder, ::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() {
                 "collection" => {
                     builder = builder.set_collection(crate::protocol_serde::shape_species_collection::de_species_collection(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/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_master_ball_unsuccessful.rs

@@ -1,1 +55,20 @@

↥ Expand context

 pub fn ser_master_ball_unsuccessful_error(
     value: &crate::types::error::MasterBallUnsuccessful,
 ) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     let mut out = ::std::string::String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     crate::protocol_serde::shape_master_ball_unsuccessful::ser_master_ball_unsuccessful(&mut object, value)?;
     object.finish();
     Ok(out)
-10
+}
-11
 pub(crate) fn de_master_ball_unsuccessful_json_err(
     _value: &[u8],
     mut builder: crate::types::error::builders::MasterBallUnsuccessfulBuilder,
 ) -> ::std::result::Result<crate::types::error::builders::MasterBallUnsuccessfulBuilder, ::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)
--
+}
--
 pub fn ser_master_ball_unsuccessful(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::types::error::MasterBallUnsuccessful,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     if let Some(var_1) = &input.message {
         object.key("message").string(var_1.as_str());
-18
+    }
     Ok(())
-20
+}

tmp-codegen-diff/codegen-client-test/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_resource_not_found_exception.rs

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

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_resource_not_found_exception_json_err(
     _value: &[u8],
     mut builder: crate::types::error::builders::ResourceNotFoundErrorBuilder,
 ) -> ::std::result::Result<crate::types::error::builders::ResourceNotFoundErrorBuilder, ::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/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_species_collection.rs

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

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_species_collection<'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/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_storage_access_not_authorized.rs

@@ -1,0 +36,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_storage_access_not_authorized_json_err(
     _value: &[u8],
     mut builder: crate::types::error::builders::StorageAccessNotAuthorizedBuilder,
 ) -> ::std::result::Result<crate::types::error::builders::StorageAccessNotAuthorizedBuilder, ::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/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_stream_pokemon_radio.rs

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

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_stream_pokemon_radio_http_response(
     response: &mut ::aws_smithy_runtime_api::http::Response,
 ) -> std::result::Result<
     crate::operation::stream_pokemon_radio::StreamPokemonRadioOutput,
     crate::operation::stream_pokemon_radio::StreamPokemonRadioError,
 > {
     let mut _response_body = ::aws_smithy_types::body::SdkBody::taken();
     std::mem::swap(&mut _response_body, response.body_mut());
     let _response_body = &mut _response_body;
-12
     let _response_status = response.status().as_u16();

     let _response_headers = response.headers();
     Ok({
         #[allow(unused_mut)]
         let mut output = crate::operation::stream_pokemon_radio::builders::StreamPokemonRadioOutputBuilder::default();
         output = output.set_data(Some(crate::protocol_serde::shape_stream_pokemon_radio_output::de_data_payload(
             _response_body,
         )?));
         output.build()
     })
-23
+}
--
 #[allow(clippy::unnecessary_wraps)]
 pub fn de_stream_pokemon_radio_http_error(
     _response_status: u16,
     _response_headers: &::aws_smithy_runtime_api::http::Headers,
     _response_body: &[u8],
 ) -> std::result::Result<
     crate::operation::stream_pokemon_radio::StreamPokemonRadioOutput,
     crate::operation::stream_pokemon_radio::StreamPokemonRadioError,
 > {
     #[allow(unused_mut)]
     let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
         .map_err(crate::operation::stream_pokemon_radio::StreamPokemonRadioError::unhandled)?;
     let generic = generic_builder.build();
     Err(crate::operation::stream_pokemon_radio::StreamPokemonRadioError::generic(generic))
--
+}

tmp-codegen-diff/codegen-client-test/pokemon-service-client/rust-client-codegen/src/protocol_serde/shape_unsupported_region_error.rs

@@ -1,0 +42,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn de_unsupported_region_error_json_err(
     _value: &[u8],
     mut builder: crate::types::error::builders::UnsupportedRegionErrorBuilder,
 ) -> ::std::result::Result<crate::types::error::builders::UnsupportedRegionErrorBuilder, ::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() {
                 "region" => {
                     builder = builder.set_region(
                         ::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:?}"
                 )))
--
+            }
--
+        }
--
+    }
     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/pokemon-service-client/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/pokemon-service-client/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/pokemon-service-client/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/pokemon-service-client/rust-client-codegen/src/serde_util.rs

@@ -1,1 +88,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub(crate) fn unsupported_region_error_correct_errors(
     mut builder: crate::types::error::builders::UnsupportedRegionErrorBuilder,
 ) -> crate::types::error::builders::UnsupportedRegionErrorBuilder {
     if builder.region.is_none() {
         builder.region = Some(Default::default())
--
+    }
     builder
--
+}
--
 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 invalid_pokeball_error_correct_errors(
     mut builder: crate::types::error::builders::InvalidPokeballErrorBuilder,
 ) -> crate::types::error::builders::InvalidPokeballErrorBuilder {
     if builder.pokeball.is_none() {
         builder.pokeball = Some(Default::default())
-7
+    }
     builder
-9
+}
--
 pub(crate) fn resource_not_found_exception_correct_errors(
     mut builder: crate::types::error::builders::ResourceNotFoundErrorBuilder,
 ) -> crate::types::error::builders::ResourceNotFoundErrorBuilder {
     if builder.message.is_none() {
         builder.message = Some(Default::default())
--
+    }
     builder
--
+}
--
 pub(crate) fn get_pokemon_species_output_output_correct_errors(
     mut builder: crate::operation::get_pokemon_species::builders::GetPokemonSpeciesOutputBuilder,
 ) -> crate::operation::get_pokemon_species::builders::GetPokemonSpeciesOutputBuilder {
     if builder.name.is_none() {
         builder.name = Some(Default::default())
--
+    }
     if builder.flavor_text_entries.is_none() {
         builder.flavor_text_entries = Some(Default::default())
--
+    }
     builder
--
+}
--
 pub(crate) fn get_server_statistics_output_output_correct_errors(
     mut builder: crate::operation::get_server_statistics::builders::GetServerStatisticsOutputBuilder,
 ) -> crate::operation::get_server_statistics::builders::GetServerStatisticsOutputBuilder {
     if builder.calls_count.is_none() {
         builder.calls_count = Some(Default::default())
--
+    }
     builder
--
+}
--
 pub(crate) fn get_storage_output_output_correct_errors(
     mut builder: crate::operation::get_storage::builders::GetStorageOutputBuilder,
 ) -> crate::operation::get_storage::builders::GetStorageOutputBuilder {
     if builder.collection.is_none() {
         builder.collection = Some(Default::default())
--
+    }
     builder
--
+}
--
 pub(crate) fn flavor_text_correct_errors(mut builder: crate::types::builders::FlavorTextBuilder) -> crate::types::builders::FlavorTextBuilder {
     if builder.flavor_text.is_none() {
         builder.flavor_text = Some(Default::default())
--
+    }
     if builder.language.is_none() {
         builder.language = "no value was set".parse::<crate::types::Language>().ok()
--
+    }
     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
--
+}

Client Test

Files changed: