Client Test

Client Test

rev. dfb5149b65b7bcc09edd15b8e071ad43b5ac5943 (ignoring whitespace)

Files changed:

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_post_player_action_input.rs

@@ -1,1 +13,22 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_post_player_action_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::post_player_action::PostPlayerActionInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.action {
           9  +
        /* JsonSerializerGenerator.kt:495 */
    7     10   
        #[allow(unused_mut)]
          11  +
        /* JsonSerializerGenerator.kt:496 */
    8     12   
        let mut object_2 = object.key("action").start_object();
          13  +
        /* JsonSerializerGenerator.kt:579 */
    9     14   
        crate::protocol_serde::shape_player_action::ser_player_action(&mut object_2, var_1)?;
          15  +
        /* JsonSerializerGenerator.kt:515 */
   10     16   
        object_2.finish();
          17  +
        /* JsonSerializerGenerator.kt:382 */
   11     18   
    }
          19  +
    /* JsonSerializerGenerator.kt:372 */
   12     20   
    Ok(())
          21  +
    /* JsonSerializerGenerator.kt:358 */
   13     22   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_post_union_with_json_name.rs

@@ -1,1 +81,126 @@
    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_post_union_with_json_name_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::post_union_with_json_name::PostUnionWithJsonNameOutput,
    9     11   
    crate::operation::post_union_with_json_name::PostUnionWithJsonNameError,
   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::post_union_with_json_name::PostUnionWithJsonNameError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::post_union_with_json_name::PostUnionWithJsonNameError::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_post_union_with_json_name_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::post_union_with_json_name::PostUnionWithJsonNameOutput,
   25     34   
    crate::operation::post_union_with_json_name::PostUnionWithJsonNameError,
   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::post_union_with_json_name::builders::PostUnionWithJsonNameOutputBuilder::default();
          42  +
        /* ProtocolParserGenerator.kt:247 */
   30     43   
        output = crate::protocol_serde::shape_post_union_with_json_name::de_post_union_with_json_name(_response_body, output)
   31     44   
            .map_err(crate::operation::post_union_with_json_name::PostUnionWithJsonNameError::unhandled)?;
          45  +
        /* ClientBuilderInstantiator.kt:46 */
   32     46   
        crate::serde_util::post_union_with_json_name_output_output_correct_errors(output)
   33     47   
            .build()
   34     48   
            .map_err(crate::operation::post_union_with_json_name::PostUnionWithJsonNameError::unhandled)?
          49  +
        /* ProtocolParserGenerator.kt:77 */
   35     50   
    })
          51  +
    /* ProtocolParserGenerator.kt:71 */
   36     52   
}
   37     53   
          54  +
/* JsonSerializerGenerator.kt:287 */
   38     55   
pub fn ser_post_union_with_json_name_input(
   39     56   
    input: &crate::operation::post_union_with_json_name::PostUnionWithJsonNameInput,
   40     57   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          58  +
    /* JsonSerializerGenerator.kt:291 */
   41     59   
    let mut out = String::new();
          60  +
    /* JsonSerializerGenerator.kt:292 */
   42     61   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          62  +
    /* JsonSerializerGenerator.kt:375 */
   43     63   
    crate::protocol_serde::shape_post_union_with_json_name_input::ser_post_union_with_json_name_input_input(&mut object, input)?;
          64  +
    /* JsonSerializerGenerator.kt:295 */
   44     65   
    object.finish();
          66  +
    /* JsonSerializerGenerator.kt:296 */
   45     67   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          68  +
    /* JsonSerializerGenerator.kt:287 */
   46     69   
}
   47     70   
          71  +
/* JsonParserGenerator.kt:148 */
   48     72   
pub(crate) fn de_post_union_with_json_name(
   49     73   
    value: &[u8],
   50     74   
    mut builder: crate::operation::post_union_with_json_name::builders::PostUnionWithJsonNameOutputBuilder,
   51     75   
) -> ::std::result::Result<
   52     76   
    crate::operation::post_union_with_json_name::builders::PostUnionWithJsonNameOutputBuilder,
   53     77   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   54     78   
> {
          79  +
    /* JsonParserGenerator.kt:153 */
   55     80   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   56     81   
    let tokens = &mut tokens_owned;
   57     82   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          83  +
    /* JsonParserGenerator.kt:684 */
   58     84   
    loop {
          85  +
        /* JsonParserGenerator.kt:685 */
   59     86   
        match tokens.next().transpose()? {
   60         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   61         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          87  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          88  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          89  +
                /* JsonParserGenerator.kt:260 */
          90  +
                match key.to_unescaped()?.as_ref() {
          91  +
                    /* JsonParserGenerator.kt:262 */
   62     92   
                    "value" => {
   63         -
                    builder = builder.set_value(crate::protocol_serde::shape_union_with_json_name::de_union_with_json_name(tokens)?);
          93  +
                        /* JsonParserGenerator.kt:265 */
          94  +
                        builder = builder.set_value(
          95  +
                            /* JsonParserGenerator.kt:660 */
          96  +
                            crate::protocol_serde::shape_union_with_json_name::de_union_with_json_name(tokens)?, /* JsonParserGenerator.kt:265 */
          97  +
                        );
          98  +
                        /* JsonParserGenerator.kt:262 */
   64     99   
                    }
   65         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   66         -
            },
         100  +
                    /* JsonParserGenerator.kt:290 */
         101  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
         102  +
                }
         103  +
                /* JsonParserGenerator.kt:686 */
         104  +
            }
         105  +
            /* JsonParserGenerator.kt:695 */
   67    106   
            other => {
   68    107   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   69    108   
                    "expected object key or end object, found: {:?}",
   70    109   
                    other
   71    110   
                )))
         111  +
            } /* JsonParserGenerator.kt:685 */
   72    112   
        }
         113  +
        /* JsonParserGenerator.kt:684 */
   73    114   
    }
   74         -
    }
         115  +
    /* JsonParserGenerator.kt:250 */
   75    116   
    if tokens.next().is_some() {
         117  +
        /* JsonParserGenerator.kt:251 */
   76    118   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   77    119   
            "found more JSON tokens after completing parsing",
   78    120   
        ));
         121  +
        /* JsonParserGenerator.kt:250 */
   79    122   
    }
         123  +
    /* JsonParserGenerator.kt:163 */
   80    124   
    Ok(builder)
         125  +
    /* JsonParserGenerator.kt:148 */
   81    126   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_post_union_with_json_name_input.rs

@@ -1,1 +13,22 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_post_union_with_json_name_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::post_union_with_json_name::PostUnionWithJsonNameInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.value {
           9  +
        /* JsonSerializerGenerator.kt:495 */
    7     10   
        #[allow(unused_mut)]
          11  +
        /* JsonSerializerGenerator.kt:496 */
    8     12   
        let mut object_2 = object.key("value").start_object();
          13  +
        /* JsonSerializerGenerator.kt:579 */
    9     14   
        crate::protocol_serde::shape_union_with_json_name::ser_union_with_json_name(&mut object_2, var_1)?;
          15  +
        /* JsonSerializerGenerator.kt:515 */
   10     16   
        object_2.finish();
          17  +
        /* JsonSerializerGenerator.kt:382 */
   11     18   
    }
          19  +
    /* JsonSerializerGenerator.kt:372 */
   12     20   
    Ok(())
          21  +
    /* JsonSerializerGenerator.kt:358 */
   13     22   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_put_with_content_encoding.rs

@@ -1,1 +60,89 @@
    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_put_with_content_encoding_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::put_with_content_encoding::PutWithContentEncodingOutput,
    9     11   
    crate::operation::put_with_content_encoding::PutWithContentEncodingError,
   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::put_with_content_encoding::PutWithContentEncodingError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::put_with_content_encoding::PutWithContentEncodingError::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_put_with_content_encoding_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::put_with_content_encoding::PutWithContentEncodingOutput,
   25     34   
    crate::operation::put_with_content_encoding::PutWithContentEncodingError,
   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::put_with_content_encoding::builders::PutWithContentEncodingOutputBuilder::default();
          42  +
        /* ClientBuilderInstantiator.kt:56 */
   30     43   
        output.build()
          44  +
        /* ProtocolParserGenerator.kt:77 */
   31     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:71 */
   32     47   
}
   33     48   
          49  +
/* HttpBindingGenerator.kt:542 */
   34     50   
pub fn ser_put_with_content_encoding_headers(
   35     51   
    input: &crate::operation::put_with_content_encoding::PutWithContentEncodingInput,
   36     52   
    mut builder: ::http::request::Builder,
   37     53   
) -> std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
          54  +
    /* HttpBindingGenerator.kt:592 */
   38     55   
    if let ::std::option::Option::Some(inner_1) = &input.encoding {
          56  +
        /* HttpBindingGenerator.kt:704 */
   39     57   
        let formatted_2 = inner_1.as_str();
          58  +
        /* HttpBindingGenerator.kt:706 */
   40     59   
        let header_value = formatted_2;
   41     60   
        let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
   42     61   
            ::aws_smithy_types::error::operation::BuildError::invalid_field(
   43     62   
                "encoding",
   44     63   
                format!("`{}` cannot be used as a header value: {}", &header_value, err),
   45     64   
            )
   46     65   
        })?;
   47     66   
        builder = builder.header("Content-Encoding", header_value);
          67  +
        /* HttpBindingGenerator.kt:592 */
   48     68   
    }
          69  +
    /* HttpBindingGenerator.kt:555 */
   49     70   
    Ok(builder)
          71  +
    /* HttpBindingGenerator.kt:542 */
   50     72   
}
   51     73   
          74  +
/* JsonSerializerGenerator.kt:287 */
   52     75   
pub fn ser_put_with_content_encoding_input(
   53     76   
    input: &crate::operation::put_with_content_encoding::PutWithContentEncodingInput,
   54     77   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          78  +
    /* JsonSerializerGenerator.kt:291 */
   55     79   
    let mut out = String::new();
          80  +
    /* JsonSerializerGenerator.kt:292 */
   56     81   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          82  +
    /* JsonSerializerGenerator.kt:375 */
   57     83   
    crate::protocol_serde::shape_put_with_content_encoding_input::ser_put_with_content_encoding_input_input(&mut object, input)?;
          84  +
    /* JsonSerializerGenerator.kt:295 */
   58     85   
    object.finish();
          86  +
    /* JsonSerializerGenerator.kt:296 */
   59     87   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          88  +
    /* JsonSerializerGenerator.kt:287 */
   60     89   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_put_with_content_encoding_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_put_with_content_encoding_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::put_with_content_encoding::PutWithContentEncodingInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.data {
           9  +
        /* JsonSerializerGenerator.kt:423 */
    7     10   
        object.key("data").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/rest_json/rust-client-codegen/src/protocol_serde/shape_query_idempotency_token_auto_fill.rs

@@ -1,1 +32,47 @@
    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_query_idempotency_token_auto_fill_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::query_idempotency_token_auto_fill::QueryIdempotencyTokenAutoFillOutput,
    9     11   
    crate::operation::query_idempotency_token_auto_fill::QueryIdempotencyTokenAutoFillError,
   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::query_idempotency_token_auto_fill::QueryIdempotencyTokenAutoFillError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::query_idempotency_token_auto_fill::QueryIdempotencyTokenAutoFillError::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_query_idempotency_token_auto_fill_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::query_idempotency_token_auto_fill::QueryIdempotencyTokenAutoFillOutput,
   25     34   
    crate::operation::query_idempotency_token_auto_fill::QueryIdempotencyTokenAutoFillError,
   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::query_idempotency_token_auto_fill::builders::QueryIdempotencyTokenAutoFillOutputBuilder::default();
          42  +
        /* ClientBuilderInstantiator.kt:56 */
   30     43   
        output.build()
          44  +
        /* ProtocolParserGenerator.kt:77 */
   31     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:71 */
   32     47   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_query_params_as_string_list_map.rs

@@ -1,1 +32,47 @@
    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_query_params_as_string_list_map_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::query_params_as_string_list_map::QueryParamsAsStringListMapOutput,
    9     11   
    crate::operation::query_params_as_string_list_map::QueryParamsAsStringListMapError,
   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::query_params_as_string_list_map::QueryParamsAsStringListMapError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::query_params_as_string_list_map::QueryParamsAsStringListMapError::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_query_params_as_string_list_map_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::query_params_as_string_list_map::QueryParamsAsStringListMapOutput,
   25     34   
    crate::operation::query_params_as_string_list_map::QueryParamsAsStringListMapError,
   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::query_params_as_string_list_map::builders::QueryParamsAsStringListMapOutputBuilder::default();
          42  +
        /* ClientBuilderInstantiator.kt:56 */
   30     43   
        output.build()
          44  +
        /* ProtocolParserGenerator.kt:77 */
   31     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:71 */
   32     47   
}

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

@@ -1,1 +26,41 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_query_precedence_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::query_precedence::QueryPrecedenceOutput, crate::operation::query_precedence::QueryPrecedenceError> {
          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::query_precedence::QueryPrecedenceError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::query_precedence::QueryPrecedenceError::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_query_precedence_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::query_precedence::QueryPrecedenceOutput, crate::operation::query_precedence::QueryPrecedenceError> {
          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::query_precedence::builders::QueryPrecedenceOutputBuilder::default();
          36  +
        /* ClientBuilderInstantiator.kt:56 */
   24     37   
        output.build()
          38  +
        /* ProtocolParserGenerator.kt:77 */
   25     39   
    })
          40  +
    /* ProtocolParserGenerator.kt:71 */
   26     41   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_recursive_shapes.rs

@@ -1,1 +75,117 @@
    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_recursive_shapes_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::recursive_shapes::RecursiveShapesOutput, crate::operation::recursive_shapes::RecursiveShapesError> {
          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::recursive_shapes::RecursiveShapesError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::recursive_shapes::RecursiveShapesError::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_recursive_shapes_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::recursive_shapes::RecursiveShapesOutput, crate::operation::recursive_shapes::RecursiveShapesError> {
          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::recursive_shapes::builders::RecursiveShapesOutputBuilder::default();
          36  +
        /* ProtocolParserGenerator.kt:247 */
   24     37   
        output = crate::protocol_serde::shape_recursive_shapes::de_recursive_shapes(_response_body, output)
   25     38   
            .map_err(crate::operation::recursive_shapes::RecursiveShapesError::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_recursive_shapes_input(
   31     48   
    input: &crate::operation::recursive_shapes::RecursiveShapesInput,
   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_recursive_shapes_input::ser_recursive_shapes_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_recursive_shapes(
   41     65   
    value: &[u8],
   42     66   
    mut builder: crate::operation::recursive_shapes::builders::RecursiveShapesOutputBuilder,
   43     67   
) -> ::std::result::Result<
   44     68   
    crate::operation::recursive_shapes::builders::RecursiveShapesOutputBuilder,
   45     69   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   46     70   
> {
          71  +
    /* JsonParserGenerator.kt:153 */
   47     72   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   48     73   
    let tokens = &mut tokens_owned;
   49     74   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          75  +
    /* JsonParserGenerator.kt:684 */
   50     76   
    loop {
          77  +
        /* JsonParserGenerator.kt:685 */
   51     78   
        match tokens.next().transpose()? {
   52         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   53         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          79  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          80  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          81  +
                /* JsonParserGenerator.kt:260 */
          82  +
                match key.to_unescaped()?.as_ref() {
          83  +
                    /* JsonParserGenerator.kt:262 */
   54     84   
                    "nested" => {
          85  +
                        /* JsonParserGenerator.kt:265 */
   55     86   
                        builder = builder.set_nested(
   56         -
                        crate::protocol_serde::shape_recursive_shapes_input_output_nested1::de_recursive_shapes_input_output_nested1(tokens)?,
   57         -
                    );
          87  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_recursive_shapes_input_output_nested1::de_recursive_shapes_input_output_nested1(tokens)?
          88  +
                        /* JsonParserGenerator.kt:265 */);
          89  +
                        /* JsonParserGenerator.kt:262 */
   58     90   
                    }
   59         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   60         -
            },
          91  +
                    /* JsonParserGenerator.kt:290 */
          92  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          93  +
                }
          94  +
                /* JsonParserGenerator.kt:686 */
          95  +
            }
          96  +
            /* JsonParserGenerator.kt:695 */
   61     97   
            other => {
   62     98   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   63     99   
                    "expected object key or end object, found: {:?}",
   64    100   
                    other
   65    101   
                )))
         102  +
            } /* JsonParserGenerator.kt:685 */
   66    103   
        }
         104  +
        /* JsonParserGenerator.kt:684 */
   67    105   
    }
   68         -
    }
         106  +
    /* JsonParserGenerator.kt:250 */
   69    107   
    if tokens.next().is_some() {
         108  +
        /* JsonParserGenerator.kt:251 */
   70    109   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   71    110   
            "found more JSON tokens after completing parsing",
   72    111   
        ));
         112  +
        /* JsonParserGenerator.kt:250 */
   73    113   
    }
         114  +
    /* JsonParserGenerator.kt:163 */
   74    115   
    Ok(builder)
         116  +
    /* JsonParserGenerator.kt:148 */
   75    117   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_recursive_shapes_input.rs

@@ -1,1 +13,22 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_recursive_shapes_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::recursive_shapes::RecursiveShapesInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.nested {
           9  +
        /* JsonSerializerGenerator.kt:495 */
    7     10   
        #[allow(unused_mut)]
          11  +
        /* JsonSerializerGenerator.kt:496 */
    8     12   
        let mut object_2 = object.key("nested").start_object();
          13  +
        /* JsonSerializerGenerator.kt:375 */
    9     14   
        crate::protocol_serde::shape_recursive_shapes_input_output_nested1::ser_recursive_shapes_input_output_nested1(&mut object_2, var_1)?;
          15  +
        /* JsonSerializerGenerator.kt:515 */
   10     16   
        object_2.finish();
          17  +
        /* JsonSerializerGenerator.kt:382 */
   11     18   
    }
          19  +
    /* JsonSerializerGenerator.kt:372 */
   12     20   
    Ok(())
          21  +
    /* JsonSerializerGenerator.kt:358 */
   13     22   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_recursive_shapes_input_output_nested1.rs

@@ -1,1 +62,109 @@
    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_recursive_shapes_input_output_nested1<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<crate::types::RecursiveShapesInputOutputNested1>, ::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::RecursiveShapesInputOutputNested1Builder::default();
          17  +
            /* JsonParserGenerator.kt:684 */
   13     18   
            loop {
          19  +
                /* JsonParserGenerator.kt:685 */
   14     20   
                match tokens.next().transpose()? {
   15         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   16         -
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          21  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          23  +
                        /* JsonParserGenerator.kt:260 */
          24  +
                        match key.to_unescaped()?.as_ref() {
          25  +
                            /* JsonParserGenerator.kt:262 */
   17     26   
                            "foo" => {
          27  +
                                /* JsonParserGenerator.kt:265 */
   18     28   
                                builder = builder.set_foo(
          29  +
                                    /* JsonParserGenerator.kt:354 */
   19     30   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   20         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   21         -
                                    .transpose()?,
          31  +
                                        .map(|s|
          32  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          33  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          34  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          35  +
                                        .transpose()?, /* JsonParserGenerator.kt:265 */
   22     36   
                                );
          37  +
                                /* JsonParserGenerator.kt:262 */
   23     38   
                            }
          39  +
                            /* JsonParserGenerator.kt:262 */
   24     40   
                            "nested" => {
          41  +
                                /* JsonParserGenerator.kt:265 */
   25     42   
                                builder = builder.set_nested(
   26         -
                                crate::protocol_serde::shape_recursive_shapes_input_output_nested2::de_recursive_shapes_input_output_nested2(tokens)?
   27         -
                                    .map(Box::new),
          43  +
                                    /* JsonParserGenerator.kt:544 */
          44  +
                                    crate::protocol_serde::shape_recursive_shapes_input_output_nested2::de_recursive_shapes_input_output_nested2(
          45  +
                                        tokens,
          46  +
                                    )?
          47  +
                                    /* JsonParserGenerator.kt:314 */
          48  +
                                    .map(Box::new), /* JsonParserGenerator.kt:265 */
   28     49   
                                );
          50  +
                                /* JsonParserGenerator.kt:262 */
   29     51   
                            }
   30         -
                        _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   31         -
                    },
          52  +
                            /* JsonParserGenerator.kt:290 */
          53  +
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          54  +
                        }
          55  +
                        /* JsonParserGenerator.kt:686 */
          56  +
                    }
          57  +
                    /* JsonParserGenerator.kt:695 */
   32     58   
                    other => {
   33     59   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   34     60   
                            "expected object key or end object, found: {:?}",
   35     61   
                            other
   36     62   
                        )))
          63  +
                    } /* JsonParserGenerator.kt:685 */
   37     64   
                }
          65  +
                /* JsonParserGenerator.kt:684 */
   38     66   
            }
   39         -
            }
          67  +
            /* JsonParserGenerator.kt:540 */
   40     68   
            Ok(Some(builder.build()))
          69  +
            /* JsonParserGenerator.kt:713 */
   41     70   
        }
   42         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          71  +
        /* JsonParserGenerator.kt:722 */
          72  +
        _ => {
          73  +
            /* JsonParserGenerator.kt:723 */
          74  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   43     75   
                "expected start object or null",
   44         -
        )),
          76  +
            ))
          77  +
            /* JsonParserGenerator.kt:722 */
          78  +
        } /* JsonParserGenerator.kt:712 */
   45     79   
    }
          80  +
    /* JsonParserGenerator.kt:516 */
   46     81   
}
   47     82   
          83  +
/* JsonSerializerGenerator.kt:358 */
   48     84   
pub fn ser_recursive_shapes_input_output_nested1(
   49     85   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   50     86   
    input: &crate::types::RecursiveShapesInputOutputNested1,
   51     87   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          88  +
    /* JsonSerializerGenerator.kt:382 */
   52     89   
    if let Some(var_1) = &input.foo {
          90  +
        /* JsonSerializerGenerator.kt:423 */
   53     91   
        object.key("foo").string(var_1.as_str());
          92  +
        /* JsonSerializerGenerator.kt:382 */
   54     93   
    }
          94  +
    /* JsonSerializerGenerator.kt:382 */
   55     95   
    if let Some(var_2) = &input.nested {
          96  +
        /* JsonSerializerGenerator.kt:495 */
   56     97   
        #[allow(unused_mut)]
          98  +
        /* JsonSerializerGenerator.kt:496 */
   57     99   
        let mut object_3 = object.key("nested").start_object();
         100  +
        /* JsonSerializerGenerator.kt:375 */
   58    101   
        crate::protocol_serde::shape_recursive_shapes_input_output_nested2::ser_recursive_shapes_input_output_nested2(&mut object_3, var_2)?;
         102  +
        /* JsonSerializerGenerator.kt:515 */
   59    103   
        object_3.finish();
         104  +
        /* JsonSerializerGenerator.kt:382 */
   60    105   
    }
         106  +
    /* JsonSerializerGenerator.kt:372 */
   61    107   
    Ok(())
         108  +
    /* JsonSerializerGenerator.kt:358 */
   62    109   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_recursive_shapes_input_output_nested2.rs

@@ -1,1 +61,107 @@
    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_recursive_shapes_input_output_nested2<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<crate::types::RecursiveShapesInputOutputNested2>, ::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::RecursiveShapesInputOutputNested2Builder::default();
          17  +
            /* JsonParserGenerator.kt:684 */
   13     18   
            loop {
          19  +
                /* JsonParserGenerator.kt:685 */
   14     20   
                match tokens.next().transpose()? {
   15         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   16         -
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          21  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          23  +
                        /* JsonParserGenerator.kt:260 */
          24  +
                        match key.to_unescaped()?.as_ref() {
          25  +
                            /* JsonParserGenerator.kt:262 */
   17     26   
                            "bar" => {
          27  +
                                /* JsonParserGenerator.kt:265 */
   18     28   
                                builder = builder.set_bar(
          29  +
                                    /* JsonParserGenerator.kt:354 */
   19     30   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   20         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   21         -
                                    .transpose()?,
          31  +
                                        .map(|s|
          32  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          33  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          34  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          35  +
                                        .transpose()?, /* JsonParserGenerator.kt:265 */
   22     36   
                                );
          37  +
                                /* JsonParserGenerator.kt:262 */
   23     38   
                            }
          39  +
                            /* JsonParserGenerator.kt:262 */
   24     40   
                            "recursiveMember" => {
          41  +
                                /* JsonParserGenerator.kt:265 */
   25     42   
                                builder = builder.set_recursive_member(
   26         -
                                crate::protocol_serde::shape_recursive_shapes_input_output_nested1::de_recursive_shapes_input_output_nested1(tokens)?,
          43  +
                                    /* JsonParserGenerator.kt:544 */
          44  +
                                    crate::protocol_serde::shape_recursive_shapes_input_output_nested1::de_recursive_shapes_input_output_nested1(
          45  +
                                        tokens,
          46  +
                                    )?, /* JsonParserGenerator.kt:265 */
   27     47   
                                );
          48  +
                                /* JsonParserGenerator.kt:262 */
   28     49   
                            }
   29         -
                        _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   30         -
                    },
          50  +
                            /* JsonParserGenerator.kt:290 */
          51  +
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          52  +
                        }
          53  +
                        /* JsonParserGenerator.kt:686 */
          54  +
                    }
          55  +
                    /* JsonParserGenerator.kt:695 */
   31     56   
                    other => {
   32     57   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   33     58   
                            "expected object key or end object, found: {:?}",
   34     59   
                            other
   35     60   
                        )))
          61  +
                    } /* JsonParserGenerator.kt:685 */
   36     62   
                }
          63  +
                /* JsonParserGenerator.kt:684 */
   37     64   
            }
   38         -
            }
          65  +
            /* JsonParserGenerator.kt:540 */
   39     66   
            Ok(Some(builder.build()))
          67  +
            /* JsonParserGenerator.kt:713 */
   40     68   
        }
   41         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          69  +
        /* JsonParserGenerator.kt:722 */
          70  +
        _ => {
          71  +
            /* JsonParserGenerator.kt:723 */
          72  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   42     73   
                "expected start object or null",
   43         -
        )),
          74  +
            ))
          75  +
            /* JsonParserGenerator.kt:722 */
          76  +
        } /* JsonParserGenerator.kt:712 */
   44     77   
    }
          78  +
    /* JsonParserGenerator.kt:516 */
   45     79   
}
   46     80   
          81  +
/* JsonSerializerGenerator.kt:358 */
   47     82   
pub fn ser_recursive_shapes_input_output_nested2(
   48     83   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   49     84   
    input: &crate::types::RecursiveShapesInputOutputNested2,
   50     85   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          86  +
    /* JsonSerializerGenerator.kt:382 */
   51     87   
    if let Some(var_1) = &input.bar {
          88  +
        /* JsonSerializerGenerator.kt:423 */
   52     89   
        object.key("bar").string(var_1.as_str());
          90  +
        /* JsonSerializerGenerator.kt:382 */
   53     91   
    }
          92  +
    /* JsonSerializerGenerator.kt:382 */
   54     93   
    if let Some(var_2) = &input.recursive_member {
          94  +
        /* JsonSerializerGenerator.kt:495 */
   55     95   
        #[allow(unused_mut)]
          96  +
        /* JsonSerializerGenerator.kt:496 */
   56     97   
        let mut object_3 = object.key("recursiveMember").start_object();
          98  +
        /* JsonSerializerGenerator.kt:375 */
   57     99   
        crate::protocol_serde::shape_recursive_shapes_input_output_nested1::ser_recursive_shapes_input_output_nested1(&mut object_3, var_2)?;
         100  +
        /* JsonSerializerGenerator.kt:515 */
   58    101   
        object_3.finish();
         102  +
        /* JsonSerializerGenerator.kt:382 */
   59    103   
    }
         104  +
    /* JsonSerializerGenerator.kt:372 */
   60    105   
    Ok(())
         106  +
    /* JsonSerializerGenerator.kt:358 */
   61    107   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_renamed_greeting.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_renamed_greeting<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<crate::types::RenamedGreeting>, ::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::RenamedGreetingBuilder::default();
          17  +
            /* JsonParserGenerator.kt:684 */
   13     18   
            loop {
          19  +
                /* JsonParserGenerator.kt:685 */
   14     20   
                match tokens.next().transpose()? {
   15         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   16         -
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          21  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          23  +
                        /* JsonParserGenerator.kt:260 */
          24  +
                        match key.to_unescaped()?.as_ref() {
          25  +
                            /* JsonParserGenerator.kt:262 */
   17     26   
                            "salutation" => {
          27  +
                                /* JsonParserGenerator.kt:265 */
   18     28   
                                builder = builder.set_salutation(
          29  +
                                    /* JsonParserGenerator.kt:354 */
   19     30   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   20         -
                                    .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   21         -
                                    .transpose()?,
          31  +
                                        .map(|s|
          32  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          33  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          34  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          35  +
                                        .transpose()?, /* JsonParserGenerator.kt:265 */
   22     36   
                                );
          37  +
                                /* JsonParserGenerator.kt:262 */
   23     38   
                            }
   24         -
                        _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   25         -
                    },
          39  +
                            /* JsonParserGenerator.kt:290 */
          40  +
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          41  +
                        }
          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   
                        )))
          50  +
                    } /* JsonParserGenerator.kt:685 */
   31     51   
                }
          52  +
                /* JsonParserGenerator.kt:684 */
   32     53   
            }
   33         -
            }
          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(
          58  +
        /* JsonParserGenerator.kt:722 */
          59  +
        _ => {
          60  +
            /* JsonParserGenerator.kt:723 */
          61  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   37     62   
                "expected start object or null",
   38         -
        )),
          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_renamed_greeting(
   43     72   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   44     73   
    input: &crate::types::RenamedGreeting,
   45     74   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
          75  +
    /* JsonSerializerGenerator.kt:382 */
   46     76   
    if let Some(var_1) = &input.salutation {
          77  +
        /* JsonSerializerGenerator.kt:423 */
   47     78   
        object.key("salutation").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/rest_json/rust-client-codegen/src/protocol_serde/shape_simple_scalar_properties.rs

@@ -1,1 +148,239 @@
    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_simple_scalar_properties_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::simple_scalar_properties::SimpleScalarPropertiesOutput,
    9     11   
    crate::operation::simple_scalar_properties::SimpleScalarPropertiesError,
   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::simple_scalar_properties::SimpleScalarPropertiesError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::simple_scalar_properties::SimpleScalarPropertiesError::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_simple_scalar_properties_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::simple_scalar_properties::SimpleScalarPropertiesOutput,
   25     34   
    crate::operation::simple_scalar_properties::SimpleScalarPropertiesError,
   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::simple_scalar_properties::builders::SimpleScalarPropertiesOutputBuilder::default();
          42  +
        /* ProtocolParserGenerator.kt:247 */
   30     43   
        output = crate::protocol_serde::shape_simple_scalar_properties::de_simple_scalar_properties(_response_body, output)
   31     44   
            .map_err(crate::operation::simple_scalar_properties::SimpleScalarPropertiesError::unhandled)?;
          45  +
        /* ProtocolParserGenerator.kt:267 */
   32     46   
        output = output.set_foo(
          47  +
            /* ProtocolParserGenerator.kt:302 */
   33     48   
            crate::protocol_serde::shape_simple_scalar_properties_output::de_foo_header(_response_headers).map_err(|_| {
   34     49   
                crate::operation::simple_scalar_properties::SimpleScalarPropertiesError::unhandled("Failed to parse foo from header `X-Foo")
   35         -
            })?,
          50  +
            })?, /* ProtocolParserGenerator.kt:267 */
   36     51   
        );
          52  +
        /* ClientBuilderInstantiator.kt:56 */
   37     53   
        output.build()
          54  +
        /* ProtocolParserGenerator.kt:77 */
   38     55   
    })
          56  +
    /* ProtocolParserGenerator.kt:71 */
   39     57   
}
   40     58   
          59  +
/* HttpBindingGenerator.kt:542 */
   41     60   
pub fn ser_simple_scalar_properties_headers(
   42     61   
    input: &crate::operation::simple_scalar_properties::SimpleScalarPropertiesInput,
   43     62   
    mut builder: ::http::request::Builder,
   44     63   
) -> std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
          64  +
    /* HttpBindingGenerator.kt:592 */
   45     65   
    if let ::std::option::Option::Some(inner_1) = &input.foo {
          66  +
        /* HttpBindingGenerator.kt:704 */
   46     67   
        let formatted_2 = inner_1.as_str();
          68  +
        /* HttpBindingGenerator.kt:706 */
   47     69   
        let header_value = formatted_2;
   48     70   
        let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
   49     71   
            ::aws_smithy_types::error::operation::BuildError::invalid_field(
   50     72   
                "foo",
   51     73   
                format!("`{}` cannot be used as a header value: {}", &header_value, err),
   52     74   
            )
   53     75   
        })?;
   54     76   
        builder = builder.header("X-Foo", header_value);
          77  +
        /* HttpBindingGenerator.kt:592 */
   55     78   
    }
          79  +
    /* HttpBindingGenerator.kt:555 */
   56     80   
    Ok(builder)
          81  +
    /* HttpBindingGenerator.kt:542 */
   57     82   
}
   58     83   
          84  +
/* JsonSerializerGenerator.kt:287 */
   59     85   
pub fn ser_simple_scalar_properties_input(
   60     86   
    input: &crate::operation::simple_scalar_properties::SimpleScalarPropertiesInput,
   61     87   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          88  +
    /* JsonSerializerGenerator.kt:291 */
   62     89   
    let mut out = String::new();
          90  +
    /* JsonSerializerGenerator.kt:292 */
   63     91   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          92  +
    /* JsonSerializerGenerator.kt:375 */
   64     93   
    crate::protocol_serde::shape_simple_scalar_properties_input::ser_simple_scalar_properties_input_input(&mut object, input)?;
          94  +
    /* JsonSerializerGenerator.kt:295 */
   65     95   
    object.finish();
          96  +
    /* JsonSerializerGenerator.kt:296 */
   66     97   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          98  +
    /* JsonSerializerGenerator.kt:287 */
   67     99   
}
   68    100   
         101  +
/* JsonParserGenerator.kt:148 */
   69    102   
pub(crate) fn de_simple_scalar_properties(
   70    103   
    value: &[u8],
   71    104   
    mut builder: crate::operation::simple_scalar_properties::builders::SimpleScalarPropertiesOutputBuilder,
   72    105   
) -> ::std::result::Result<
   73    106   
    crate::operation::simple_scalar_properties::builders::SimpleScalarPropertiesOutputBuilder,
   74    107   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   75    108   
> {
         109  +
    /* JsonParserGenerator.kt:153 */
   76    110   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   77    111   
    let tokens = &mut tokens_owned;
   78    112   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
         113  +
    /* JsonParserGenerator.kt:684 */
   79    114   
    loop {
         115  +
        /* JsonParserGenerator.kt:685 */
   80    116   
        match tokens.next().transpose()? {
   81         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   82         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
         117  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
         118  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
         119  +
                /* JsonParserGenerator.kt:260 */
         120  +
                match key.to_unescaped()?.as_ref() {
         121  +
                    /* JsonParserGenerator.kt:262 */
   83    122   
                    "byteValue" => {
         123  +
                        /* JsonParserGenerator.kt:265 */
   84    124   
                        builder = builder.set_byte_value(
         125  +
                            /* JsonParserGenerator.kt:365 */
   85    126   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   86    127   
                                .map(i8::try_from)
   87         -
                            .transpose()?,
         128  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   88    129   
                        );
         130  +
                        /* JsonParserGenerator.kt:262 */
   89    131   
                    }
         132  +
                    /* JsonParserGenerator.kt:262 */
   90    133   
                    "DoubleDribble" => {
   91         -
                    builder = builder
   92         -
                        .set_double_value(::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?.map(|v| v.to_f64_lossy()));
         134  +
                        /* JsonParserGenerator.kt:265 */
         135  +
                        builder = builder.set_double_value(
         136  +
                            /* JsonParserGenerator.kt:363 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?.map(|v| v.to_f64_lossy())
         137  +
                        /* JsonParserGenerator.kt:265 */);
         138  +
                        /* JsonParserGenerator.kt:262 */
   93    139   
                    }
         140  +
                    /* JsonParserGenerator.kt:262 */
   94    141   
                    "falseBooleanValue" => {
   95         -
                    builder = builder.set_false_boolean_value(::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?);
         142  +
                        /* JsonParserGenerator.kt:265 */
         143  +
                        builder = builder.set_false_boolean_value(
         144  +
                            /* JsonParserGenerator.kt:298 */
         145  +
                            ::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?, /* JsonParserGenerator.kt:265 */
         146  +
                        );
         147  +
                        /* JsonParserGenerator.kt:262 */
   96    148   
                    }
         149  +
                    /* JsonParserGenerator.kt:262 */
   97    150   
                    "floatValue" => {
   98         -
                    builder = builder
   99         -
                        .set_float_value(::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?.map(|v| v.to_f32_lossy()));
         151  +
                        /* JsonParserGenerator.kt:265 */
         152  +
                        builder = builder.set_float_value(
         153  +
                            /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?.map(|v| v.to_f32_lossy())
         154  +
                        /* JsonParserGenerator.kt:265 */);
         155  +
                        /* JsonParserGenerator.kt:262 */
  100    156   
                    }
         157  +
                    /* JsonParserGenerator.kt:262 */
  101    158   
                    "integerValue" => {
         159  +
                        /* JsonParserGenerator.kt:265 */
  102    160   
                        builder = builder.set_integer_value(
         161  +
                            /* JsonParserGenerator.kt:365 */
  103    162   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
  104    163   
                                .map(i32::try_from)
  105         -
                            .transpose()?,
         164  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
  106    165   
                        );
         166  +
                        /* JsonParserGenerator.kt:262 */
  107    167   
                    }
         168  +
                    /* JsonParserGenerator.kt:262 */
  108    169   
                    "longValue" => {
         170  +
                        /* JsonParserGenerator.kt:265 */
  109    171   
                        builder = builder.set_long_value(
         172  +
                            /* JsonParserGenerator.kt:365 */
  110    173   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
  111    174   
                                .map(i64::try_from)
  112         -
                            .transpose()?,
         175  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
  113    176   
                        );
         177  +
                        /* JsonParserGenerator.kt:262 */
  114    178   
                    }
         179  +
                    /* JsonParserGenerator.kt:262 */
  115    180   
                    "shortValue" => {
         181  +
                        /* JsonParserGenerator.kt:265 */
  116    182   
                        builder = builder.set_short_value(
         183  +
                            /* JsonParserGenerator.kt:365 */
  117    184   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
  118    185   
                                .map(i16::try_from)
  119         -
                            .transpose()?,
         186  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
  120    187   
                        );
         188  +
                        /* JsonParserGenerator.kt:262 */
  121    189   
                    }
         190  +
                    /* JsonParserGenerator.kt:262 */
  122    191   
                    "stringValue" => {
         192  +
                        /* JsonParserGenerator.kt:265 */
  123    193   
                        builder = builder.set_string_value(
         194  +
                            /* JsonParserGenerator.kt:354 */
  124    195   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
  125         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
  126         -
                            .transpose()?,
         196  +
                                .map(|s|
         197  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
         198  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
         199  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
         200  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
  127    201   
                        );
         202  +
                        /* JsonParserGenerator.kt:262 */
  128    203   
                    }
         204  +
                    /* JsonParserGenerator.kt:262 */
  129    205   
                    "trueBooleanValue" => {
  130         -
                    builder = builder.set_true_boolean_value(::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?);
         206  +
                        /* JsonParserGenerator.kt:265 */
         207  +
                        builder = builder.set_true_boolean_value(
         208  +
                            /* JsonParserGenerator.kt:298 */
         209  +
                            ::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?, /* JsonParserGenerator.kt:265 */
         210  +
                        );
         211  +
                        /* JsonParserGenerator.kt:262 */
         212  +
                    }
         213  +
                    /* JsonParserGenerator.kt:290 */
         214  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
  131    215   
                }
  132         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
  133         -
            },
         216  +
                /* JsonParserGenerator.kt:686 */
         217  +
            }
         218  +
            /* JsonParserGenerator.kt:695 */
  134    219   
            other => {
  135    220   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  136    221   
                    "expected object key or end object, found: {:?}",
  137    222   
                    other
  138    223   
                )))
         224  +
            } /* JsonParserGenerator.kt:685 */
  139    225   
        }
         226  +
        /* JsonParserGenerator.kt:684 */
  140    227   
    }
  141         -
    }
         228  +
    /* JsonParserGenerator.kt:250 */
  142    229   
    if tokens.next().is_some() {
         230  +
        /* JsonParserGenerator.kt:251 */
  143    231   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
  144    232   
            "found more JSON tokens after completing parsing",
  145    233   
        ));
         234  +
        /* JsonParserGenerator.kt:250 */
  146    235   
    }
         236  +
    /* JsonParserGenerator.kt:163 */
  147    237   
    Ok(builder)
         238  +
    /* JsonParserGenerator.kt:148 */
  148    239   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_simple_scalar_properties_input.rs

@@ -1,1 +52,82 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_simple_scalar_properties_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::simple_scalar_properties::SimpleScalarPropertiesInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.byte_value {
           9  +
        /* JsonSerializerGenerator.kt:432 */
    7     10   
        object.key("byteValue").number(
    8     11   
            #[allow(clippy::useless_conversion)]
    9     12   
            ::aws_smithy_types::Number::NegInt((*var_1).into()),
   10     13   
        );
          14  +
        /* JsonSerializerGenerator.kt:382 */
   11     15   
    }
          16  +
    /* JsonSerializerGenerator.kt:382 */
   12     17   
    if let Some(var_2) = &input.double_value {
          18  +
        /* JsonSerializerGenerator.kt:432 */
   13     19   
        object.key("DoubleDribble").number(
   14     20   
            #[allow(clippy::useless_conversion)]
   15     21   
            ::aws_smithy_types::Number::Float((*var_2).into()),
   16     22   
        );
          23  +
        /* JsonSerializerGenerator.kt:382 */
   17     24   
    }
          25  +
    /* JsonSerializerGenerator.kt:382 */
   18     26   
    if let Some(var_3) = &input.false_boolean_value {
          27  +
        /* JsonSerializerGenerator.kt:424 */
   19     28   
        object.key("falseBooleanValue").boolean(*var_3);
          29  +
        /* JsonSerializerGenerator.kt:382 */
   20     30   
    }
          31  +
    /* JsonSerializerGenerator.kt:382 */
   21     32   
    if let Some(var_4) = &input.float_value {
          33  +
        /* JsonSerializerGenerator.kt:432 */
   22     34   
        object.key("floatValue").number(
   23     35   
            #[allow(clippy::useless_conversion)]
   24     36   
            ::aws_smithy_types::Number::Float((*var_4).into()),
   25     37   
        );
          38  +
        /* JsonSerializerGenerator.kt:382 */
   26     39   
    }
          40  +
    /* JsonSerializerGenerator.kt:382 */
   27     41   
    if let Some(var_5) = &input.integer_value {
          42  +
        /* JsonSerializerGenerator.kt:432 */
   28     43   
        object.key("integerValue").number(
   29     44   
            #[allow(clippy::useless_conversion)]
   30     45   
            ::aws_smithy_types::Number::NegInt((*var_5).into()),
   31     46   
        );
          47  +
        /* JsonSerializerGenerator.kt:382 */
   32     48   
    }
          49  +
    /* JsonSerializerGenerator.kt:382 */
   33     50   
    if let Some(var_6) = &input.long_value {
          51  +
        /* JsonSerializerGenerator.kt:432 */
   34     52   
        object.key("longValue").number(
   35     53   
            #[allow(clippy::useless_conversion)]
   36     54   
            ::aws_smithy_types::Number::NegInt((*var_6).into()),
   37     55   
        );
          56  +
        /* JsonSerializerGenerator.kt:382 */
   38     57   
    }
          58  +
    /* JsonSerializerGenerator.kt:382 */
   39     59   
    if let Some(var_7) = &input.short_value {
          60  +
        /* JsonSerializerGenerator.kt:432 */
   40     61   
        object.key("shortValue").number(
   41     62   
            #[allow(clippy::useless_conversion)]
   42     63   
            ::aws_smithy_types::Number::NegInt((*var_7).into()),
   43     64   
        );
          65  +
        /* JsonSerializerGenerator.kt:382 */
   44     66   
    }
          67  +
    /* JsonSerializerGenerator.kt:382 */
   45     68   
    if let Some(var_8) = &input.string_value {
          69  +
        /* JsonSerializerGenerator.kt:423 */
   46     70   
        object.key("stringValue").string(var_8.as_str());
          71  +
        /* JsonSerializerGenerator.kt:382 */
   47     72   
    }
          73  +
    /* JsonSerializerGenerator.kt:382 */
   48     74   
    if let Some(var_9) = &input.true_boolean_value {
          75  +
        /* JsonSerializerGenerator.kt:424 */
   49     76   
        object.key("trueBooleanValue").boolean(*var_9);
          77  +
        /* JsonSerializerGenerator.kt:382 */
   50     78   
    }
          79  +
    /* JsonSerializerGenerator.kt:372 */
   51     80   
    Ok(())
          81  +
    /* JsonSerializerGenerator.kt:358 */
   52     82   
}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/protocol_serde/shape_simple_scalar_properties_output.rs

@@ -1,1 +7,11 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* HttpBindingGenerator.kt:153 */
    2      3   
pub(crate) fn de_foo_header(
    3      4   
    header_map: &::aws_smithy_runtime_api::http::Headers,
    4      5   
) -> ::std::result::Result<::std::option::Option<::std::string::String>, ::aws_smithy_http::header::ParseError> {
           6  +
    /* HttpBindingGenerator.kt:160 */
    5      7   
    let headers = header_map.get_all("X-Foo");
           8  +
    /* HttpBindingGenerator.kt:375 */
    6      9   
    ::aws_smithy_http::header::one_or_none(headers)
          10  +
    /* HttpBindingGenerator.kt:153 */
    7     11   
}