Client Test

Client Test

rev. dfb5149b65b7bcc09edd15b8e071ad43b5ac5943 (ignoring whitespace)

Files changed:

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

@@ -1,1 +14,17 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* HttpBindingGenerator.kt:230 */
    2      3   
pub fn de_events_payload(
    3      4   
    body: &mut ::aws_smithy_types::body::SdkBody,
    4      5   
) -> std::result::Result<
    5      6   
    crate::event_receiver::EventReceiver<crate::types::CapturePokemonEvents, crate::types::error::CapturePokemonEventsError>,
    6      7   
    crate::operation::capture_pokemon::CapturePokemonError,
    7      8   
> {
           9  +
    /* HttpBindingGenerator.kt:272 */
    8     10   
    let unmarshaller = crate::event_stream_serde::CapturePokemonEventsUnmarshaller::new();
    9     11   
    let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
   10     12   
    Ok(crate::event_receiver::EventReceiver::new(::aws_smithy_http::event_stream::Receiver::new(
   11     13   
        unmarshaller,
   12     14   
        body,
   13     15   
    )))
          16  +
    /* HttpBindingGenerator.kt:230 */
   14     17   
}

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

@@ -1,1 +10,17 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:240 */
    2      3   
pub fn ser_payload_payload(
    3      4   
    input: &crate::types::CapturingPayload,
    4      5   
) -> std::result::Result<::std::vec::Vec<u8>, ::aws_smithy_types::error::operation::SerializationError> {
           6  +
    /* JsonSerializerGenerator.kt:245 */
    5      7   
    let mut out = String::new();
           8  +
    /* JsonSerializerGenerator.kt:246 */
    6      9   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          10  +
    /* JsonSerializerGenerator.kt:375 */
    7     11   
    crate::protocol_serde::shape_capturing_payload::ser_capturing_payload(&mut object, input)?;
          12  +
    /* JsonSerializerGenerator.kt:252 */
    8     13   
    object.finish();
          14  +
    /* JsonSerializerGenerator.kt:253 */
    9     15   
    Ok(out.into_bytes())
          16  +
    /* JsonSerializerGenerator.kt:240 */
   10     17   
}

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

@@ -1,1 +13,22 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_capturing_payload(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::types::CapturingPayload,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.name {
           9  +
        /* JsonSerializerGenerator.kt:423 */
    7     10   
        object.key("name").string(var_1.as_str());
          11  +
        /* JsonSerializerGenerator.kt:382 */
    8     12   
    }
          13  +
    /* JsonSerializerGenerator.kt:382 */
    9     14   
    if let Some(var_2) = &input.pokeball {
          15  +
        /* JsonSerializerGenerator.kt:423 */
   10     16   
        object.key("pokeball").string(var_2.as_str());
          17  +
        /* JsonSerializerGenerator.kt:382 */
   11     18   
    }
          19  +
    /* JsonSerializerGenerator.kt:372 */
   12     20   
    Ok(())
          21  +
    /* JsonSerializerGenerator.kt:358 */
   13     22   
}

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

@@ -1,1 +26,41 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_check_health_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<crate::operation::check_health::CheckHealthOutput, crate::operation::check_health::CheckHealthError> {
          10  +
    /* RustType.kt:516 */
    8     11   
    #[allow(unused_mut)]
          12  +
    /* ProtocolParserGenerator.kt:106 */
    9     13   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   10     14   
        .map_err(crate::operation::check_health::CheckHealthError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::check_health::CheckHealthError::generic(generic))
          19  +
    /* ProtocolParserGenerator.kt:99 */
   13     20   
}
   14     21   
          22  +
/* RustType.kt:516 */
   15     23   
#[allow(clippy::unnecessary_wraps)]
          24  +
/* ProtocolParserGenerator.kt:71 */
   16     25   
pub fn de_check_health_http_response(
   17     26   
    _response_status: u16,
   18     27   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   19     28   
    _response_body: &[u8],
   20     29   
) -> std::result::Result<crate::operation::check_health::CheckHealthOutput, crate::operation::check_health::CheckHealthError> {
          30  +
    /* ProtocolParserGenerator.kt:77 */
   21     31   
    Ok({
          32  +
        /* RustType.kt:516 */
   22     33   
        #[allow(unused_mut)]
          34  +
        /* ProtocolParserGenerator.kt:240 */
   23     35   
        let mut output = crate::operation::check_health::builders::CheckHealthOutputBuilder::default();
          36  +
        /* ClientBuilderInstantiator.kt:56 */
   24     37   
        output.build()
          38  +
        /* ProtocolParserGenerator.kt:77 */
   25     39   
    })
          40  +
    /* ProtocolParserGenerator.kt:71 */
   26     41   
}

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

@@ -1,1 +26,41 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_do_nothing_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<crate::operation::do_nothing::DoNothingOutput, crate::operation::do_nothing::DoNothingError> {
          10  +
    /* RustType.kt:516 */
    8     11   
    #[allow(unused_mut)]
          12  +
    /* ProtocolParserGenerator.kt:106 */
    9     13   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   10     14   
        .map_err(crate::operation::do_nothing::DoNothingError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::do_nothing::DoNothingError::generic(generic))
          19  +
    /* ProtocolParserGenerator.kt:99 */
   13     20   
}
   14     21   
          22  +
/* RustType.kt:516 */
   15     23   
#[allow(clippy::unnecessary_wraps)]
          24  +
/* ProtocolParserGenerator.kt:71 */
   16     25   
pub fn de_do_nothing_http_response(
   17     26   
    _response_status: u16,
   18     27   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   19     28   
    _response_body: &[u8],
   20     29   
) -> std::result::Result<crate::operation::do_nothing::DoNothingOutput, crate::operation::do_nothing::DoNothingError> {
          30  +
    /* ProtocolParserGenerator.kt:77 */
   21     31   
    Ok({
          32  +
        /* RustType.kt:516 */
   22     33   
        #[allow(unused_mut)]
          34  +
        /* ProtocolParserGenerator.kt:240 */
   23     35   
        let mut output = crate::operation::do_nothing::builders::DoNothingOutputBuilder::default();
          36  +
        /* ClientBuilderInstantiator.kt:56 */
   24     37   
        output.build()
          38  +
        /* ProtocolParserGenerator.kt:77 */
   25     39   
    })
          40  +
    /* ProtocolParserGenerator.kt:71 */
   26     41   
}

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

@@ -1,1 +49,84 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:516 */
    2      3   
pub(crate) fn de_flavor_text<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<crate::types::FlavorText>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          13  +
            /* RustType.kt:516 */
   11     14   
            #[allow(unused_mut)]
          15  +
            /* JsonParserGenerator.kt:526 */
   12     16   
            let mut builder = crate::types::builders::FlavorTextBuilder::default();
          17  +
            /* JsonParserGenerator.kt:684 */
   13     18   
            loop {
          19  +
                /* JsonParserGenerator.kt:685 */
   14     20   
                match tokens.next().transpose()? {
   15         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   16         -
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          21  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          23  +
                        /* JsonParserGenerator.kt:260 */
          24  +
                        match key.to_unescaped()?.as_ref() {
          25  +
                            /* JsonParserGenerator.kt:262 */
   17     26   
                            "flavorText" => {
          27  +
                                /* JsonParserGenerator.kt:265 */
   18     28   
                                builder = builder.set_flavor_text(
          29  +
                                    /* JsonParserGenerator.kt:354 */
   19     30   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   20         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   21         -
                                    .transpose()?,
          31  +
                                        .map(|s|
          32  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          33  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          34  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          35  +
                                        .transpose()?, /* JsonParserGenerator.kt:265 */
   22     36   
                                );
          37  +
                                /* JsonParserGenerator.kt:262 */
   23     38   
                            }
          39  +
                            /* JsonParserGenerator.kt:262 */
   24     40   
                            "language" => {
          41  +
                                /* JsonParserGenerator.kt:265 */
   25     42   
                                builder = builder.set_language(
          43  +
                                    /* JsonParserGenerator.kt:354 */
   26     44   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   27         -
                                    .map(|s| s.to_unescaped().map(|u| crate::types::Language::from(u.as_ref())))
   28         -
                                    .transpose()?,
          45  +
                                        .map(|s|
          46  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          47  +
                                            /* JsonParserGenerator.kt:345 */crate::types::Language::from(u.as_ref())
          48  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          49  +
                                        .transpose()?, /* JsonParserGenerator.kt:265 */
   29     50   
                                );
          51  +
                                /* JsonParserGenerator.kt:262 */
   30     52   
                            }
   31         -
                        _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   32         -
                    },
          53  +
                            /* JsonParserGenerator.kt:290 */
          54  +
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          55  +
                        }
          56  +
                        /* JsonParserGenerator.kt:686 */
          57  +
                    }
          58  +
                    /* JsonParserGenerator.kt:695 */
   33     59   
                    other => {
   34     60   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   35     61   
                            "expected object key or end object, found: {:?}",
   36     62   
                            other
   37     63   
                        )))
          64  +
                    } /* JsonParserGenerator.kt:685 */
   38     65   
                }
          66  +
                /* JsonParserGenerator.kt:684 */
   39     67   
            }
   40         -
            }
          68  +
            /* JsonParserGenerator.kt:540 */
   41     69   
            Ok(Some(crate::serde_util::flavor_text_correct_errors(builder).build().map_err(|err| {
   42     70   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom_source("Response was invalid", err)
   43     71   
            })?))
          72  +
            /* JsonParserGenerator.kt:713 */
   44     73   
        }
   45         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          74  +
        /* JsonParserGenerator.kt:722 */
          75  +
        _ => {
          76  +
            /* JsonParserGenerator.kt:723 */
          77  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   46     78   
                "expected start object or null",
   47         -
        )),
          79  +
            ))
          80  +
            /* JsonParserGenerator.kt:722 */
          81  +
        } /* JsonParserGenerator.kt:712 */
   48     82   
    }
          83  +
    /* JsonParserGenerator.kt:516 */
   49     84   
}

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

@@ -1,1 +32,55 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_flavor_text_entries<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<crate::types::FlavorText>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          13  +
            /* JsonParserGenerator.kt:407 */
   11     14   
            let mut items = Vec::new();
          15  +
            /* JsonParserGenerator.kt:408 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:409 */
   13     18   
                match tokens.peek() {
          19  +
                    /* JsonParserGenerator.kt:410 */
   14     20   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          21  +
                        /* JsonParserGenerator.kt:411 */
   15     22   
                        tokens.next().transpose().unwrap();
   16     23   
                        break;
          24  +
                        /* JsonParserGenerator.kt:410 */
   17     25   
                    }
          26  +
                    /* JsonParserGenerator.kt:413 */
   18     27   
                    _ => {
   19         -
                        let value = crate::protocol_serde::shape_flavor_text::de_flavor_text(tokens)?;
          28  +
                        /* JsonParserGenerator.kt:419 */
          29  +
                        let value =
          30  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_flavor_text::de_flavor_text(tokens)?
          31  +
                        /* JsonParserGenerator.kt:419 */;
          32  +
                        /* JsonParserGenerator.kt:422 */
   20     33   
                        if let Some(value) = value {
   21     34   
                            items.push(value);
   22     35   
                        }
          36  +
                        /* JsonParserGenerator.kt:413 */
          37  +
                    } /* JsonParserGenerator.kt:409 */
   23     38   
                }
          39  +
                /* JsonParserGenerator.kt:408 */
   24     40   
            }
   25         -
            }
          41  +
            /* JsonParserGenerator.kt:446 */
   26     42   
            Ok(Some(items))
          43  +
            /* JsonParserGenerator.kt:713 */
   27     44   
        }
   28         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          45  +
        /* JsonParserGenerator.kt:722 */
          46  +
        _ => {
          47  +
            /* JsonParserGenerator.kt:723 */
          48  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   29     49   
                "expected start array or null",
   30         -
        )),
          50  +
            ))
          51  +
            /* JsonParserGenerator.kt:722 */
          52  +
        } /* JsonParserGenerator.kt:712 */
   31     53   
    }
          54  +
    /* JsonParserGenerator.kt:398 */
   32     55   
}

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

@@ -1,1 +110,163 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_get_pokemon_species_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<crate::operation::get_pokemon_species::GetPokemonSpeciesOutput, crate::operation::get_pokemon_species::GetPokemonSpeciesError>
    8     10   
{
          11  +
    /* RustType.kt:516 */
    9     12   
    #[allow(unused_mut)]
          13  +
    /* ProtocolParserGenerator.kt:106 */
   10     14   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   11     15   
        .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
          16  +
    /* ProtocolParserGenerator.kt:120 */
   12     17   
    let generic = generic_builder.build();
          18  +
    /* ProtocolParserGenerator.kt:122 */
   13     19   
    let error_code = match generic.code() {
   14     20   
        Some(code) => code,
   15     21   
        None => return Err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled(generic)),
   16     22   
    };
   17     23   
   18     24   
    let _error_message = generic.message().map(|msg| msg.to_owned());
          25  +
    /* ProtocolParserGenerator.kt:133 */
   19     26   
    Err(match error_code {
          27  +
        /* ProtocolParserGenerator.kt:139 */
   20     28   
        "ValidationException" => crate::operation::get_pokemon_species::GetPokemonSpeciesError::ValidationError({
          29  +
            /* RustType.kt:516 */
   21     30   
            #[allow(unused_mut)]
   22         -
            let mut tmp = {
   23         -
                #[allow(unused_mut)]
   24         -
                let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
   25         -
                output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
   26         -
                    .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
   27         -
                let output = output.meta(generic);
   28         -
                crate::serde_util::validation_exception_correct_errors(output)
   29         -
                    .build()
   30         -
                    .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?
   31         -
            };
          31  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          32  +
                /* ProtocolParserGenerator.kt:146 */ {
          33  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          34  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
          35  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output).map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
          36  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          37  +
                    /* ClientBuilderInstantiator.kt:46 */crate::serde_util::validation_exception_correct_errors(output).build().map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?
          38  +
                /* ProtocolParserGenerator.kt:146 */}
          39  +
            /* ProtocolParserGenerator.kt:145 */;
          40  +
            /* ProtocolParserGenerator.kt:179 */
   32     41   
            tmp
          42  +
            /* ProtocolParserGenerator.kt:139 */
   33     43   
        }),
          44  +
        /* ProtocolParserGenerator.kt:139 */
   34     45   
        "ResourceNotFoundException" => crate::operation::get_pokemon_species::GetPokemonSpeciesError::ResourceNotFoundError({
          46  +
            /* RustType.kt:516 */
   35     47   
            #[allow(unused_mut)]
   36         -
            let mut tmp = {
   37         -
                #[allow(unused_mut)]
   38         -
                let mut output = crate::types::error::builders::ResourceNotFoundErrorBuilder::default();
   39         -
                output = crate::protocol_serde::shape_resource_not_found_exception::de_resource_not_found_exception_json_err(_response_body, output)
   40         -
                    .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
   41         -
                let output = output.meta(generic);
   42         -
                crate::serde_util::resource_not_found_exception_correct_errors(output)
   43         -
                    .build()
   44         -
                    .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?
   45         -
            };
          48  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          49  +
                /* ProtocolParserGenerator.kt:146 */ {
          50  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          51  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::ResourceNotFoundErrorBuilder::default();
          52  +
                    /* ProtocolParserGenerator.kt:257 */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)?;
          53  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          54  +
                    /* ClientBuilderInstantiator.kt:46 */crate::serde_util::resource_not_found_exception_correct_errors(output).build().map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?
          55  +
                /* ProtocolParserGenerator.kt:146 */}
          56  +
            /* ProtocolParserGenerator.kt:145 */;
          57  +
            /* ProtocolParserGenerator.kt:179 */
   46     58   
            tmp
          59  +
            /* ProtocolParserGenerator.kt:139 */
   47     60   
        }),
   48         -
        _ => crate::operation::get_pokemon_species::GetPokemonSpeciesError::generic(generic),
          61  +
        /* ProtocolParserGenerator.kt:182 */
          62  +
        _ => crate::operation::get_pokemon_species::GetPokemonSpeciesError::generic(generic), /* ProtocolParserGenerator.kt:133 */
   49     63   
    })
          64  +
    /* ProtocolParserGenerator.kt:99 */
   50     65   
}
   51     66   
          67  +
/* RustType.kt:516 */
   52     68   
#[allow(clippy::unnecessary_wraps)]
          69  +
/* ProtocolParserGenerator.kt:71 */
   53     70   
pub fn de_get_pokemon_species_http_response(
   54     71   
    _response_status: u16,
   55     72   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   56     73   
    _response_body: &[u8],
   57     74   
) -> std::result::Result<crate::operation::get_pokemon_species::GetPokemonSpeciesOutput, crate::operation::get_pokemon_species::GetPokemonSpeciesError>
   58     75   
{
          76  +
    /* ProtocolParserGenerator.kt:77 */
   59     77   
    Ok({
          78  +
        /* RustType.kt:516 */
   60     79   
        #[allow(unused_mut)]
          80  +
        /* ProtocolParserGenerator.kt:240 */
   61     81   
        let mut output = crate::operation::get_pokemon_species::builders::GetPokemonSpeciesOutputBuilder::default();
          82  +
        /* ProtocolParserGenerator.kt:247 */
   62     83   
        output = crate::protocol_serde::shape_get_pokemon_species::de_get_pokemon_species(_response_body, output)
   63     84   
            .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?;
          85  +
        /* ClientBuilderInstantiator.kt:46 */
   64     86   
        crate::serde_util::get_pokemon_species_output_output_correct_errors(output)
   65     87   
            .build()
   66     88   
            .map_err(crate::operation::get_pokemon_species::GetPokemonSpeciesError::unhandled)?
          89  +
        /* ProtocolParserGenerator.kt:77 */
   67     90   
    })
          91  +
    /* ProtocolParserGenerator.kt:71 */
   68     92   
}
   69     93   
          94  +
/* JsonParserGenerator.kt:148 */
   70     95   
pub(crate) fn de_get_pokemon_species(
   71     96   
    value: &[u8],
   72     97   
    mut builder: crate::operation::get_pokemon_species::builders::GetPokemonSpeciesOutputBuilder,
   73     98   
) -> ::std::result::Result<
   74     99   
    crate::operation::get_pokemon_species::builders::GetPokemonSpeciesOutputBuilder,
   75    100   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   76    101   
> {
         102  +
    /* JsonParserGenerator.kt:153 */
   77    103   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   78    104   
    let tokens = &mut tokens_owned;
   79    105   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
         106  +
    /* JsonParserGenerator.kt:684 */
   80    107   
    loop {
         108  +
        /* JsonParserGenerator.kt:685 */
   81    109   
        match tokens.next().transpose()? {
   82         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   83         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
         110  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
         111  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
         112  +
                /* JsonParserGenerator.kt:260 */
         113  +
                match key.to_unescaped()?.as_ref() {
         114  +
                    /* JsonParserGenerator.kt:262 */
   84    115   
                    "flavorTextEntries" => {
   85         -
                    builder = builder.set_flavor_text_entries(crate::protocol_serde::shape_flavor_text_entries::de_flavor_text_entries(tokens)?);
         116  +
                        /* JsonParserGenerator.kt:265 */
         117  +
                        builder = builder.set_flavor_text_entries(
         118  +
                            /* JsonParserGenerator.kt:451 */
         119  +
                            crate::protocol_serde::shape_flavor_text_entries::de_flavor_text_entries(tokens)?, /* JsonParserGenerator.kt:265 */
         120  +
                        );
         121  +
                        /* JsonParserGenerator.kt:262 */
   86    122   
                    }
         123  +
                    /* JsonParserGenerator.kt:262 */
   87    124   
                    "name" => {
         125  +
                        /* JsonParserGenerator.kt:265 */
   88    126   
                        builder = builder.set_name(
         127  +
                            /* JsonParserGenerator.kt:354 */
   89    128   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   90         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   91         -
                            .transpose()?,
         129  +
                                .map(|s|
         130  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
         131  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
         132  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
         133  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   92    134   
                        );
         135  +
                        /* JsonParserGenerator.kt:262 */
   93    136   
                    }
   94         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   95         -
            },
         137  +
                    /* JsonParserGenerator.kt:290 */
         138  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
         139  +
                }
         140  +
                /* JsonParserGenerator.kt:686 */
         141  +
            }
         142  +
            /* JsonParserGenerator.kt:695 */
   96    143   
            other => {
   97    144   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   98    145   
                    "expected object key or end object, found: {:?}",
   99    146   
                    other
  100    147   
                )))
         148  +
            } /* JsonParserGenerator.kt:685 */
  101    149   
        }
         150  +
        /* JsonParserGenerator.kt:684 */
  102    151   
    }
  103         -
    }
         152  +
    /* JsonParserGenerator.kt:250 */
  104    153   
    if tokens.next().is_some() {
         154  +
        /* JsonParserGenerator.kt:251 */
  105    155   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
  106    156   
            "found more JSON tokens after completing parsing",
  107    157   
        ));
         158  +
        /* JsonParserGenerator.kt:250 */
  108    159   
    }
         160  +
    /* JsonParserGenerator.kt:163 */
  109    161   
    Ok(builder)
         162  +
    /* JsonParserGenerator.kt:148 */
  110    163   
}

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

@@ -1,1 +75,111 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_get_server_statistics_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<
    8     10   
    crate::operation::get_server_statistics::GetServerStatisticsOutput,
    9     11   
    crate::operation::get_server_statistics::GetServerStatisticsError,
   10     12   
> {
          13  +
    /* RustType.kt:516 */
   11     14   
    #[allow(unused_mut)]
          15  +
    /* ProtocolParserGenerator.kt:106 */
   12     16   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   13     17   
        .map_err(crate::operation::get_server_statistics::GetServerStatisticsError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::get_server_statistics::GetServerStatisticsError::generic(generic))
          22  +
    /* ProtocolParserGenerator.kt:99 */
   16     23   
}
   17     24   
          25  +
/* RustType.kt:516 */
   18     26   
#[allow(clippy::unnecessary_wraps)]
          27  +
/* ProtocolParserGenerator.kt:71 */
   19     28   
pub fn de_get_server_statistics_http_response(
   20     29   
    _response_status: u16,
   21     30   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   22     31   
    _response_body: &[u8],
   23     32   
) -> std::result::Result<
   24     33   
    crate::operation::get_server_statistics::GetServerStatisticsOutput,
   25     34   
    crate::operation::get_server_statistics::GetServerStatisticsError,
   26     35   
> {
          36  +
    /* ProtocolParserGenerator.kt:77 */
   27     37   
    Ok({
          38  +
        /* RustType.kt:516 */
   28     39   
        #[allow(unused_mut)]
          40  +
        /* ProtocolParserGenerator.kt:240 */
   29     41   
        let mut output = crate::operation::get_server_statistics::builders::GetServerStatisticsOutputBuilder::default();
          42  +
        /* ProtocolParserGenerator.kt:247 */
   30     43   
        output = crate::protocol_serde::shape_get_server_statistics::de_get_server_statistics(_response_body, output)
   31     44   
            .map_err(crate::operation::get_server_statistics::GetServerStatisticsError::unhandled)?;
          45  +
        /* ClientBuilderInstantiator.kt:46 */
   32     46   
        crate::serde_util::get_server_statistics_output_output_correct_errors(output)
   33     47   
            .build()
   34     48   
            .map_err(crate::operation::get_server_statistics::GetServerStatisticsError::unhandled)?
          49  +
        /* ProtocolParserGenerator.kt:77 */
   35     50   
    })
          51  +
    /* ProtocolParserGenerator.kt:71 */
   36     52   
}
   37     53   
          54  +
/* JsonParserGenerator.kt:148 */
   38     55   
pub(crate) fn de_get_server_statistics(
   39     56   
    value: &[u8],
   40     57   
    mut builder: crate::operation::get_server_statistics::builders::GetServerStatisticsOutputBuilder,
   41     58   
) -> ::std::result::Result<
   42     59   
    crate::operation::get_server_statistics::builders::GetServerStatisticsOutputBuilder,
   43     60   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   44     61   
> {
          62  +
    /* JsonParserGenerator.kt:153 */
   45     63   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   46     64   
    let tokens = &mut tokens_owned;
   47     65   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          66  +
    /* JsonParserGenerator.kt:684 */
   48     67   
    loop {
          68  +
        /* JsonParserGenerator.kt:685 */
   49     69   
        match tokens.next().transpose()? {
   50         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   51         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          70  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          71  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          72  +
                /* JsonParserGenerator.kt:260 */
          73  +
                match key.to_unescaped()?.as_ref() {
          74  +
                    /* JsonParserGenerator.kt:262 */
   52     75   
                    "calls_count" => {
          76  +
                        /* JsonParserGenerator.kt:265 */
   53     77   
                        builder = builder.set_calls_count(
          78  +
                            /* JsonParserGenerator.kt:365 */
   54     79   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   55     80   
                                .map(i64::try_from)
   56         -
                            .transpose()?,
          81  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   57     82   
                        );
          83  +
                        /* JsonParserGenerator.kt:262 */
   58     84   
                    }
   59         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   60         -
            },
          85  +
                    /* JsonParserGenerator.kt:290 */
          86  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          87  +
                }
          88  +
                /* JsonParserGenerator.kt:686 */
          89  +
            }
          90  +
            /* JsonParserGenerator.kt:695 */
   61     91   
            other => {
   62     92   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   63     93   
                    "expected object key or end object, found: {:?}",
   64     94   
                    other
   65     95   
                )))
          96  +
            } /* JsonParserGenerator.kt:685 */
   66     97   
        }
          98  +
        /* JsonParserGenerator.kt:684 */
   67     99   
    }
   68         -
    }
         100  +
    /* JsonParserGenerator.kt:250 */
   69    101   
    if tokens.next().is_some() {
         102  +
        /* JsonParserGenerator.kt:251 */
   70    103   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   71    104   
            "found more JSON tokens after completing parsing",
   72    105   
        ));
         106  +
        /* JsonParserGenerator.kt:250 */
   73    107   
    }
         108  +
    /* JsonParserGenerator.kt:163 */
   74    109   
    Ok(builder)
         110  +
    /* JsonParserGenerator.kt:148 */
   75    111   
}

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

@@ -1,1 +133,191 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_get_storage_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<crate::operation::get_storage::GetStorageOutput, crate::operation::get_storage::GetStorageError> {
          10  +
    /* RustType.kt:516 */
    8     11   
    #[allow(unused_mut)]
          12  +
    /* ProtocolParserGenerator.kt:106 */
    9     13   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   10     14   
        .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:122 */
   12     18   
    let error_code = match generic.code() {
   13     19   
        Some(code) => code,
   14     20   
        None => return Err(crate::operation::get_storage::GetStorageError::unhandled(generic)),
   15     21   
    };
   16     22   
   17     23   
    let _error_message = generic.message().map(|msg| msg.to_owned());
          24  +
    /* ProtocolParserGenerator.kt:133 */
   18     25   
    Err(match error_code {
          26  +
        /* ProtocolParserGenerator.kt:139 */
   19     27   
        "ValidationException" => crate::operation::get_storage::GetStorageError::ValidationError({
          28  +
            /* RustType.kt:516 */
   20     29   
            #[allow(unused_mut)]
   21         -
            let mut tmp = {
   22         -
                #[allow(unused_mut)]
   23         -
                let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
   24         -
                output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
   25         -
                    .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
   26         -
                let output = output.meta(generic);
   27         -
                crate::serde_util::validation_exception_correct_errors(output)
   28         -
                    .build()
   29         -
                    .map_err(crate::operation::get_storage::GetStorageError::unhandled)?
   30         -
            };
          30  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          31  +
                /* ProtocolParserGenerator.kt:146 */ {
          32  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          33  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::ValidationErrorBuilder::default();
          34  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output).map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
          35  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          36  +
                    /* ClientBuilderInstantiator.kt:46 */crate::serde_util::validation_exception_correct_errors(output).build().map_err(crate::operation::get_storage::GetStorageError::unhandled)?
          37  +
                /* ProtocolParserGenerator.kt:146 */}
          38  +
            /* ProtocolParserGenerator.kt:145 */;
          39  +
            /* ProtocolParserGenerator.kt:179 */
   31     40   
            tmp
          41  +
            /* ProtocolParserGenerator.kt:139 */
   32     42   
        }),
          43  +
        /* ProtocolParserGenerator.kt:139 */
   33     44   
        "StorageAccessNotAuthorized" => crate::operation::get_storage::GetStorageError::StorageAccessNotAuthorized({
          45  +
            /* RustType.kt:516 */
   34     46   
            #[allow(unused_mut)]
   35         -
            let mut tmp = {
   36         -
                #[allow(unused_mut)]
   37         -
                let mut output = crate::types::error::builders::StorageAccessNotAuthorizedBuilder::default();
   38         -
                output =
   39         -
                    crate::protocol_serde::shape_storage_access_not_authorized::de_storage_access_not_authorized_json_err(_response_body, output)
   40         -
                        .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
   41         -
                let output = output.meta(generic);
   42         -
                output.build()
   43         -
            };
          47  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          48  +
                /* ProtocolParserGenerator.kt:146 */ {
          49  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          50  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::StorageAccessNotAuthorizedBuilder::default();
          51  +
                    /* ProtocolParserGenerator.kt:257 */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)?;
          52  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          53  +
                    /* ClientBuilderInstantiator.kt:56 */output.build()
          54  +
                /* ProtocolParserGenerator.kt:146 */}
          55  +
            /* ProtocolParserGenerator.kt:145 */;
          56  +
            /* ProtocolParserGenerator.kt:170 */
   44     57   
            if tmp.message.is_none() {
   45     58   
                tmp.message = _error_message;
   46     59   
            }
          60  +
            /* ProtocolParserGenerator.kt:179 */
   47     61   
            tmp
          62  +
            /* ProtocolParserGenerator.kt:139 */
   48     63   
        }),
          64  +
        /* ProtocolParserGenerator.kt:139 */
   49     65   
        "ResourceNotFoundException" => crate::operation::get_storage::GetStorageError::ResourceNotFoundError({
          66  +
            /* RustType.kt:516 */
   50     67   
            #[allow(unused_mut)]
   51         -
            let mut tmp = {
   52         -
                #[allow(unused_mut)]
   53         -
                let mut output = crate::types::error::builders::ResourceNotFoundErrorBuilder::default();
   54         -
                output = crate::protocol_serde::shape_resource_not_found_exception::de_resource_not_found_exception_json_err(_response_body, output)
   55         -
                    .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
   56         -
                let output = output.meta(generic);
   57         -
                crate::serde_util::resource_not_found_exception_correct_errors(output)
   58         -
                    .build()
   59         -
                    .map_err(crate::operation::get_storage::GetStorageError::unhandled)?
   60         -
            };
          68  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          69  +
                /* ProtocolParserGenerator.kt:146 */ {
          70  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          71  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::ResourceNotFoundErrorBuilder::default();
          72  +
                    /* ProtocolParserGenerator.kt:257 */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)?;
          73  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          74  +
                    /* ClientBuilderInstantiator.kt:46 */crate::serde_util::resource_not_found_exception_correct_errors(output).build().map_err(crate::operation::get_storage::GetStorageError::unhandled)?
          75  +
                /* ProtocolParserGenerator.kt:146 */}
          76  +
            /* ProtocolParserGenerator.kt:145 */;
          77  +
            /* ProtocolParserGenerator.kt:179 */
   61     78   
            tmp
          79  +
            /* ProtocolParserGenerator.kt:139 */
   62     80   
        }),
   63         -
        _ => crate::operation::get_storage::GetStorageError::generic(generic),
          81  +
        /* ProtocolParserGenerator.kt:182 */
          82  +
        _ => crate::operation::get_storage::GetStorageError::generic(generic), /* ProtocolParserGenerator.kt:133 */
   64     83   
    })
          84  +
    /* ProtocolParserGenerator.kt:99 */
   65     85   
}
   66     86   
          87  +
/* RustType.kt:516 */
   67     88   
#[allow(clippy::unnecessary_wraps)]
          89  +
/* ProtocolParserGenerator.kt:71 */
   68     90   
pub fn de_get_storage_http_response(
   69     91   
    _response_status: u16,
   70     92   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   71     93   
    _response_body: &[u8],
   72     94   
) -> std::result::Result<crate::operation::get_storage::GetStorageOutput, crate::operation::get_storage::GetStorageError> {
          95  +
    /* ProtocolParserGenerator.kt:77 */
   73     96   
    Ok({
          97  +
        /* RustType.kt:516 */
   74     98   
        #[allow(unused_mut)]
          99  +
        /* ProtocolParserGenerator.kt:240 */
   75    100   
        let mut output = crate::operation::get_storage::builders::GetStorageOutputBuilder::default();
         101  +
        /* ProtocolParserGenerator.kt:247 */
   76    102   
        output = crate::protocol_serde::shape_get_storage::de_get_storage(_response_body, output)
   77    103   
            .map_err(crate::operation::get_storage::GetStorageError::unhandled)?;
         104  +
        /* ClientBuilderInstantiator.kt:46 */
   78    105   
        crate::serde_util::get_storage_output_output_correct_errors(output)
   79    106   
            .build()
   80    107   
            .map_err(crate::operation::get_storage::GetStorageError::unhandled)?
         108  +
        /* ProtocolParserGenerator.kt:77 */
   81    109   
    })
         110  +
    /* ProtocolParserGenerator.kt:71 */
   82    111   
}
   83    112   
         113  +
/* HttpBindingGenerator.kt:542 */
   84    114   
pub fn ser_get_storage_headers(
   85    115   
    input: &crate::operation::get_storage::GetStorageInput,
   86    116   
    mut builder: ::http::request::Builder,
   87    117   
) -> std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
         118  +
    /* HttpBindingGenerator.kt:592 */
   88    119   
    if let ::std::option::Option::Some(inner_1) = &input.passcode {
         120  +
        /* HttpBindingGenerator.kt:704 */
   89    121   
        let formatted_2 = inner_1.as_str();
         122  +
        /* HttpBindingGenerator.kt:706 */
   90    123   
        let header_value = formatted_2;
   91    124   
        let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
   92    125   
            ::aws_smithy_types::error::operation::BuildError::invalid_field(
   93    126   
                "passcode",
   94    127   
                format!("`{}` cannot be used as a header value: {}", &header_value, err),
   95    128   
            )
   96    129   
        })?;
   97    130   
        builder = builder.header("passcode", header_value);
         131  +
        /* HttpBindingGenerator.kt:592 */
   98    132   
    }
         133  +
    /* HttpBindingGenerator.kt:555 */
   99    134   
    Ok(builder)
         135  +
    /* HttpBindingGenerator.kt:542 */
  100    136   
}
  101    137   
         138  +
/* JsonParserGenerator.kt:148 */
  102    139   
pub(crate) fn de_get_storage(
  103    140   
    value: &[u8],
  104    141   
    mut builder: crate::operation::get_storage::builders::GetStorageOutputBuilder,
  105    142   
) -> ::std::result::Result<crate::operation::get_storage::builders::GetStorageOutputBuilder, ::aws_smithy_json::deserialize::error::DeserializeError>
  106    143   
{
         144  +
    /* JsonParserGenerator.kt:153 */
  107    145   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
  108    146   
    let tokens = &mut tokens_owned;
  109    147   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
         148  +
    /* JsonParserGenerator.kt:684 */
  110    149   
    loop {
         150  +
        /* JsonParserGenerator.kt:685 */
  111    151   
        match tokens.next().transpose()? {
  112         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  113         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
         152  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
         153  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
         154  +
                /* JsonParserGenerator.kt:260 */
         155  +
                match key.to_unescaped()?.as_ref() {
         156  +
                    /* JsonParserGenerator.kt:262 */
  114    157   
                    "collection" => {
  115         -
                    builder = builder.set_collection(crate::protocol_serde::shape_species_collection::de_species_collection(tokens)?);
         158  +
                        /* JsonParserGenerator.kt:265 */
         159  +
                        builder = builder.set_collection(
         160  +
                            /* JsonParserGenerator.kt:451 */
         161  +
                            crate::protocol_serde::shape_species_collection::de_species_collection(tokens)?, /* JsonParserGenerator.kt:265 */
         162  +
                        );
         163  +
                        /* JsonParserGenerator.kt:262 */
         164  +
                    }
         165  +
                    /* JsonParserGenerator.kt:290 */
         166  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
  116    167   
                }
  117         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
  118         -
            },
         168  +
                /* JsonParserGenerator.kt:686 */
         169  +
            }
         170  +
            /* JsonParserGenerator.kt:695 */
  119    171   
            other => {
  120    172   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  121    173   
                    "expected object key or end object, found: {:?}",
  122    174   
                    other
  123    175   
                )))
         176  +
            } /* JsonParserGenerator.kt:685 */
  124    177   
        }
         178  +
        /* JsonParserGenerator.kt:684 */
  125    179   
    }
  126         -
    }
         180  +
    /* JsonParserGenerator.kt:250 */
  127    181   
    if tokens.next().is_some() {
         182  +
        /* JsonParserGenerator.kt:251 */
  128    183   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
  129    184   
            "found more JSON tokens after completing parsing",
  130    185   
        ));
         186  +
        /* JsonParserGenerator.kt:250 */
  131    187   
    }
         188  +
    /* JsonParserGenerator.kt:163 */
  132    189   
    Ok(builder)
         190  +
    /* JsonParserGenerator.kt:148 */
  133    191   
}

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

@@ -1,1 +43,73 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:148 */
    2      3   
pub(crate) fn de_invalid_pokeball_error_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::InvalidPokeballErrorBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::InvalidPokeballErrorBuilder, ::aws_smithy_json::deserialize::error::DeserializeError> {
           7  +
    /* JsonParserGenerator.kt:153 */
    6      8   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
    7      9   
    let tokens = &mut tokens_owned;
    8     10   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          11  +
    /* JsonParserGenerator.kt:684 */
    9     12   
    loop {
          13  +
        /* JsonParserGenerator.kt:685 */
   10     14   
        match tokens.next().transpose()? {
   11         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   12         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          15  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          16  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          17  +
                /* JsonParserGenerator.kt:260 */
          18  +
                match key.to_unescaped()?.as_ref() {
          19  +
                    /* JsonParserGenerator.kt:262 */
   13     20   
                    "pokeball" => {
          21  +
                        /* JsonParserGenerator.kt:265 */
   14     22   
                        builder = builder.set_pokeball(
          23  +
                            /* JsonParserGenerator.kt:354 */
   15     24   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   16         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   17         -
                            .transpose()?,
          25  +
                                .map(|s|
          26  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          27  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          29  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   18     30   
                        );
          31  +
                        /* JsonParserGenerator.kt:262 */
   19     32   
                    }
          33  +
                    /* JsonParserGenerator.kt:262 */
   20     34   
                    "Message" => {
          35  +
                        /* JsonParserGenerator.kt:265 */
   21     36   
                        builder = builder.set_message(
          37  +
                            /* JsonParserGenerator.kt:354 */
   22     38   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   23         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   24         -
                            .transpose()?,
          39  +
                                .map(|s|
          40  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          41  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          42  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          43  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   25     44   
                        );
          45  +
                        /* JsonParserGenerator.kt:262 */
   26     46   
                    }
   27         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   28         -
            },
          47  +
                    /* JsonParserGenerator.kt:290 */
          48  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          49  +
                }
          50  +
                /* JsonParserGenerator.kt:686 */
          51  +
            }
          52  +
            /* JsonParserGenerator.kt:695 */
   29     53   
            other => {
   30     54   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   31     55   
                    "expected object key or end object, found: {:?}",
   32     56   
                    other
   33     57   
                )))
          58  +
            } /* JsonParserGenerator.kt:685 */
   34     59   
        }
          60  +
        /* JsonParserGenerator.kt:684 */
   35     61   
    }
   36         -
    }
          62  +
    /* JsonParserGenerator.kt:250 */
   37     63   
    if tokens.next().is_some() {
          64  +
        /* JsonParserGenerator.kt:251 */
   38     65   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   39     66   
            "found more JSON tokens after completing parsing",
   40     67   
        ));
          68  +
        /* JsonParserGenerator.kt:250 */
   41     69   
    }
          70  +
    /* JsonParserGenerator.kt:163 */
   42     71   
    Ok(builder)
          72  +
    /* JsonParserGenerator.kt:148 */
   43     73   
}

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

@@ -1,1 +56,90 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:213 */
    2      3   
pub fn ser_master_ball_unsuccessful_error(
    3      4   
    value: &crate::types::error::MasterBallUnsuccessful,
    4      5   
) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
           6  +
    /* JsonSerializerGenerator.kt:218 */
    5      7   
    let mut out = ::std::string::String::new();
    6      8   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
           9  +
    /* JsonSerializerGenerator.kt:375 */
    7     10   
    crate::protocol_serde::shape_master_ball_unsuccessful::ser_master_ball_unsuccessful(&mut object, value)?;
          11  +
    /* JsonSerializerGenerator.kt:227 */
    8     12   
    object.finish();
    9     13   
    Ok(out)
          14  +
    /* JsonSerializerGenerator.kt:213 */
   10     15   
}
   11     16   
          17  +
/* JsonParserGenerator.kt:148 */
   12     18   
pub(crate) fn de_master_ball_unsuccessful_json_err(
   13     19   
    value: &[u8],
   14     20   
    mut builder: crate::types::error::builders::MasterBallUnsuccessfulBuilder,
   15     21   
) -> ::std::result::Result<crate::types::error::builders::MasterBallUnsuccessfulBuilder, ::aws_smithy_json::deserialize::error::DeserializeError> {
          22  +
    /* JsonParserGenerator.kt:153 */
   16     23   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   17     24   
    let tokens = &mut tokens_owned;
   18     25   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          26  +
    /* JsonParserGenerator.kt:684 */
   19     27   
    loop {
          28  +
        /* JsonParserGenerator.kt:685 */
   20     29   
        match tokens.next().transpose()? {
   21         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   22         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          30  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          31  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          32  +
                /* JsonParserGenerator.kt:260 */
          33  +
                match key.to_unescaped()?.as_ref() {
          34  +
                    /* JsonParserGenerator.kt:262 */
   23     35   
                    "message" => {
          36  +
                        /* JsonParserGenerator.kt:265 */
   24     37   
                        builder = builder.set_message(
          38  +
                            /* JsonParserGenerator.kt:354 */
   25     39   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   26         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   27         -
                            .transpose()?,
          40  +
                                .map(|s|
          41  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          42  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          43  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          44  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   28     45   
                        );
          46  +
                        /* JsonParserGenerator.kt:262 */
   29     47   
                    }
   30         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   31         -
            },
          48  +
                    /* JsonParserGenerator.kt:290 */
          49  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          50  +
                }
          51  +
                /* JsonParserGenerator.kt:686 */
          52  +
            }
          53  +
            /* JsonParserGenerator.kt:695 */
   32     54   
            other => {
   33     55   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   34     56   
                    "expected object key or end object, found: {:?}",
   35     57   
                    other
   36     58   
                )))
          59  +
            } /* JsonParserGenerator.kt:685 */
   37     60   
        }
          61  +
        /* JsonParserGenerator.kt:684 */
   38     62   
    }
   39         -
    }
          63  +
    /* JsonParserGenerator.kt:250 */
   40     64   
    if tokens.next().is_some() {
          65  +
        /* JsonParserGenerator.kt:251 */
   41     66   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   42     67   
            "found more JSON tokens after completing parsing",
   43     68   
        ));
          69  +
        /* JsonParserGenerator.kt:250 */
   44     70   
    }
          71  +
    /* JsonParserGenerator.kt:163 */
   45     72   
    Ok(builder)
          73  +
    /* JsonParserGenerator.kt:148 */
   46     74   
}
   47     75   
          76  +
/* JsonSerializerGenerator.kt:358 */
   48     77   
pub fn ser_master_ball_unsuccessful(
   49     78   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   50     79   
    input: &crate::types::error::MasterBallUnsuccessful,
   51     80   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          81  +
    /* JsonSerializerGenerator.kt:382 */
   52     82   
    if let Some(var_1) = &input.message {
          83  +
        /* JsonSerializerGenerator.kt:423 */
   53     84   
        object.key("message").string(var_1.as_str());
          85  +
        /* JsonSerializerGenerator.kt:382 */
   54     86   
    }
          87  +
    /* JsonSerializerGenerator.kt:372 */
   55     88   
    Ok(())
          89  +
    /* JsonSerializerGenerator.kt:358 */
   56     90   
}

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

@@ -1,1 +36,59 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:148 */
    2      3   
pub(crate) fn de_resource_not_found_exception_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::ResourceNotFoundErrorBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::ResourceNotFoundErrorBuilder, ::aws_smithy_json::deserialize::error::DeserializeError> {
           7  +
    /* JsonParserGenerator.kt:153 */
    6      8   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
    7      9   
    let tokens = &mut tokens_owned;
    8     10   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          11  +
    /* JsonParserGenerator.kt:684 */
    9     12   
    loop {
          13  +
        /* JsonParserGenerator.kt:685 */
   10     14   
        match tokens.next().transpose()? {
   11         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   12         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          15  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          16  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          17  +
                /* JsonParserGenerator.kt:260 */
          18  +
                match key.to_unescaped()?.as_ref() {
          19  +
                    /* JsonParserGenerator.kt:262 */
   13     20   
                    "message" => {
          21  +
                        /* JsonParserGenerator.kt:265 */
   14     22   
                        builder = builder.set_message(
          23  +
                            /* JsonParserGenerator.kt:354 */
   15     24   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   16         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   17         -
                            .transpose()?,
          25  +
                                .map(|s|
          26  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          27  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          29  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   18     30   
                        );
          31  +
                        /* JsonParserGenerator.kt:262 */
   19     32   
                    }
   20         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   21         -
            },
          33  +
                    /* JsonParserGenerator.kt:290 */
          34  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          35  +
                }
          36  +
                /* JsonParserGenerator.kt:686 */
          37  +
            }
          38  +
            /* JsonParserGenerator.kt:695 */
   22     39   
            other => {
   23     40   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   24     41   
                    "expected object key or end object, found: {:?}",
   25     42   
                    other
   26     43   
                )))
          44  +
            } /* JsonParserGenerator.kt:685 */
   27     45   
        }
          46  +
        /* JsonParserGenerator.kt:684 */
   28     47   
    }
   29         -
    }
          48  +
    /* JsonParserGenerator.kt:250 */
   30     49   
    if tokens.next().is_some() {
          50  +
        /* JsonParserGenerator.kt:251 */
   31     51   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   32     52   
            "found more JSON tokens after completing parsing",
   33     53   
        ));
          54  +
        /* JsonParserGenerator.kt:250 */
   34     55   
    }
          56  +
    /* JsonParserGenerator.kt:163 */
   35     57   
    Ok(builder)
          58  +
    /* JsonParserGenerator.kt:148 */
   36     59   
}

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

@@ -1,1 +34,59 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_species_collection<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<::std::string::String>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          13  +
            /* JsonParserGenerator.kt:407 */
   11     14   
            let mut items = Vec::new();
          15  +
            /* JsonParserGenerator.kt:408 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:409 */
   13     18   
                match tokens.peek() {
          19  +
                    /* JsonParserGenerator.kt:410 */
   14     20   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          21  +
                        /* JsonParserGenerator.kt:411 */
   15     22   
                        tokens.next().transpose().unwrap();
   16     23   
                        break;
          24  +
                        /* JsonParserGenerator.kt:410 */
   17     25   
                    }
          26  +
                    /* JsonParserGenerator.kt:413 */
   18     27   
                    _ => {
   19         -
                        let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   20         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   21         -
                            .transpose()?;
          28  +
                        /* JsonParserGenerator.kt:419 */
          29  +
                        let value =
          30  +
                            /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          31  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          32  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          33  +
                                /* JsonParserGenerator.kt:339 */)
          34  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          35  +
                        /* JsonParserGenerator.kt:419 */;
          36  +
                        /* JsonParserGenerator.kt:422 */
   22     37   
                        if let Some(value) = value {
   23     38   
                            items.push(value);
   24     39   
                        }
          40  +
                        /* JsonParserGenerator.kt:413 */
          41  +
                    } /* JsonParserGenerator.kt:409 */
   25     42   
                }
          43  +
                /* JsonParserGenerator.kt:408 */
   26     44   
            }
   27         -
            }
          45  +
            /* JsonParserGenerator.kt:446 */
   28     46   
            Ok(Some(items))
          47  +
            /* JsonParserGenerator.kt:713 */
   29     48   
        }
   30         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          49  +
        /* JsonParserGenerator.kt:722 */
          50  +
        _ => {
          51  +
            /* JsonParserGenerator.kt:723 */
          52  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   31     53   
                "expected start array or null",
   32         -
        )),
          54  +
            ))
          55  +
            /* JsonParserGenerator.kt:722 */
          56  +
        } /* JsonParserGenerator.kt:712 */
   33     57   
    }
          58  +
    /* JsonParserGenerator.kt:398 */
   34     59   
}

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

@@ -1,1 +37,60 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:148 */
    2      3   
pub(crate) fn de_storage_access_not_authorized_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::StorageAccessNotAuthorizedBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::StorageAccessNotAuthorizedBuilder, ::aws_smithy_json::deserialize::error::DeserializeError>
    6      7   
{
           8  +
    /* JsonParserGenerator.kt:153 */
    7      9   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
    8     10   
    let tokens = &mut tokens_owned;
    9     11   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          12  +
    /* JsonParserGenerator.kt:684 */
   10     13   
    loop {
          14  +
        /* JsonParserGenerator.kt:685 */
   11     15   
        match tokens.next().transpose()? {
   12         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   13         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          16  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          17  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          18  +
                /* JsonParserGenerator.kt:260 */
          19  +
                match key.to_unescaped()?.as_ref() {
          20  +
                    /* JsonParserGenerator.kt:262 */
   14     21   
                    "Message" => {
          22  +
                        /* JsonParserGenerator.kt:265 */
   15     23   
                        builder = builder.set_message(
          24  +
                            /* JsonParserGenerator.kt:354 */
   16     25   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   17         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   18         -
                            .transpose()?,
          26  +
                                .map(|s|
          27  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          28  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          29  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          30  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   19     31   
                        );
          32  +
                        /* JsonParserGenerator.kt:262 */
   20     33   
                    }
   21         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   22         -
            },
          34  +
                    /* JsonParserGenerator.kt:290 */
          35  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          36  +
                }
          37  +
                /* JsonParserGenerator.kt:686 */
          38  +
            }
          39  +
            /* JsonParserGenerator.kt:695 */
   23     40   
            other => {
   24     41   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   25     42   
                    "expected object key or end object, found: {:?}",
   26     43   
                    other
   27     44   
                )))
          45  +
            } /* JsonParserGenerator.kt:685 */
   28     46   
        }
          47  +
        /* JsonParserGenerator.kt:684 */
   29     48   
    }
   30         -
    }
          49  +
    /* JsonParserGenerator.kt:250 */
   31     50   
    if tokens.next().is_some() {
          51  +
        /* JsonParserGenerator.kt:251 */
   32     52   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   33     53   
            "found more JSON tokens after completing parsing",
   34     54   
        ));
          55  +
        /* JsonParserGenerator.kt:250 */
   35     56   
    }
          57  +
    /* JsonParserGenerator.kt:163 */
   36     58   
    Ok(builder)
          59  +
    /* JsonParserGenerator.kt:148 */
   37     60   
}

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

@@ -1,1 +39,57 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:200 */
    3      5   
pub fn de_stream_pokemon_radio_http_response(
    4      6   
    response: &mut ::aws_smithy_runtime_api::http::Response,
    5      7   
) -> std::result::Result<
    6      8   
    crate::operation::stream_pokemon_radio::StreamPokemonRadioOutput,
    7      9   
    crate::operation::stream_pokemon_radio::StreamPokemonRadioError,
    8     10   
> {
          11  +
    /* ProtocolParserGenerator.kt:206 */
    9     12   
    let mut _response_body = ::aws_smithy_types::body::SdkBody::taken();
   10     13   
    std::mem::swap(&mut _response_body, response.body_mut());
   11     14   
    let _response_body = &mut _response_body;
   12     15   
   13     16   
    let _response_status = response.status().as_u16();
   14     17   
    let _response_headers = response.headers();
          18  +
    /* ProtocolParserGenerator.kt:217 */
   15     19   
    Ok({
          20  +
        /* RustType.kt:516 */
   16     21   
        #[allow(unused_mut)]
          22  +
        /* ProtocolParserGenerator.kt:240 */
   17     23   
        let mut output = crate::operation::stream_pokemon_radio::builders::StreamPokemonRadioOutputBuilder::default();
   18         -
        output = output.set_data(Some(crate::protocol_serde::shape_stream_pokemon_radio_output::de_data_payload(
   19         -
            _response_body,
   20         -
        )?));
          24  +
        /* ProtocolParserGenerator.kt:267 */
          25  +
        output = output.set_data(
          26  +
            /* ProtocolParserGenerator.kt:325 */
          27  +
            Some(crate::protocol_serde::shape_stream_pokemon_radio_output::de_data_payload(_response_body)?), /* ProtocolParserGenerator.kt:267 */
          28  +
        );
          29  +
        /* ClientBuilderInstantiator.kt:56 */
   21     30   
        output.build()
          31  +
        /* ProtocolParserGenerator.kt:217 */
   22     32   
    })
          33  +
    /* ProtocolParserGenerator.kt:200 */
   23     34   
}
   24     35   
          36  +
/* RustType.kt:516 */
   25     37   
#[allow(clippy::unnecessary_wraps)]
          38  +
/* ProtocolParserGenerator.kt:99 */
   26     39   
pub fn de_stream_pokemon_radio_http_error(
   27     40   
    _response_status: u16,
   28     41   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   29     42   
    _response_body: &[u8],
   30     43   
) -> std::result::Result<
   31     44   
    crate::operation::stream_pokemon_radio::StreamPokemonRadioOutput,
   32     45   
    crate::operation::stream_pokemon_radio::StreamPokemonRadioError,
   33     46   
> {
          47  +
    /* RustType.kt:516 */
   34     48   
    #[allow(unused_mut)]
          49  +
    /* ProtocolParserGenerator.kt:106 */
   35     50   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   36     51   
        .map_err(crate::operation::stream_pokemon_radio::StreamPokemonRadioError::unhandled)?;
          52  +
    /* ProtocolParserGenerator.kt:120 */
   37     53   
    let generic = generic_builder.build();
          54  +
    /* ProtocolParserGenerator.kt:185 */
   38     55   
    Err(crate::operation::stream_pokemon_radio::StreamPokemonRadioError::generic(generic))
          56  +
    /* ProtocolParserGenerator.kt:99 */
   39     57   
}