Client Test

Client Test

rev. dfb5149b65b7bcc09edd15b8e071ad43b5ac5943

Files changed:

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_endpoint_operation.rs

@@ -1,1 +34,52 @@
    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_endpoint_operation_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::endpoint_operation::EndpointOperationOutput, crate::operation::endpoint_operation::EndpointOperationError>
    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::endpoint_operation::EndpointOperationError::unhandled)?;
          16  +
    /* ProtocolParserGenerator.kt:120 */
   12     17   
    let generic = generic_builder.build();
          18  +
    /* ProtocolParserGenerator.kt:185 */
   13     19   
    Err(crate::operation::endpoint_operation::EndpointOperationError::generic(generic))
          20  +
    /* ProtocolParserGenerator.kt:99 */
   14     21   
}
   15     22   
          23  +
/* RustType.kt:516 */
   16     24   
#[allow(clippy::unnecessary_wraps)]
          25  +
/* ProtocolParserGenerator.kt:71 */
   17     26   
pub fn de_endpoint_operation_http_response(
   18     27   
    _response_status: u16,
   19     28   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   20     29   
    _response_body: &[u8],
   21     30   
) -> std::result::Result<crate::operation::endpoint_operation::EndpointOperationOutput, crate::operation::endpoint_operation::EndpointOperationError>
   22     31   
{
          32  +
    /* ProtocolParserGenerator.kt:77 */
   23     33   
    Ok({
          34  +
        /* RustType.kt:516 */
   24     35   
        #[allow(unused_mut)]
          36  +
        /* ProtocolParserGenerator.kt:240 */
   25     37   
        let mut output = crate::operation::endpoint_operation::builders::EndpointOperationOutputBuilder::default();
          38  +
        /* ClientBuilderInstantiator.kt:56 */
   26     39   
        output.build()
          40  +
        /* ProtocolParserGenerator.kt:77 */
   27     41   
    })
          42  +
    /* ProtocolParserGenerator.kt:71 */
   28     43   
}
   29     44   
          45  +
/* AwsJson.kt:152 */
   30     46   
pub fn ser_endpoint_operation_input(
   31     47   
    _input: &crate::operation::endpoint_operation::EndpointOperationInput,
   32     48   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          49  +
    /* AwsJson.kt:156 */
   33     50   
    Ok(::aws_smithy_types::body::SdkBody::from("{}"))
          51  +
    /* AwsJson.kt:152 */
   34     52   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_endpoint_with_host_label_operation.rs

@@ -1,1 +42,64 @@
    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_endpoint_with_host_label_operation_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::endpoint_with_host_label_operation::EndpointWithHostLabelOperationOutput,
    9     11   
    crate::operation::endpoint_with_host_label_operation::EndpointWithHostLabelOperationError,
   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::endpoint_with_host_label_operation::EndpointWithHostLabelOperationError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::endpoint_with_host_label_operation::EndpointWithHostLabelOperationError::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_endpoint_with_host_label_operation_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::endpoint_with_host_label_operation::EndpointWithHostLabelOperationOutput,
   25     34   
    crate::operation::endpoint_with_host_label_operation::EndpointWithHostLabelOperationError,
   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::endpoint_with_host_label_operation::builders::EndpointWithHostLabelOperationOutputBuilder::default();
          42  +
        /* ClientBuilderInstantiator.kt:56 */
   30     43   
        output.build()
          44  +
        /* ProtocolParserGenerator.kt:77 */
   31     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:71 */
   32     47   
}
   33     48   
          49  +
/* JsonSerializerGenerator.kt:287 */
   34     50   
pub fn ser_endpoint_with_host_label_operation_input(
   35     51   
    input: &crate::operation::endpoint_with_host_label_operation::EndpointWithHostLabelOperationInput,
   36     52   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          53  +
    /* JsonSerializerGenerator.kt:291 */
   37     54   
    let mut out = String::new();
          55  +
    /* JsonSerializerGenerator.kt:292 */
   38     56   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          57  +
    /* JsonSerializerGenerator.kt:375 */
   39     58   
    crate::protocol_serde::shape_endpoint_with_host_label_operation_input::ser_endpoint_with_host_label_operation_input_input(&mut object, input)?;
          59  +
    /* JsonSerializerGenerator.kt:295 */
   40     60   
    object.finish();
          61  +
    /* JsonSerializerGenerator.kt:296 */
   41     62   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          63  +
    /* JsonSerializerGenerator.kt:287 */
   42     64   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_endpoint_with_host_label_operation_input.rs

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

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_error_with_members.rs

@@ -1,1 +66,125 @@
    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_error_with_members_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::ErrorWithMembersBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::ErrorWithMembersBuilder, ::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() {
   13         -
                "Code" => {
   14         -
                    builder = builder.set_code(
   15         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   16         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   17         -
                            .transpose()?,
   18         -
                    );
          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 */
          20  +
                    "Code" => {
          21  +
                        /* JsonParserGenerator.kt:265 */
          22  +
                        builder = builder.set_code(
          23  +
                            /* JsonParserGenerator.kt:354 */
          24  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          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 */
          30  +
                        );
          31  +
                        /* JsonParserGenerator.kt:262 */
          32  +
                    }
          33  +
                    /* JsonParserGenerator.kt:262 */
          34  +
                    "ComplexData" => {
          35  +
                        /* JsonParserGenerator.kt:265 */
          36  +
                        builder = builder.set_complex_data(
          37  +
                            /* JsonParserGenerator.kt:544 */
          38  +
                            crate::protocol_serde::shape_kitchen_sink::de_kitchen_sink(tokens)?, /* JsonParserGenerator.kt:265 */
          39  +
                        );
          40  +
                        /* JsonParserGenerator.kt:262 */
          41  +
                    }
          42  +
                    /* JsonParserGenerator.kt:262 */
          43  +
                    "IntegerField" => {
          44  +
                        /* JsonParserGenerator.kt:265 */
          45  +
                        builder = builder.set_integer_field(
          46  +
                            /* JsonParserGenerator.kt:365 */
          47  +
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
          48  +
                                .map(i32::try_from)
          49  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
          50  +
                        );
          51  +
                        /* JsonParserGenerator.kt:262 */
          52  +
                    }
          53  +
                    /* JsonParserGenerator.kt:262 */
          54  +
                    "ListField" => {
          55  +
                        /* JsonParserGenerator.kt:265 */
          56  +
                        builder = builder.set_list_field(
          57  +
                            /* JsonParserGenerator.kt:451 */
          58  +
                            crate::protocol_serde::shape_list_of_strings::de_list_of_strings(tokens)?, /* JsonParserGenerator.kt:265 */
          59  +
                        );
          60  +
                        /* JsonParserGenerator.kt:262 */
          61  +
                    }
          62  +
                    /* JsonParserGenerator.kt:262 */
          63  +
                    "MapField" => {
          64  +
                        /* JsonParserGenerator.kt:265 */
          65  +
                        builder = builder.set_map_field(
          66  +
                            /* JsonParserGenerator.kt:509 */
          67  +
                            crate::protocol_serde::shape_map_of_strings::de_map_of_strings(tokens)?, /* JsonParserGenerator.kt:265 */
          68  +
                        );
          69  +
                        /* JsonParserGenerator.kt:262 */
          70  +
                    }
          71  +
                    /* JsonParserGenerator.kt:262 */
          72  +
                    "Message" => {
          73  +
                        /* JsonParserGenerator.kt:265 */
          74  +
                        builder = builder.set_message(
          75  +
                            /* JsonParserGenerator.kt:354 */
          76  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          77  +
                                .map(|s|
          78  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          79  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          80  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          81  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
          82  +
                        );
          83  +
                        /* JsonParserGenerator.kt:262 */
          84  +
                    }
          85  +
                    /* JsonParserGenerator.kt:262 */
          86  +
                    "StringField" => {
          87  +
                        /* JsonParserGenerator.kt:265 */
          88  +
                        builder = builder.set_string_field(
          89  +
                            /* JsonParserGenerator.kt:354 */
          90  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          91  +
                                .map(|s|
          92  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          93  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          94  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          95  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
          96  +
                        );
          97  +
                        /* JsonParserGenerator.kt:262 */
          98  +
                    }
          99  +
                    /* JsonParserGenerator.kt:290 */
         100  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   19    101   
                }
   20         -
                "ComplexData" => {
   21         -
                    builder = builder.set_complex_data(crate::protocol_serde::shape_kitchen_sink::de_kitchen_sink(tokens)?);
   22         -
                }
   23         -
                "IntegerField" => {
   24         -
                    builder = builder.set_integer_field(
   25         -
                        ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   26         -
                            .map(i32::try_from)
   27         -
                            .transpose()?,
   28         -
                    );
   29         -
                }
   30         -
                "ListField" => {
   31         -
                    builder = builder.set_list_field(crate::protocol_serde::shape_list_of_strings::de_list_of_strings(tokens)?);
   32         -
                }
   33         -
                "MapField" => {
   34         -
                    builder = builder.set_map_field(crate::protocol_serde::shape_map_of_strings::de_map_of_strings(tokens)?);
   35         -
                }
   36         -
                "Message" => {
   37         -
                    builder = builder.set_message(
   38         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   39         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   40         -
                            .transpose()?,
   41         -
                    );
   42         -
                }
   43         -
                "StringField" => {
   44         -
                    builder = builder.set_string_field(
   45         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   46         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   47         -
                            .transpose()?,
   48         -
                    );
   49         -
                }
   50         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   51         -
            },
         102  +
                /* JsonParserGenerator.kt:686 */
         103  +
            }
         104  +
            /* JsonParserGenerator.kt:695 */
   52    105   
            other => {
   53    106   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   54    107   
                    "expected object key or end object, found: {:?}",
   55    108   
                    other
   56    109   
                )))
   57         -
            }
         110  +
            } /* JsonParserGenerator.kt:685 */
   58    111   
        }
         112  +
        /* JsonParserGenerator.kt:684 */
   59    113   
    }
         114  +
    /* JsonParserGenerator.kt:250 */
   60    115   
    if tokens.next().is_some() {
         116  +
        /* JsonParserGenerator.kt:251 */
   61    117   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   62    118   
            "found more JSON tokens after completing parsing",
   63    119   
        ));
         120  +
        /* JsonParserGenerator.kt:250 */
   64    121   
    }
         122  +
    /* JsonParserGenerator.kt:163 */
   65    123   
    Ok(builder)
         124  +
    /* JsonParserGenerator.kt:148 */
   66    125   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_error_without_members.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_error_without_members_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::ErrorWithoutMembersBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::ErrorWithoutMembersBuilder, ::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() {
   13         -
                "Message" => {
   14         -
                    builder = builder.set_message(
   15         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   16         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   17         -
                            .transpose()?,
   18         -
                    );
          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 */
          20  +
                    "Message" => {
          21  +
                        /* JsonParserGenerator.kt:265 */
          22  +
                        builder = builder.set_message(
          23  +
                            /* JsonParserGenerator.kt:354 */
          24  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          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 */
          30  +
                        );
          31  +
                        /* JsonParserGenerator.kt:262 */
          32  +
                    }
          33  +
                    /* JsonParserGenerator.kt:290 */
          34  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   19     35   
                }
   20         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   21         -
            },
          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   
                )))
   27         -
            }
          44  +
            } /* JsonParserGenerator.kt:685 */
   28     45   
        }
          46  +
        /* JsonParserGenerator.kt:684 */
   29     47   
    }
          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/json_rpc11/rust-client-codegen/src/protocol_serde/shape_foo_enum_list.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_foo_enum_list<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<crate::types::FooEnum>>, ::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| crate::types::FooEnum::from(u.as_ref())))
   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:345 */crate::types::FooEnum::from(u.as_ref())
          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   
                        }
   25         -
                    }
          40  +
                        /* JsonParserGenerator.kt:413 */
          41  +
                    } /* JsonParserGenerator.kt:409 */
   26     42   
                }
          43  +
                /* JsonParserGenerator.kt:408 */
   27     44   
            }
          45  +
            /* JsonParserGenerator.kt:446 */
   28     46   
            Ok(Some(items))
          47  +
            /* JsonParserGenerator.kt:713 */
   29     48   
        }
   30         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   31         -
            "expected start array or null",
   32         -
        )),
          49  +
        /* JsonParserGenerator.kt:722 */
          50  +
        _ => {
          51  +
            /* JsonParserGenerator.kt:723 */
          52  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          53  +
                "expected start array or null",
          54  +
            ))
          55  +
            /* JsonParserGenerator.kt:722 */
          56  +
        } /* JsonParserGenerator.kt:712 */
   33     57   
    }
          58  +
    /* JsonParserGenerator.kt:398 */
   34     59   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_foo_enum_map.rs

@@ -1,1 +41,68 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:460 */
    2      3   
pub(crate) fn de_foo_enum_map<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::collections::HashMap<::std::string::String, crate::types::FooEnum>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   21         -
                            .map(|s| s.to_unescaped().map(|u| crate::types::FooEnum::from(u.as_ref())))
   22         -
                            .transpose()?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          33  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          34  +
                                    /* JsonParserGenerator.kt:345 */crate::types::FooEnum::from(u.as_ref())
          35  +
                                /* JsonParserGenerator.kt:339 */)
          36  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          37  +
                        /* JsonParserGenerator.kt:474 */;
          38  +
                        /* JsonParserGenerator.kt:491 */
   23     39   
                        if let Some(value) = value {
   24     40   
                            map.insert(key, value);
   25     41   
                        }
          42  +
                        /* JsonParserGenerator.kt:686 */
   26     43   
                    }
          44  +
                    /* JsonParserGenerator.kt:695 */
   27     45   
                    other => {
   28     46   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   29     47   
                            "expected object key or end object, found: {:?}",
   30     48   
                            other
   31     49   
                        )))
   32         -
                    }
          50  +
                    } /* JsonParserGenerator.kt:685 */
   33     51   
                }
          52  +
                /* JsonParserGenerator.kt:684 */
   34     53   
            }
          54  +
            /* JsonParserGenerator.kt:504 */
   35     55   
            Ok(Some(map))
          56  +
            /* JsonParserGenerator.kt:713 */
   36     57   
        }
   37         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   38         -
            "expected start object or null",
   39         -
        )),
          58  +
        /* JsonParserGenerator.kt:722 */
          59  +
        _ => {
          60  +
            /* JsonParserGenerator.kt:723 */
          61  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          62  +
                "expected start object or null",
          63  +
            ))
          64  +
            /* JsonParserGenerator.kt:722 */
          65  +
        } /* JsonParserGenerator.kt:712 */
   40     66   
    }
          67  +
    /* JsonParserGenerator.kt:460 */
   41     68   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_foo_enum_set.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_foo_enum_set<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<crate::types::FooEnum>>, ::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| crate::types::FooEnum::from(u.as_ref())))
   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:345 */crate::types::FooEnum::from(u.as_ref())
          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   
                        }
   25         -
                    }
          40  +
                        /* JsonParserGenerator.kt:413 */
          41  +
                    } /* JsonParserGenerator.kt:409 */
   26     42   
                }
          43  +
                /* JsonParserGenerator.kt:408 */
   27     44   
            }
          45  +
            /* JsonParserGenerator.kt:446 */
   28     46   
            Ok(Some(items))
          47  +
            /* JsonParserGenerator.kt:713 */
   29     48   
        }
   30         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   31         -
            "expected start array or null",
   32         -
        )),
          49  +
        /* JsonParserGenerator.kt:722 */
          50  +
        _ => {
          51  +
            /* JsonParserGenerator.kt:723 */
          52  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          53  +
                "expected start array or null",
          54  +
            ))
          55  +
            /* JsonParserGenerator.kt:722 */
          56  +
        } /* JsonParserGenerator.kt:712 */
   33     57   
    }
          58  +
    /* JsonParserGenerator.kt:398 */
   34     59   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_foo_error.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_foo_error_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::FooErrorBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::FooErrorBuilder, ::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() {
   13         -
                "Message" => {
   14         -
                    builder = builder.set_message(
   15         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   16         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   17         -
                            .transpose()?,
   18         -
                    );
          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 */
          20  +
                    "Message" => {
          21  +
                        /* JsonParserGenerator.kt:265 */
          22  +
                        builder = builder.set_message(
          23  +
                            /* JsonParserGenerator.kt:354 */
          24  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          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 */
          30  +
                        );
          31  +
                        /* JsonParserGenerator.kt:262 */
          32  +
                    }
          33  +
                    /* JsonParserGenerator.kt:290 */
          34  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   19     35   
                }
   20         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   21         -
            },
          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   
                )))
   27         -
            }
          44  +
            } /* JsonParserGenerator.kt:685 */
   28     45   
        }
          46  +
        /* JsonParserGenerator.kt:684 */
   29     47   
    }
          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/json_rpc11/rust-client-codegen/src/protocol_serde/shape_fractional_seconds.rs

@@ -1,1 +74,115 @@
    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_fractional_seconds_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::fractional_seconds::FractionalSecondsOutput, crate::operation::fractional_seconds::FractionalSecondsError>
    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::fractional_seconds::FractionalSecondsError::unhandled)?;
          16  +
    /* ProtocolParserGenerator.kt:120 */
   12     17   
    let generic = generic_builder.build();
          18  +
    /* ProtocolParserGenerator.kt:185 */
   13     19   
    Err(crate::operation::fractional_seconds::FractionalSecondsError::generic(generic))
          20  +
    /* ProtocolParserGenerator.kt:99 */
   14     21   
}
   15     22   
          23  +
/* RustType.kt:516 */
   16     24   
#[allow(clippy::unnecessary_wraps)]
          25  +
/* ProtocolParserGenerator.kt:71 */
   17     26   
pub fn de_fractional_seconds_http_response(
   18     27   
    _response_status: u16,
   19     28   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   20     29   
    _response_body: &[u8],
   21     30   
) -> std::result::Result<crate::operation::fractional_seconds::FractionalSecondsOutput, crate::operation::fractional_seconds::FractionalSecondsError>
   22     31   
{
          32  +
    /* ProtocolParserGenerator.kt:77 */
   23     33   
    Ok({
          34  +
        /* RustType.kt:516 */
   24     35   
        #[allow(unused_mut)]
          36  +
        /* ProtocolParserGenerator.kt:240 */
   25     37   
        let mut output = crate::operation::fractional_seconds::builders::FractionalSecondsOutputBuilder::default();
          38  +
        /* ProtocolParserGenerator.kt:247 */
   26     39   
        output = crate::protocol_serde::shape_fractional_seconds::de_fractional_seconds(_response_body, output)
   27     40   
            .map_err(crate::operation::fractional_seconds::FractionalSecondsError::unhandled)?;
          41  +
        /* ClientBuilderInstantiator.kt:56 */
   28     42   
        output.build()
          43  +
        /* ProtocolParserGenerator.kt:77 */
   29     44   
    })
          45  +
    /* ProtocolParserGenerator.kt:71 */
   30     46   
}
   31     47   
          48  +
/* AwsJson.kt:152 */
   32     49   
pub fn ser_fractional_seconds_input(
   33     50   
    _input: &crate::operation::fractional_seconds::FractionalSecondsInput,
   34     51   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          52  +
    /* AwsJson.kt:156 */
   35     53   
    Ok(::aws_smithy_types::body::SdkBody::from("{}"))
          54  +
    /* AwsJson.kt:152 */
   36     55   
}
   37     56   
          57  +
/* JsonParserGenerator.kt:148 */
   38     58   
pub(crate) fn de_fractional_seconds(
   39     59   
    value: &[u8],
   40     60   
    mut builder: crate::operation::fractional_seconds::builders::FractionalSecondsOutputBuilder,
   41     61   
) -> ::std::result::Result<
   42     62   
    crate::operation::fractional_seconds::builders::FractionalSecondsOutputBuilder,
   43     63   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   44     64   
> {
          65  +
    /* JsonParserGenerator.kt:153 */
   45     66   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   46     67   
    let tokens = &mut tokens_owned;
   47     68   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          69  +
    /* JsonParserGenerator.kt:684 */
   48     70   
    loop {
          71  +
        /* JsonParserGenerator.kt:685 */
   49     72   
        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() {
   52         -
                "datetime" => {
   53         -
                    builder = builder.set_datetime(::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
   54         -
                        tokens.next(),
   55         -
                        ::aws_smithy_types::date_time::Format::DateTimeWithOffset,
   56         -
                    )?);
          73  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          74  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          75  +
                /* JsonParserGenerator.kt:260 */
          76  +
                match key.to_unescaped()?.as_ref() {
          77  +
                    /* JsonParserGenerator.kt:262 */
          78  +
                    "datetime" => {
          79  +
                        /* JsonParserGenerator.kt:265 */
          80  +
                        builder = builder.set_datetime(
          81  +
                            /* JsonParserGenerator.kt:384 */
          82  +
                            ::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
          83  +
                                tokens.next(),
          84  +
                                ::aws_smithy_types::date_time::Format::DateTimeWithOffset,
          85  +
                            )?, /* JsonParserGenerator.kt:265 */
          86  +
                        );
          87  +
                        /* JsonParserGenerator.kt:262 */
          88  +
                    }
          89  +
                    /* JsonParserGenerator.kt:290 */
          90  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   57     91   
                }
   58         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   59         -
            },
          92  +
                /* JsonParserGenerator.kt:686 */
          93  +
            }
          94  +
            /* JsonParserGenerator.kt:695 */
   60     95   
            other => {
   61     96   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   62     97   
                    "expected object key or end object, found: {:?}",
   63     98   
                    other
   64     99   
                )))
   65         -
            }
         100  +
            } /* JsonParserGenerator.kt:685 */
   66    101   
        }
         102  +
        /* JsonParserGenerator.kt:684 */
   67    103   
    }
         104  +
    /* JsonParserGenerator.kt:250 */
   68    105   
    if tokens.next().is_some() {
         106  +
        /* JsonParserGenerator.kt:251 */
   69    107   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   70    108   
            "found more JSON tokens after completing parsing",
   71    109   
        ));
         110  +
        /* JsonParserGenerator.kt:250 */
   72    111   
    }
         112  +
    /* JsonParserGenerator.kt:163 */
   73    113   
    Ok(builder)
         114  +
    /* JsonParserGenerator.kt:148 */
   74    115   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_greeting_struct.rs

@@ -1,1 +50,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_greeting_struct<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<crate::types::GreetingStruct>, ::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::GreetingStructBuilder::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() {
   17         -
                        "hi" => {
   18         -
                            builder = builder.set_hi(
   19         -
                                ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   20         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   21         -
                                    .transpose()?,
   22         -
                            );
          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 */
          26  +
                            "hi" => {
          27  +
                                /* JsonParserGenerator.kt:265 */
          28  +
                                builder = builder.set_hi(
          29  +
                                    /* JsonParserGenerator.kt:354 */
          30  +
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          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 */
          36  +
                                );
          37  +
                                /* JsonParserGenerator.kt:262 */
          38  +
                            }
          39  +
                            /* JsonParserGenerator.kt:290 */
          40  +
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   23     41   
                        }
   24         -
                        _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   25         -
                    },
          42  +
                        /* JsonParserGenerator.kt:686 */
          43  +
                    }
          44  +
                    /* JsonParserGenerator.kt:695 */
   26     45   
                    other => {
   27     46   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   28     47   
                            "expected object key or end object, found: {:?}",
   29     48   
                            other
   30     49   
                        )))
   31         -
                    }
          50  +
                    } /* JsonParserGenerator.kt:685 */
   32     51   
                }
          52  +
                /* JsonParserGenerator.kt:684 */
   33     53   
            }
          54  +
            /* JsonParserGenerator.kt:540 */
   34     55   
            Ok(Some(builder.build()))
          56  +
            /* JsonParserGenerator.kt:713 */
   35     57   
        }
   36         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   37         -
            "expected start object or null",
   38         -
        )),
          58  +
        /* JsonParserGenerator.kt:722 */
          59  +
        _ => {
          60  +
            /* JsonParserGenerator.kt:723 */
          61  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          62  +
                "expected start object or null",
          63  +
            ))
          64  +
            /* JsonParserGenerator.kt:722 */
          65  +
        } /* JsonParserGenerator.kt:712 */
   39     66   
    }
          67  +
    /* JsonParserGenerator.kt:516 */
   40     68   
}
   41     69   
          70  +
/* JsonSerializerGenerator.kt:358 */
   42     71   
pub fn ser_greeting_struct(
   43     72   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   44     73   
    input: &crate::types::GreetingStruct,
   45     74   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          75  +
    /* JsonSerializerGenerator.kt:382 */
   46     76   
    if let Some(var_1) = &input.hi {
          77  +
        /* JsonSerializerGenerator.kt:423 */
   47     78   
        object.key("hi").string(var_1.as_str());
          79  +
        /* JsonSerializerGenerator.kt:382 */
   48     80   
    }
          81  +
    /* JsonSerializerGenerator.kt:372 */
   49     82   
    Ok(())
          83  +
    /* JsonSerializerGenerator.kt:358 */
   50     84   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_greeting_with_errors.rs

@@ -1,1 +132,194 @@
    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_greeting_with_errors_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::greeting_with_errors::GreetingWithErrorsOutput,
    9     11   
    crate::operation::greeting_with_errors::GreetingWithErrorsError,
   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::greeting_with_errors::GreetingWithErrorsError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:122 */
   15     21   
    let error_code = match generic.code() {
   16     22   
        Some(code) => code,
   17     23   
        None => return Err(crate::operation::greeting_with_errors::GreetingWithErrorsError::unhandled(generic)),
   18     24   
    };
   19     25   
   20     26   
    let _error_message = generic.message().map(|msg| msg.to_owned());
          27  +
    /* ProtocolParserGenerator.kt:133 */
   21     28   
    Err(match error_code {
          29  +
        /* ProtocolParserGenerator.kt:139 */
   22     30   
        "InvalidGreeting" => crate::operation::greeting_with_errors::GreetingWithErrorsError::InvalidGreeting({
          31  +
            /* RustType.kt:516 */
   23     32   
            #[allow(unused_mut)]
   24         -
            let mut tmp = {
   25         -
                #[allow(unused_mut)]
   26         -
                let mut output = crate::types::error::builders::InvalidGreetingBuilder::default();
   27         -
                output = crate::protocol_serde::shape_invalid_greeting::de_invalid_greeting_json_err(_response_body, output)
   28         -
                    .map_err(crate::operation::greeting_with_errors::GreetingWithErrorsError::unhandled)?;
   29         -
                let output = output.meta(generic);
   30         -
                output.build()
   31         -
            };
          33  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          34  +
                /* ProtocolParserGenerator.kt:146 */ {
          35  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          36  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::InvalidGreetingBuilder::default();
          37  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_invalid_greeting::de_invalid_greeting_json_err(_response_body, output).map_err(crate::operation::greeting_with_errors::GreetingWithErrorsError::unhandled)?;
          38  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          39  +
                    /* ClientBuilderInstantiator.kt:56 */output.build()
          40  +
                /* ProtocolParserGenerator.kt:146 */}
          41  +
            /* ProtocolParserGenerator.kt:145 */;
          42  +
            /* ProtocolParserGenerator.kt:170 */
   32     43   
            if tmp.message.is_none() {
   33     44   
                tmp.message = _error_message;
   34     45   
            }
          46  +
            /* ProtocolParserGenerator.kt:179 */
   35     47   
            tmp
          48  +
            /* ProtocolParserGenerator.kt:139 */
   36     49   
        }),
          50  +
        /* ProtocolParserGenerator.kt:139 */
   37     51   
        "ComplexError" => crate::operation::greeting_with_errors::GreetingWithErrorsError::ComplexError({
          52  +
            /* RustType.kt:516 */
   38     53   
            #[allow(unused_mut)]
   39         -
            let mut tmp = {
   40         -
                #[allow(unused_mut)]
   41         -
                let mut output = crate::types::error::builders::ComplexErrorBuilder::default();
   42         -
                output = crate::protocol_serde::shape_complex_error::de_complex_error_json_err(_response_body, output)
   43         -
                    .map_err(crate::operation::greeting_with_errors::GreetingWithErrorsError::unhandled)?;
   44         -
                let output = output.meta(generic);
   45         -
                output.build()
   46         -
            };
          54  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          55  +
                /* ProtocolParserGenerator.kt:146 */ {
          56  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          57  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::ComplexErrorBuilder::default();
          58  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_complex_error::de_complex_error_json_err(_response_body, output).map_err(crate::operation::greeting_with_errors::GreetingWithErrorsError::unhandled)?;
          59  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          60  +
                    /* ClientBuilderInstantiator.kt:56 */output.build()
          61  +
                /* ProtocolParserGenerator.kt:146 */}
          62  +
            /* ProtocolParserGenerator.kt:145 */;
          63  +
            /* ProtocolParserGenerator.kt:170 */
   47     64   
            if tmp.message.is_none() {
   48     65   
                tmp.message = _error_message;
   49     66   
            }
          67  +
            /* ProtocolParserGenerator.kt:179 */
   50     68   
            tmp
          69  +
            /* ProtocolParserGenerator.kt:139 */
   51     70   
        }),
          71  +
        /* ProtocolParserGenerator.kt:139 */
   52     72   
        "FooError" => crate::operation::greeting_with_errors::GreetingWithErrorsError::FooError({
          73  +
            /* RustType.kt:516 */
   53     74   
            #[allow(unused_mut)]
   54         -
            let mut tmp = {
   55         -
                #[allow(unused_mut)]
   56         -
                let mut output = crate::types::error::builders::FooErrorBuilder::default();
   57         -
                output = crate::protocol_serde::shape_foo_error::de_foo_error_json_err(_response_body, output)
   58         -
                    .map_err(crate::operation::greeting_with_errors::GreetingWithErrorsError::unhandled)?;
   59         -
                let output = output.meta(generic);
   60         -
                output.build()
   61         -
            };
          75  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          76  +
                /* ProtocolParserGenerator.kt:146 */ {
          77  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          78  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::FooErrorBuilder::default();
          79  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_foo_error::de_foo_error_json_err(_response_body, output).map_err(crate::operation::greeting_with_errors::GreetingWithErrorsError::unhandled)?;
          80  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          81  +
                    /* ClientBuilderInstantiator.kt:56 */output.build()
          82  +
                /* ProtocolParserGenerator.kt:146 */}
          83  +
            /* ProtocolParserGenerator.kt:145 */;
          84  +
            /* ProtocolParserGenerator.kt:170 */
   62     85   
            if tmp.message.is_none() {
   63     86   
                tmp.message = _error_message;
   64     87   
            }
          88  +
            /* ProtocolParserGenerator.kt:179 */
   65     89   
            tmp
          90  +
            /* ProtocolParserGenerator.kt:139 */
   66     91   
        }),
   67         -
        _ => crate::operation::greeting_with_errors::GreetingWithErrorsError::generic(generic),
          92  +
        /* ProtocolParserGenerator.kt:182 */
          93  +
        _ => crate::operation::greeting_with_errors::GreetingWithErrorsError::generic(generic), /* ProtocolParserGenerator.kt:133 */
   68     94   
    })
          95  +
    /* ProtocolParserGenerator.kt:99 */
   69     96   
}
   70     97   
          98  +
/* RustType.kt:516 */
   71     99   
#[allow(clippy::unnecessary_wraps)]
         100  +
/* ProtocolParserGenerator.kt:71 */
   72    101   
pub fn de_greeting_with_errors_http_response(
   73    102   
    _response_status: u16,
   74    103   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   75    104   
    _response_body: &[u8],
   76    105   
) -> std::result::Result<
   77    106   
    crate::operation::greeting_with_errors::GreetingWithErrorsOutput,
   78    107   
    crate::operation::greeting_with_errors::GreetingWithErrorsError,
   79    108   
> {
         109  +
    /* ProtocolParserGenerator.kt:77 */
   80    110   
    Ok({
         111  +
        /* RustType.kt:516 */
   81    112   
        #[allow(unused_mut)]
         113  +
        /* ProtocolParserGenerator.kt:240 */
   82    114   
        let mut output = crate::operation::greeting_with_errors::builders::GreetingWithErrorsOutputBuilder::default();
         115  +
        /* ProtocolParserGenerator.kt:247 */
   83    116   
        output = crate::protocol_serde::shape_greeting_with_errors::de_greeting_with_errors(_response_body, output)
   84    117   
            .map_err(crate::operation::greeting_with_errors::GreetingWithErrorsError::unhandled)?;
         118  +
        /* ClientBuilderInstantiator.kt:56 */
   85    119   
        output.build()
         120  +
        /* ProtocolParserGenerator.kt:77 */
   86    121   
    })
         122  +
    /* ProtocolParserGenerator.kt:71 */
   87    123   
}
   88    124   
         125  +
/* AwsJson.kt:152 */
   89    126   
pub fn ser_greeting_with_errors_input(
   90    127   
    _input: &crate::operation::greeting_with_errors::GreetingWithErrorsInput,
   91    128   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
         129  +
    /* AwsJson.kt:156 */
   92    130   
    Ok(::aws_smithy_types::body::SdkBody::from("{}"))
         131  +
    /* AwsJson.kt:152 */
   93    132   
}
   94    133   
         134  +
/* JsonParserGenerator.kt:148 */
   95    135   
pub(crate) fn de_greeting_with_errors(
   96    136   
    value: &[u8],
   97    137   
    mut builder: crate::operation::greeting_with_errors::builders::GreetingWithErrorsOutputBuilder,
   98    138   
) -> ::std::result::Result<
   99    139   
    crate::operation::greeting_with_errors::builders::GreetingWithErrorsOutputBuilder,
  100    140   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  101    141   
> {
         142  +
    /* JsonParserGenerator.kt:153 */
  102    143   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
  103    144   
    let tokens = &mut tokens_owned;
  104    145   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
         146  +
    /* JsonParserGenerator.kt:684 */
  105    147   
    loop {
         148  +
        /* JsonParserGenerator.kt:685 */
  106    149   
        match tokens.next().transpose()? {
  107         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  108         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
  109         -
                "greeting" => {
  110         -
                    builder = builder.set_greeting(
  111         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
  112         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
  113         -
                            .transpose()?,
  114         -
                    );
         150  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
         151  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
         152  +
                /* JsonParserGenerator.kt:260 */
         153  +
                match key.to_unescaped()?.as_ref() {
         154  +
                    /* JsonParserGenerator.kt:262 */
         155  +
                    "greeting" => {
         156  +
                        /* JsonParserGenerator.kt:265 */
         157  +
                        builder = builder.set_greeting(
         158  +
                            /* JsonParserGenerator.kt:354 */
         159  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
         160  +
                                .map(|s|
         161  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
         162  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
         163  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
         164  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
         165  +
                        );
         166  +
                        /* JsonParserGenerator.kt:262 */
         167  +
                    }
         168  +
                    /* JsonParserGenerator.kt:290 */
         169  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
  115    170   
                }
  116         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
  117         -
            },
         171  +
                /* JsonParserGenerator.kt:686 */
         172  +
            }
         173  +
            /* JsonParserGenerator.kt:695 */
  118    174   
            other => {
  119    175   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  120    176   
                    "expected object key or end object, found: {:?}",
  121    177   
                    other
  122    178   
                )))
  123         -
            }
         179  +
            } /* JsonParserGenerator.kt:685 */
  124    180   
        }
         181  +
        /* JsonParserGenerator.kt:684 */
  125    182   
    }
         183  +
    /* JsonParserGenerator.kt:250 */
  126    184   
    if tokens.next().is_some() {
         185  +
        /* JsonParserGenerator.kt:251 */
  127    186   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
  128    187   
            "found more JSON tokens after completing parsing",
  129    188   
        ));
         189  +
        /* JsonParserGenerator.kt:250 */
  130    190   
    }
         191  +
    /* JsonParserGenerator.kt:163 */
  131    192   
    Ok(builder)
         193  +
    /* JsonParserGenerator.kt:148 */
  132    194   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_host_with_path_operation.rs

@@ -1,1 +38,56 @@
    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_host_with_path_operation_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::host_with_path_operation::HostWithPathOperationOutput,
    9     11   
    crate::operation::host_with_path_operation::HostWithPathOperationError,
   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::host_with_path_operation::HostWithPathOperationError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::host_with_path_operation::HostWithPathOperationError::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_host_with_path_operation_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::host_with_path_operation::HostWithPathOperationOutput,
   25     34   
    crate::operation::host_with_path_operation::HostWithPathOperationError,
   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::host_with_path_operation::builders::HostWithPathOperationOutputBuilder::default();
          42  +
        /* ClientBuilderInstantiator.kt:56 */
   30     43   
        output.build()
          44  +
        /* ProtocolParserGenerator.kt:77 */
   31     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:71 */
   32     47   
}
   33     48   
          49  +
/* AwsJson.kt:152 */
   34     50   
pub fn ser_host_with_path_operation_input(
   35     51   
    _input: &crate::operation::host_with_path_operation::HostWithPathOperationInput,
   36     52   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          53  +
    /* AwsJson.kt:156 */
   37     54   
    Ok(::aws_smithy_types::body::SdkBody::from("{}"))
          55  +
    /* AwsJson.kt:152 */
   38     56   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_invalid_greeting.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_invalid_greeting_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::InvalidGreetingBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::InvalidGreetingBuilder, ::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() {
   13         -
                "Message" => {
   14         -
                    builder = builder.set_message(
   15         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   16         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   17         -
                            .transpose()?,
   18         -
                    );
          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 */
          20  +
                    "Message" => {
          21  +
                        /* JsonParserGenerator.kt:265 */
          22  +
                        builder = builder.set_message(
          23  +
                            /* JsonParserGenerator.kt:354 */
          24  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          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 */
          30  +
                        );
          31  +
                        /* JsonParserGenerator.kt:262 */
          32  +
                    }
          33  +
                    /* JsonParserGenerator.kt:290 */
          34  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   19     35   
                }
   20         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   21         -
            },
          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   
                )))
   27         -
            }
          44  +
            } /* JsonParserGenerator.kt:685 */
   28     45   
        }
          46  +
        /* JsonParserGenerator.kt:684 */
   29     47   
    }
          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/json_rpc11/rust-client-codegen/src/protocol_serde/shape_json_enums.rs

@@ -1,1 +97,175 @@
    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_json_enums_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::json_enums::JsonEnumsOutput, crate::operation::json_enums::JsonEnumsError> {
          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::json_enums::JsonEnumsError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::json_enums::JsonEnumsError::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_json_enums_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::json_enums::JsonEnumsOutput, crate::operation::json_enums::JsonEnumsError> {
          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::json_enums::builders::JsonEnumsOutputBuilder::default();
          36  +
        /* ProtocolParserGenerator.kt:247 */
   24     37   
        output = crate::protocol_serde::shape_json_enums::de_json_enums(_response_body, output)
   25     38   
            .map_err(crate::operation::json_enums::JsonEnumsError::unhandled)?;
          39  +
        /* ClientBuilderInstantiator.kt:56 */
   26     40   
        output.build()
          41  +
        /* ProtocolParserGenerator.kt:77 */
   27     42   
    })
          43  +
    /* ProtocolParserGenerator.kt:71 */
   28     44   
}
   29     45   
          46  +
/* JsonSerializerGenerator.kt:287 */
   30     47   
pub fn ser_json_enums_input(
   31     48   
    input: &crate::operation::json_enums::JsonEnumsInput,
   32     49   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          50  +
    /* JsonSerializerGenerator.kt:291 */
   33     51   
    let mut out = String::new();
          52  +
    /* JsonSerializerGenerator.kt:292 */
   34     53   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          54  +
    /* JsonSerializerGenerator.kt:375 */
   35     55   
    crate::protocol_serde::shape_json_enums_input::ser_json_enums_input_input(&mut object, input)?;
          56  +
    /* JsonSerializerGenerator.kt:295 */
   36     57   
    object.finish();
          58  +
    /* JsonSerializerGenerator.kt:296 */
   37     59   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          60  +
    /* JsonSerializerGenerator.kt:287 */
   38     61   
}
   39     62   
          63  +
/* JsonParserGenerator.kt:148 */
   40     64   
pub(crate) fn de_json_enums(
   41     65   
    value: &[u8],
   42     66   
    mut builder: crate::operation::json_enums::builders::JsonEnumsOutputBuilder,
   43     67   
) -> ::std::result::Result<crate::operation::json_enums::builders::JsonEnumsOutputBuilder, ::aws_smithy_json::deserialize::error::DeserializeError> {
          68  +
    /* JsonParserGenerator.kt:153 */
   44     69   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   45     70   
    let tokens = &mut tokens_owned;
   46     71   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          72  +
    /* JsonParserGenerator.kt:684 */
   47     73   
    loop {
          74  +
        /* JsonParserGenerator.kt:685 */
   48     75   
        match tokens.next().transpose()? {
   49         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   50         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
   51         -
                "fooEnum1" => {
   52         -
                    builder = builder.set_foo_enum1(
   53         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   54         -
                            .map(|s| s.to_unescaped().map(|u| crate::types::FooEnum::from(u.as_ref())))
   55         -
                            .transpose()?,
   56         -
                    );
          76  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          77  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          78  +
                /* JsonParserGenerator.kt:260 */
          79  +
                match key.to_unescaped()?.as_ref() {
          80  +
                    /* JsonParserGenerator.kt:262 */
          81  +
                    "fooEnum1" => {
          82  +
                        /* JsonParserGenerator.kt:265 */
          83  +
                        builder = builder.set_foo_enum1(
          84  +
                            /* JsonParserGenerator.kt:354 */
          85  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          86  +
                                .map(|s|
          87  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          88  +
                                    /* JsonParserGenerator.kt:345 */crate::types::FooEnum::from(u.as_ref())
          89  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          90  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
          91  +
                        );
          92  +
                        /* JsonParserGenerator.kt:262 */
          93  +
                    }
          94  +
                    /* JsonParserGenerator.kt:262 */
          95  +
                    "fooEnum2" => {
          96  +
                        /* JsonParserGenerator.kt:265 */
          97  +
                        builder = builder.set_foo_enum2(
          98  +
                            /* JsonParserGenerator.kt:354 */
          99  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
         100  +
                                .map(|s|
         101  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
         102  +
                                    /* JsonParserGenerator.kt:345 */crate::types::FooEnum::from(u.as_ref())
         103  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
         104  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
         105  +
                        );
         106  +
                        /* JsonParserGenerator.kt:262 */
         107  +
                    }
         108  +
                    /* JsonParserGenerator.kt:262 */
         109  +
                    "fooEnum3" => {
         110  +
                        /* JsonParserGenerator.kt:265 */
         111  +
                        builder = builder.set_foo_enum3(
         112  +
                            /* JsonParserGenerator.kt:354 */
         113  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
         114  +
                                .map(|s|
         115  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
         116  +
                                    /* JsonParserGenerator.kt:345 */crate::types::FooEnum::from(u.as_ref())
         117  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
         118  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
         119  +
                        );
         120  +
                        /* JsonParserGenerator.kt:262 */
         121  +
                    }
         122  +
                    /* JsonParserGenerator.kt:262 */
         123  +
                    "fooEnumList" => {
         124  +
                        /* JsonParserGenerator.kt:265 */
         125  +
                        builder = builder.set_foo_enum_list(
         126  +
                            /* JsonParserGenerator.kt:451 */
         127  +
                            crate::protocol_serde::shape_foo_enum_list::de_foo_enum_list(tokens)?, /* JsonParserGenerator.kt:265 */
         128  +
                        );
         129  +
                        /* JsonParserGenerator.kt:262 */
         130  +
                    }
         131  +
                    /* JsonParserGenerator.kt:262 */
         132  +
                    "fooEnumSet" => {
         133  +
                        /* JsonParserGenerator.kt:265 */
         134  +
                        builder = builder.set_foo_enum_set(
         135  +
                            /* JsonParserGenerator.kt:451 */
         136  +
                            crate::protocol_serde::shape_foo_enum_set::de_foo_enum_set(tokens)?, /* JsonParserGenerator.kt:265 */
         137  +
                        );
         138  +
                        /* JsonParserGenerator.kt:262 */
         139  +
                    }
         140  +
                    /* JsonParserGenerator.kt:262 */
         141  +
                    "fooEnumMap" => {
         142  +
                        /* JsonParserGenerator.kt:265 */
         143  +
                        builder = builder.set_foo_enum_map(
         144  +
                            /* JsonParserGenerator.kt:509 */
         145  +
                            crate::protocol_serde::shape_foo_enum_map::de_foo_enum_map(tokens)?, /* JsonParserGenerator.kt:265 */
         146  +
                        );
         147  +
                        /* JsonParserGenerator.kt:262 */
         148  +
                    }
         149  +
                    /* JsonParserGenerator.kt:290 */
         150  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   57    151   
                }
   58         -
                "fooEnum2" => {
   59         -
                    builder = builder.set_foo_enum2(
   60         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   61         -
                            .map(|s| s.to_unescaped().map(|u| crate::types::FooEnum::from(u.as_ref())))
   62         -
                            .transpose()?,
   63         -
                    );
   64         -
                }
   65         -
                "fooEnum3" => {
   66         -
                    builder = builder.set_foo_enum3(
   67         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   68         -
                            .map(|s| s.to_unescaped().map(|u| crate::types::FooEnum::from(u.as_ref())))
   69         -
                            .transpose()?,
   70         -
                    );
   71         -
                }
   72         -
                "fooEnumList" => {
   73         -
                    builder = builder.set_foo_enum_list(crate::protocol_serde::shape_foo_enum_list::de_foo_enum_list(tokens)?);
   74         -
                }
   75         -
                "fooEnumSet" => {
   76         -
                    builder = builder.set_foo_enum_set(crate::protocol_serde::shape_foo_enum_set::de_foo_enum_set(tokens)?);
   77         -
                }
   78         -
                "fooEnumMap" => {
   79         -
                    builder = builder.set_foo_enum_map(crate::protocol_serde::shape_foo_enum_map::de_foo_enum_map(tokens)?);
   80         -
                }
   81         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   82         -
            },
         152  +
                /* JsonParserGenerator.kt:686 */
         153  +
            }
         154  +
            /* JsonParserGenerator.kt:695 */
   83    155   
            other => {
   84    156   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   85    157   
                    "expected object key or end object, found: {:?}",
   86    158   
                    other
   87    159   
                )))
   88         -
            }
         160  +
            } /* JsonParserGenerator.kt:685 */
   89    161   
        }
         162  +
        /* JsonParserGenerator.kt:684 */
   90    163   
    }
         164  +
    /* JsonParserGenerator.kt:250 */
   91    165   
    if tokens.next().is_some() {
         166  +
        /* JsonParserGenerator.kt:251 */
   92    167   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   93    168   
            "found more JSON tokens after completing parsing",
   94    169   
        ));
         170  +
        /* JsonParserGenerator.kt:250 */
   95    171   
    }
         172  +
    /* JsonParserGenerator.kt:163 */
   96    173   
    Ok(builder)
         174  +
    /* JsonParserGenerator.kt:148 */
   97    175   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_json_enums_input.rs

@@ -1,1 +44,84 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_json_enums_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::json_enums::JsonEnumsInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.foo_enum1 {
           9  +
        /* JsonSerializerGenerator.kt:423 */
    7     10   
        object.key("fooEnum1").string(var_1.as_str());
          11  +
        /* JsonSerializerGenerator.kt:382 */
    8     12   
    }
          13  +
    /* JsonSerializerGenerator.kt:382 */
    9     14   
    if let Some(var_2) = &input.foo_enum2 {
          15  +
        /* JsonSerializerGenerator.kt:423 */
   10     16   
        object.key("fooEnum2").string(var_2.as_str());
          17  +
        /* JsonSerializerGenerator.kt:382 */
   11     18   
    }
          19  +
    /* JsonSerializerGenerator.kt:382 */
   12     20   
    if let Some(var_3) = &input.foo_enum3 {
          21  +
        /* JsonSerializerGenerator.kt:423 */
   13     22   
        object.key("fooEnum3").string(var_3.as_str());
          23  +
        /* JsonSerializerGenerator.kt:382 */
   14     24   
    }
          25  +
    /* JsonSerializerGenerator.kt:382 */
   15     26   
    if let Some(var_4) = &input.foo_enum_list {
          27  +
        /* JsonSerializerGenerator.kt:484 */
   16     28   
        let mut array_5 = object.key("fooEnumList").start_array();
          29  +
        /* JsonSerializerGenerator.kt:524 */
   17     30   
        for item_6 in var_4 {
          31  +
            /* SerializerUtil.kt:42 */
   18     32   
            {
          33  +
                /* JsonSerializerGenerator.kt:423 */
   19     34   
                array_5.value().string(item_6.as_str());
          35  +
                /* SerializerUtil.kt:42 */
   20     36   
            }
          37  +
            /* JsonSerializerGenerator.kt:524 */
   21     38   
        }
          39  +
        /* JsonSerializerGenerator.kt:486 */
   22     40   
        array_5.finish();
          41  +
        /* JsonSerializerGenerator.kt:382 */
   23     42   
    }
          43  +
    /* JsonSerializerGenerator.kt:382 */
   24     44   
    if let Some(var_7) = &input.foo_enum_set {
          45  +
        /* JsonSerializerGenerator.kt:484 */
   25     46   
        let mut array_8 = object.key("fooEnumSet").start_array();
          47  +
        /* JsonSerializerGenerator.kt:524 */
   26     48   
        for item_9 in var_7 {
          49  +
            /* SerializerUtil.kt:42 */
   27     50   
            {
          51  +
                /* JsonSerializerGenerator.kt:423 */
   28     52   
                array_8.value().string(item_9.as_str());
          53  +
                /* SerializerUtil.kt:42 */
   29     54   
            }
          55  +
            /* JsonSerializerGenerator.kt:524 */
   30     56   
        }
          57  +
        /* JsonSerializerGenerator.kt:486 */
   31     58   
        array_8.finish();
          59  +
        /* JsonSerializerGenerator.kt:382 */
   32     60   
    }
          61  +
    /* JsonSerializerGenerator.kt:382 */
   33     62   
    if let Some(var_10) = &input.foo_enum_map {
          63  +
        /* JsonSerializerGenerator.kt:495 */
   34     64   
        #[allow(unused_mut)]
          65  +
        /* JsonSerializerGenerator.kt:496 */
   35     66   
        let mut object_11 = object.key("fooEnumMap").start_object();
          67  +
        /* JsonSerializerGenerator.kt:537 */
   36     68   
        for (key_12, value_13) in var_10 {
          69  +
            /* SerializerUtil.kt:42 */
   37     70   
            {
          71  +
                /* JsonSerializerGenerator.kt:423 */
   38     72   
                object_11.key(key_12.as_str()).string(value_13.as_str());
          73  +
                /* SerializerUtil.kt:42 */
   39     74   
            }
          75  +
            /* JsonSerializerGenerator.kt:537 */
   40     76   
        }
          77  +
        /* JsonSerializerGenerator.kt:515 */
   41     78   
        object_11.finish();
          79  +
        /* JsonSerializerGenerator.kt:382 */
   42     80   
    }
          81  +
    /* JsonSerializerGenerator.kt:372 */
   43     82   
    Ok(())
          83  +
    /* JsonSerializerGenerator.kt:358 */
   44     84   
}