Client Test

Client Test

rev. dfb5149b65b7bcc09edd15b8e071ad43b5ac5943

Files changed:

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

@@ -1,1 +19,38 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:547 */
    2      3   
pub fn ser_simple_union(
    3      4   
    object_2: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::types::SimpleUnion,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:556 */
    6      8   
    match input {
           9  +
        /* JsonSerializerGenerator.kt:564 */
    7     10   
        crate::types::SimpleUnion::Int(inner) => {
    8         -
            object_2.key("int").number(
    9         -
                #[allow(clippy::useless_conversion)]
   10         -
                ::aws_smithy_types::Number::NegInt((*inner).into()),
   11         -
            );
          11  +
            /* SerializerUtil.kt:42 */
          12  +
            {
          13  +
                /* JsonSerializerGenerator.kt:432 */
          14  +
                object_2.key("int").number(
          15  +
                    #[allow(clippy::useless_conversion)]
          16  +
                    ::aws_smithy_types::Number::NegInt((*inner).into()),
          17  +
                );
          18  +
                /* SerializerUtil.kt:42 */
          19  +
            }
          20  +
            /* JsonSerializerGenerator.kt:564 */
   12     21   
        }
          22  +
        /* JsonSerializerGenerator.kt:564 */
   13     23   
        crate::types::SimpleUnion::String(inner) => {
   14         -
            object_2.key("string").string(inner.as_str());
          24  +
            /* SerializerUtil.kt:42 */
          25  +
            {
          26  +
                /* JsonSerializerGenerator.kt:423 */
          27  +
                object_2.key("string").string(inner.as_str());
          28  +
                /* SerializerUtil.kt:42 */
          29  +
            }
          30  +
            /* JsonSerializerGenerator.kt:564 */
   15     31   
        }
   16         -
        crate::types::SimpleUnion::Unknown => return Err(::aws_smithy_types::error::operation::SerializationError::unknown_variant("SimpleUnion")),
          32  +
        /* JsonSerializerGenerator.kt:569 */
          33  +
        crate::types::SimpleUnion::Unknown => return Err(::aws_smithy_types::error::operation::SerializationError::unknown_variant("SimpleUnion")), /* JsonSerializerGenerator.kt:556 */
   17     34   
    }
          35  +
    /* JsonSerializerGenerator.kt:576 */
   18     36   
    Ok(())
          37  +
    /* JsonSerializerGenerator.kt:547 */
   19     38   
}

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

@@ -1,1 +37,62 @@
    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_sparse_boolean_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, ::std::option::Option<bool>>>,
    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_bool_or_null(tokens.next())?;
          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:298 */::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:478 */
   21     35   
                        map.insert(key, value);
          36  +
                        /* JsonParserGenerator.kt:686 */
   22     37   
                    }
          38  +
                    /* JsonParserGenerator.kt:695 */
   23     39   
                    other => {
   24     40   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   25     41   
                            "expected object key or end object, found: {:?}",
   26     42   
                            other
   27     43   
                        )))
   28         -
                    }
          44  +
                    } /* JsonParserGenerator.kt:685 */
   29     45   
                }
          46  +
                /* JsonParserGenerator.kt:684 */
   30     47   
            }
          48  +
            /* JsonParserGenerator.kt:504 */
   31     49   
            Ok(Some(map))
          50  +
            /* JsonParserGenerator.kt:713 */
   32     51   
        }
   33         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   34         -
            "expected start object or null",
   35         -
        )),
          52  +
        /* JsonParserGenerator.kt:722 */
          53  +
        _ => {
          54  +
            /* JsonParserGenerator.kt:723 */
          55  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          56  +
                "expected start object or null",
          57  +
            ))
          58  +
            /* JsonParserGenerator.kt:722 */
          59  +
        } /* JsonParserGenerator.kt:712 */
   36     60   
    }
          61  +
    /* JsonParserGenerator.kt:460 */
   37     62   
}

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

@@ -1,1 +76,127 @@
    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_sparse_json_lists_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::sparse_json_lists::SparseJsonListsOutput, crate::operation::sparse_json_lists::SparseJsonListsError> {
          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::sparse_json_lists::SparseJsonListsError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::sparse_json_lists::SparseJsonListsError::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_sparse_json_lists_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::sparse_json_lists::SparseJsonListsOutput, crate::operation::sparse_json_lists::SparseJsonListsError> {
          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::sparse_json_lists::builders::SparseJsonListsOutputBuilder::default();
          36  +
        /* ProtocolParserGenerator.kt:247 */
   24     37   
        output = crate::protocol_serde::shape_sparse_json_lists::de_sparse_json_lists(_response_body, output)
   25     38   
            .map_err(crate::operation::sparse_json_lists::SparseJsonListsError::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_sparse_json_lists_input(
   31     48   
    input: &crate::operation::sparse_json_lists::SparseJsonListsInput,
   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_sparse_json_lists_input::ser_sparse_json_lists_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_sparse_json_lists(
   41     65   
    value: &[u8],
   42     66   
    mut builder: crate::operation::sparse_json_lists::builders::SparseJsonListsOutputBuilder,
   43     67   
) -> ::std::result::Result<
   44     68   
    crate::operation::sparse_json_lists::builders::SparseJsonListsOutputBuilder,
   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() {
   54         -
                "sparseShortList" => {
   55         -
                    builder = builder.set_sparse_short_list(crate::protocol_serde::shape_sparse_short_list::de_sparse_short_list(tokens)?);
          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 */
          84  +
                    "sparseShortList" => {
          85  +
                        /* JsonParserGenerator.kt:265 */
          86  +
                        builder = builder.set_sparse_short_list(
          87  +
                            /* JsonParserGenerator.kt:451 */
          88  +
                            crate::protocol_serde::shape_sparse_short_list::de_sparse_short_list(tokens)?, /* JsonParserGenerator.kt:265 */
          89  +
                        );
          90  +
                        /* JsonParserGenerator.kt:262 */
          91  +
                    }
          92  +
                    /* JsonParserGenerator.kt:262 */
          93  +
                    "sparseStringList" => {
          94  +
                        /* JsonParserGenerator.kt:265 */
          95  +
                        builder = builder.set_sparse_string_list(
          96  +
                            /* JsonParserGenerator.kt:451 */
          97  +
                            crate::protocol_serde::shape_sparse_string_list::de_sparse_string_list(tokens)?, /* JsonParserGenerator.kt:265 */
          98  +
                        );
          99  +
                        /* JsonParserGenerator.kt:262 */
         100  +
                    }
         101  +
                    /* JsonParserGenerator.kt:290 */
         102  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   56    103   
                }
   57         -
                "sparseStringList" => {
   58         -
                    builder = builder.set_sparse_string_list(crate::protocol_serde::shape_sparse_string_list::de_sparse_string_list(tokens)?);
   59         -
                }
   60         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   61         -
            },
         104  +
                /* JsonParserGenerator.kt:686 */
         105  +
            }
         106  +
            /* JsonParserGenerator.kt:695 */
   62    107   
            other => {
   63    108   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   64    109   
                    "expected object key or end object, found: {:?}",
   65    110   
                    other
   66    111   
                )))
   67         -
            }
         112  +
            } /* JsonParserGenerator.kt:685 */
   68    113   
        }
         114  +
        /* JsonParserGenerator.kt:684 */
   69    115   
    }
         116  +
    /* JsonParserGenerator.kt:250 */
   70    117   
    if tokens.next().is_some() {
         118  +
        /* JsonParserGenerator.kt:251 */
   71    119   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   72    120   
            "found more JSON tokens after completing parsing",
   73    121   
        ));
         122  +
        /* JsonParserGenerator.kt:250 */
   74    123   
    }
         124  +
    /* JsonParserGenerator.kt:163 */
   75    125   
    Ok(builder)
         126  +
    /* JsonParserGenerator.kt:148 */
   76    127   
}

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

@@ -1,1 +32,61 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_sparse_json_lists_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::sparse_json_lists::SparseJsonListsInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.sparse_short_list {
           9  +
        /* JsonSerializerGenerator.kt:484 */
    7     10   
        let mut array_2 = object.key("sparseShortList").start_array();
          11  +
        /* JsonSerializerGenerator.kt:524 */
    8     12   
        for item_3 in var_1 {
          13  +
            /* JsonSerializerGenerator.kt:382 */
    9     14   
            if let Some(var_4) = item_3 {
          15  +
                /* JsonSerializerGenerator.kt:432 */
   10     16   
                array_2.value().number(
   11     17   
                    #[allow(clippy::useless_conversion)]
   12     18   
                    ::aws_smithy_types::Number::NegInt((*var_4).into()),
   13     19   
                );
   14         -
            } else {
          20  +
            /* JsonSerializerGenerator.kt:382 */
          21  +
            }
          22  +
            /* JsonSerializerGenerator.kt:395 */
          23  +
            else {
          24  +
                /* JsonSerializerGenerator.kt:396 */
   15     25   
                array_2.value().null();
          26  +
                /* JsonSerializerGenerator.kt:395 */
   16     27   
            }
          28  +
            /* JsonSerializerGenerator.kt:524 */
   17     29   
        }
          30  +
        /* JsonSerializerGenerator.kt:486 */
   18     31   
        array_2.finish();
          32  +
        /* JsonSerializerGenerator.kt:382 */
   19     33   
    }
          34  +
    /* JsonSerializerGenerator.kt:382 */
   20     35   
    if let Some(var_5) = &input.sparse_string_list {
          36  +
        /* JsonSerializerGenerator.kt:484 */
   21     37   
        let mut array_6 = object.key("sparseStringList").start_array();
          38  +
        /* JsonSerializerGenerator.kt:524 */
   22     39   
        for item_7 in var_5 {
          40  +
            /* JsonSerializerGenerator.kt:382 */
   23     41   
            if let Some(var_8) = item_7 {
          42  +
                /* JsonSerializerGenerator.kt:423 */
   24     43   
                array_6.value().string(var_8.as_str());
   25         -
            } else {
          44  +
            /* JsonSerializerGenerator.kt:382 */
          45  +
            }
          46  +
            /* JsonSerializerGenerator.kt:395 */
          47  +
            else {
          48  +
                /* JsonSerializerGenerator.kt:396 */
   26     49   
                array_6.value().null();
          50  +
                /* JsonSerializerGenerator.kt:395 */
   27     51   
            }
          52  +
            /* JsonSerializerGenerator.kt:524 */
   28     53   
        }
          54  +
        /* JsonSerializerGenerator.kt:486 */
   29     55   
        array_6.finish();
          56  +
        /* JsonSerializerGenerator.kt:382 */
   30     57   
    }
          58  +
    /* JsonSerializerGenerator.kt:372 */
   31     59   
    Ok(())
          60  +
    /* JsonSerializerGenerator.kt:358 */
   32     61   
}

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

@@ -1,1 +85,154 @@
    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_sparse_json_maps_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::sparse_json_maps::SparseJsonMapsOutput, crate::operation::sparse_json_maps::SparseJsonMapsError> {
          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::sparse_json_maps::SparseJsonMapsError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::sparse_json_maps::SparseJsonMapsError::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_sparse_json_maps_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::sparse_json_maps::SparseJsonMapsOutput, crate::operation::sparse_json_maps::SparseJsonMapsError> {
          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::sparse_json_maps::builders::SparseJsonMapsOutputBuilder::default();
          36  +
        /* ProtocolParserGenerator.kt:247 */
   24     37   
        output = crate::protocol_serde::shape_sparse_json_maps::de_sparse_json_maps(_response_body, output)
   25     38   
            .map_err(crate::operation::sparse_json_maps::SparseJsonMapsError::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_sparse_json_maps_input(
   31     48   
    input: &crate::operation::sparse_json_maps::SparseJsonMapsInput,
   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_sparse_json_maps_input::ser_sparse_json_maps_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_sparse_json_maps(
   41     65   
    value: &[u8],
   42     66   
    mut builder: crate::operation::sparse_json_maps::builders::SparseJsonMapsOutputBuilder,
   43     67   
) -> ::std::result::Result<
   44     68   
    crate::operation::sparse_json_maps::builders::SparseJsonMapsOutputBuilder,
   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() {
   54         -
                "sparseBooleanMap" => {
   55         -
                    builder = builder.set_sparse_boolean_map(crate::protocol_serde::shape_sparse_boolean_map::de_sparse_boolean_map(tokens)?);
          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 */
          84  +
                    "sparseBooleanMap" => {
          85  +
                        /* JsonParserGenerator.kt:265 */
          86  +
                        builder = builder.set_sparse_boolean_map(
          87  +
                            /* JsonParserGenerator.kt:509 */
          88  +
                            crate::protocol_serde::shape_sparse_boolean_map::de_sparse_boolean_map(tokens)?, /* JsonParserGenerator.kt:265 */
          89  +
                        );
          90  +
                        /* JsonParserGenerator.kt:262 */
          91  +
                    }
          92  +
                    /* JsonParserGenerator.kt:262 */
          93  +
                    "sparseNumberMap" => {
          94  +
                        /* JsonParserGenerator.kt:265 */
          95  +
                        builder = builder.set_sparse_number_map(
          96  +
                            /* JsonParserGenerator.kt:509 */
          97  +
                            crate::protocol_serde::shape_sparse_number_map::de_sparse_number_map(tokens)?, /* JsonParserGenerator.kt:265 */
          98  +
                        );
          99  +
                        /* JsonParserGenerator.kt:262 */
         100  +
                    }
         101  +
                    /* JsonParserGenerator.kt:262 */
         102  +
                    "sparseSetMap" => {
         103  +
                        /* JsonParserGenerator.kt:265 */
         104  +
                        builder = builder.set_sparse_set_map(
         105  +
                            /* JsonParserGenerator.kt:509 */
         106  +
                            crate::protocol_serde::shape_sparse_set_map::de_sparse_set_map(tokens)?, /* JsonParserGenerator.kt:265 */
         107  +
                        );
         108  +
                        /* JsonParserGenerator.kt:262 */
         109  +
                    }
         110  +
                    /* JsonParserGenerator.kt:262 */
         111  +
                    "sparseStringMap" => {
         112  +
                        /* JsonParserGenerator.kt:265 */
         113  +
                        builder = builder.set_sparse_string_map(
         114  +
                            /* JsonParserGenerator.kt:509 */
         115  +
                            crate::protocol_serde::shape_sparse_string_map::de_sparse_string_map(tokens)?, /* JsonParserGenerator.kt:265 */
         116  +
                        );
         117  +
                        /* JsonParserGenerator.kt:262 */
         118  +
                    }
         119  +
                    /* JsonParserGenerator.kt:262 */
         120  +
                    "sparseStructMap" => {
         121  +
                        /* JsonParserGenerator.kt:265 */
         122  +
                        builder = builder.set_sparse_struct_map(
         123  +
                            /* JsonParserGenerator.kt:509 */
         124  +
                            crate::protocol_serde::shape_sparse_struct_map::de_sparse_struct_map(tokens)?, /* JsonParserGenerator.kt:265 */
         125  +
                        );
         126  +
                        /* JsonParserGenerator.kt:262 */
         127  +
                    }
         128  +
                    /* JsonParserGenerator.kt:290 */
         129  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   56    130   
                }
   57         -
                "sparseNumberMap" => {
   58         -
                    builder = builder.set_sparse_number_map(crate::protocol_serde::shape_sparse_number_map::de_sparse_number_map(tokens)?);
   59         -
                }
   60         -
                "sparseSetMap" => {
   61         -
                    builder = builder.set_sparse_set_map(crate::protocol_serde::shape_sparse_set_map::de_sparse_set_map(tokens)?);
   62         -
                }
   63         -
                "sparseStringMap" => {
   64         -
                    builder = builder.set_sparse_string_map(crate::protocol_serde::shape_sparse_string_map::de_sparse_string_map(tokens)?);
   65         -
                }
   66         -
                "sparseStructMap" => {
   67         -
                    builder = builder.set_sparse_struct_map(crate::protocol_serde::shape_sparse_struct_map::de_sparse_struct_map(tokens)?);
   68         -
                }
   69         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   70         -
            },
         131  +
                /* JsonParserGenerator.kt:686 */
         132  +
            }
         133  +
            /* JsonParserGenerator.kt:695 */
   71    134   
            other => {
   72    135   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   73    136   
                    "expected object key or end object, found: {:?}",
   74    137   
                    other
   75    138   
                )))
   76         -
            }
         139  +
            } /* JsonParserGenerator.kt:685 */
   77    140   
        }
         141  +
        /* JsonParserGenerator.kt:684 */
   78    142   
    }
         143  +
    /* JsonParserGenerator.kt:250 */
   79    144   
    if tokens.next().is_some() {
         145  +
        /* JsonParserGenerator.kt:251 */
   80    146   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   81    147   
            "found more JSON tokens after completing parsing",
   82    148   
        ));
         149  +
        /* JsonParserGenerator.kt:250 */
   83    150   
    }
         151  +
    /* JsonParserGenerator.kt:163 */
   84    152   
    Ok(builder)
         153  +
    /* JsonParserGenerator.kt:148 */
   85    154   
}

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

@@ -1,1 +79,161 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_sparse_json_maps_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::sparse_json_maps::SparseJsonMapsInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.sparse_boolean_map {
           9  +
        /* JsonSerializerGenerator.kt:495 */
    7     10   
        #[allow(unused_mut)]
          11  +
        /* JsonSerializerGenerator.kt:496 */
    8     12   
        let mut object_2 = object.key("sparseBooleanMap").start_object();
          13  +
        /* JsonSerializerGenerator.kt:537 */
    9     14   
        for (key_3, value_4) in var_1 {
          15  +
            /* JsonSerializerGenerator.kt:382 */
   10     16   
            if let Some(var_5) = value_4 {
          17  +
                /* JsonSerializerGenerator.kt:424 */
   11     18   
                object_2.key(key_3.as_str()).boolean(*var_5);
   12         -
            } else {
          19  +
            /* JsonSerializerGenerator.kt:382 */
          20  +
            }
          21  +
            /* JsonSerializerGenerator.kt:395 */
          22  +
            else {
          23  +
                /* JsonSerializerGenerator.kt:396 */
   13     24   
                object_2.key(key_3.as_str()).null();
          25  +
                /* JsonSerializerGenerator.kt:395 */
   14     26   
            }
          27  +
            /* JsonSerializerGenerator.kt:537 */
   15     28   
        }
          29  +
        /* JsonSerializerGenerator.kt:515 */
   16     30   
        object_2.finish();
          31  +
        /* JsonSerializerGenerator.kt:382 */
   17     32   
    }
          33  +
    /* JsonSerializerGenerator.kt:382 */
   18     34   
    if let Some(var_6) = &input.sparse_number_map {
          35  +
        /* JsonSerializerGenerator.kt:495 */
   19     36   
        #[allow(unused_mut)]
          37  +
        /* JsonSerializerGenerator.kt:496 */
   20     38   
        let mut object_7 = object.key("sparseNumberMap").start_object();
          39  +
        /* JsonSerializerGenerator.kt:537 */
   21     40   
        for (key_8, value_9) in var_6 {
          41  +
            /* JsonSerializerGenerator.kt:382 */
   22     42   
            if let Some(var_10) = value_9 {
          43  +
                /* JsonSerializerGenerator.kt:432 */
   23     44   
                object_7.key(key_8.as_str()).number(
   24     45   
                    #[allow(clippy::useless_conversion)]
   25     46   
                    ::aws_smithy_types::Number::NegInt((*var_10).into()),
   26     47   
                );
   27         -
            } else {
          48  +
            /* JsonSerializerGenerator.kt:382 */
          49  +
            }
          50  +
            /* JsonSerializerGenerator.kt:395 */
          51  +
            else {
          52  +
                /* JsonSerializerGenerator.kt:396 */
   28     53   
                object_7.key(key_8.as_str()).null();
          54  +
                /* JsonSerializerGenerator.kt:395 */
   29     55   
            }
          56  +
            /* JsonSerializerGenerator.kt:537 */
   30     57   
        }
          58  +
        /* JsonSerializerGenerator.kt:515 */
   31     59   
        object_7.finish();
          60  +
        /* JsonSerializerGenerator.kt:382 */
   32     61   
    }
          62  +
    /* JsonSerializerGenerator.kt:382 */
   33     63   
    if let Some(var_11) = &input.sparse_set_map {
          64  +
        /* JsonSerializerGenerator.kt:495 */
   34     65   
        #[allow(unused_mut)]
          66  +
        /* JsonSerializerGenerator.kt:496 */
   35     67   
        let mut object_12 = object.key("sparseSetMap").start_object();
          68  +
        /* JsonSerializerGenerator.kt:537 */
   36     69   
        for (key_13, value_14) in var_11 {
          70  +
            /* JsonSerializerGenerator.kt:382 */
   37     71   
            if let Some(var_15) = value_14 {
          72  +
                /* JsonSerializerGenerator.kt:484 */
   38     73   
                let mut array_16 = object_12.key(key_13.as_str()).start_array();
          74  +
                /* JsonSerializerGenerator.kt:524 */
   39     75   
                for item_17 in var_15 {
          76  +
                    /* SerializerUtil.kt:42 */
   40     77   
                    {
          78  +
                        /* JsonSerializerGenerator.kt:423 */
   41     79   
                        array_16.value().string(item_17.as_str());
          80  +
                        /* SerializerUtil.kt:42 */
   42     81   
                    }
          82  +
                    /* JsonSerializerGenerator.kt:524 */
   43     83   
                }
          84  +
                /* JsonSerializerGenerator.kt:486 */
   44     85   
                array_16.finish();
   45         -
            } else {
          86  +
            /* JsonSerializerGenerator.kt:382 */
          87  +
            }
          88  +
            /* JsonSerializerGenerator.kt:395 */
          89  +
            else {
          90  +
                /* JsonSerializerGenerator.kt:396 */
   46     91   
                object_12.key(key_13.as_str()).null();
          92  +
                /* JsonSerializerGenerator.kt:395 */
   47     93   
            }
          94  +
            /* JsonSerializerGenerator.kt:537 */
   48     95   
        }
          96  +
        /* JsonSerializerGenerator.kt:515 */
   49     97   
        object_12.finish();
          98  +
        /* JsonSerializerGenerator.kt:382 */
   50     99   
    }
         100  +
    /* JsonSerializerGenerator.kt:382 */
   51    101   
    if let Some(var_18) = &input.sparse_string_map {
         102  +
        /* JsonSerializerGenerator.kt:495 */
   52    103   
        #[allow(unused_mut)]
         104  +
        /* JsonSerializerGenerator.kt:496 */
   53    105   
        let mut object_19 = object.key("sparseStringMap").start_object();
         106  +
        /* JsonSerializerGenerator.kt:537 */
   54    107   
        for (key_20, value_21) in var_18 {
         108  +
            /* JsonSerializerGenerator.kt:382 */
   55    109   
            if let Some(var_22) = value_21 {
         110  +
                /* JsonSerializerGenerator.kt:423 */
   56    111   
                object_19.key(key_20.as_str()).string(var_22.as_str());
   57         -
            } else {
         112  +
            /* JsonSerializerGenerator.kt:382 */
         113  +
            }
         114  +
            /* JsonSerializerGenerator.kt:395 */
         115  +
            else {
         116  +
                /* JsonSerializerGenerator.kt:396 */
   58    117   
                object_19.key(key_20.as_str()).null();
         118  +
                /* JsonSerializerGenerator.kt:395 */
   59    119   
            }
         120  +
            /* JsonSerializerGenerator.kt:537 */
   60    121   
        }
         122  +
        /* JsonSerializerGenerator.kt:515 */
   61    123   
        object_19.finish();
         124  +
        /* JsonSerializerGenerator.kt:382 */
   62    125   
    }
         126  +
    /* JsonSerializerGenerator.kt:382 */
   63    127   
    if let Some(var_23) = &input.sparse_struct_map {
         128  +
        /* JsonSerializerGenerator.kt:495 */
   64    129   
        #[allow(unused_mut)]
         130  +
        /* JsonSerializerGenerator.kt:496 */
   65    131   
        let mut object_24 = object.key("sparseStructMap").start_object();
         132  +
        /* JsonSerializerGenerator.kt:537 */
   66    133   
        for (key_25, value_26) in var_23 {
         134  +
            /* JsonSerializerGenerator.kt:382 */
   67    135   
            if let Some(var_27) = value_26 {
         136  +
                /* JsonSerializerGenerator.kt:495 */
   68    137   
                #[allow(unused_mut)]
         138  +
                /* JsonSerializerGenerator.kt:496 */
   69    139   
                let mut object_28 = object_24.key(key_25.as_str()).start_object();
         140  +
                /* JsonSerializerGenerator.kt:375 */
   70    141   
                crate::protocol_serde::shape_greeting_struct::ser_greeting_struct(&mut object_28, var_27)?;
         142  +
                /* JsonSerializerGenerator.kt:515 */
   71    143   
                object_28.finish();
   72         -
            } else {
         144  +
            /* JsonSerializerGenerator.kt:382 */
         145  +
            }
         146  +
            /* JsonSerializerGenerator.kt:395 */
         147  +
            else {
         148  +
                /* JsonSerializerGenerator.kt:396 */
   73    149   
                object_24.key(key_25.as_str()).null();
         150  +
                /* JsonSerializerGenerator.kt:395 */
   74    151   
            }
         152  +
            /* JsonSerializerGenerator.kt:537 */
   75    153   
        }
         154  +
        /* JsonSerializerGenerator.kt:515 */
   76    155   
        object_24.finish();
         156  +
        /* JsonSerializerGenerator.kt:382 */
   77    157   
    }
         158  +
    /* JsonSerializerGenerator.kt:372 */
   78    159   
    Ok(())
         160  +
    /* JsonSerializerGenerator.kt:358 */
   79    161   
}

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

@@ -1,1 +39,64 @@
    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_sparse_number_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, ::std::option::Option<i32>>>,
    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_number_or_null(tokens.next())?
   21         -
                            .map(i32::try_from)
   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:365 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
          33  +
                                                .map(i32::try_from)
          34  +
                                                .transpose()?
          35  +
                        /* JsonParserGenerator.kt:474 */;
          36  +
                        /* JsonParserGenerator.kt:478 */
   23     37   
                        map.insert(key, value);
          38  +
                        /* JsonParserGenerator.kt:686 */
   24     39   
                    }
          40  +
                    /* JsonParserGenerator.kt:695 */
   25     41   
                    other => {
   26     42   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     43   
                            "expected object key or end object, found: {:?}",
   28     44   
                            other
   29     45   
                        )))
   30         -
                    }
          46  +
                    } /* JsonParserGenerator.kt:685 */
   31     47   
                }
          48  +
                /* JsonParserGenerator.kt:684 */
   32     49   
            }
          50  +
            /* JsonParserGenerator.kt:504 */
   33     51   
            Ok(Some(map))
          52  +
            /* JsonParserGenerator.kt:713 */
   34     53   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36         -
            "expected start object or null",
   37         -
        )),
          54  +
        /* JsonParserGenerator.kt:722 */
          55  +
        _ => {
          56  +
            /* JsonParserGenerator.kt:723 */
          57  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          58  +
                "expected start object or null",
          59  +
            ))
          60  +
            /* JsonParserGenerator.kt:722 */
          61  +
        } /* JsonParserGenerator.kt:712 */
   38     62   
    }
          63  +
    /* JsonParserGenerator.kt:460 */
   39     64   
}

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

@@ -1,1 +37,62 @@
    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_sparse_set_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, ::std::option::Option<::std::vec::Vec<::std::string::String>>>>,
    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 = crate::protocol_serde::shape_string_set::de_string_set(tokens)?;
          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:451 */crate::protocol_serde::shape_string_set::de_string_set(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:478 */
   21     35   
                        map.insert(key, value);
          36  +
                        /* JsonParserGenerator.kt:686 */
   22     37   
                    }
          38  +
                    /* JsonParserGenerator.kt:695 */
   23     39   
                    other => {
   24     40   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   25     41   
                            "expected object key or end object, found: {:?}",
   26     42   
                            other
   27     43   
                        )))
   28         -
                    }
          44  +
                    } /* JsonParserGenerator.kt:685 */
   29     45   
                }
          46  +
                /* JsonParserGenerator.kt:684 */
   30     47   
            }
          48  +
            /* JsonParserGenerator.kt:504 */
   31     49   
            Ok(Some(map))
          50  +
            /* JsonParserGenerator.kt:713 */
   32     51   
        }
   33         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   34         -
            "expected start object or null",
   35         -
        )),
          52  +
        /* JsonParserGenerator.kt:722 */
          53  +
        _ => {
          54  +
            /* JsonParserGenerator.kt:723 */
          55  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          56  +
                "expected start object or null",
          57  +
            ))
          58  +
            /* JsonParserGenerator.kt:722 */
          59  +
        } /* JsonParserGenerator.kt:712 */
   36     60   
    }
          61  +
    /* JsonParserGenerator.kt:460 */
   37     62   
}

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

@@ -1,1 +33,54 @@
    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_sparse_short_list<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<::std::option::Option<i16>>>, ::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   
                    _ => {
          28  +
                        /* JsonParserGenerator.kt:415 */
   19     29   
                        items.push(
          30  +
                            /* JsonParserGenerator.kt:365 */
   20     31   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   21     32   
                                .map(i16::try_from)
   22         -
                                .transpose()?,
          33  +
                                .transpose()?, /* JsonParserGenerator.kt:415 */
   23     34   
                        );
   24         -
                    }
          35  +
                        /* JsonParserGenerator.kt:413 */
          36  +
                    } /* JsonParserGenerator.kt:409 */
   25     37   
                }
          38  +
                /* JsonParserGenerator.kt:408 */
   26     39   
            }
          40  +
            /* JsonParserGenerator.kt:446 */
   27     41   
            Ok(Some(items))
          42  +
            /* JsonParserGenerator.kt:713 */
   28     43   
        }
   29         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   30         -
            "expected start array or null",
   31         -
        )),
          44  +
        /* JsonParserGenerator.kt:722 */
          45  +
        _ => {
          46  +
            /* JsonParserGenerator.kt:723 */
          47  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          48  +
                "expected start array or null",
          49  +
            ))
          50  +
            /* JsonParserGenerator.kt:722 */
          51  +
        } /* JsonParserGenerator.kt:712 */
   32     52   
    }
          53  +
    /* JsonParserGenerator.kt:398 */
   33     54   
}

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

@@ -1,1 +36,60 @@
    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_sparse_string_list<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::vec::Vec<::std::option::Option<::std::string::String>>>,
    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::StartArray { .. }) => {
          16  +
            /* JsonParserGenerator.kt:407 */
   14     17   
            let mut items = Vec::new();
          18  +
            /* JsonParserGenerator.kt:408 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:409 */
   16     21   
                match tokens.peek() {
          22  +
                    /* JsonParserGenerator.kt:410 */
   17     23   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          24  +
                        /* JsonParserGenerator.kt:411 */
   18     25   
                        tokens.next().transpose().unwrap();
   19     26   
                        break;
          27  +
                        /* JsonParserGenerator.kt:410 */
   20     28   
                    }
          29  +
                    /* JsonParserGenerator.kt:413 */
   21     30   
                    _ => {
          31  +
                        /* JsonParserGenerator.kt:415 */
   22     32   
                        items.push(
          33  +
                            /* JsonParserGenerator.kt:354 */
   23     34   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   24         -
                                .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   25         -
                                .transpose()?,
          35  +
                                .map(|s|
          36  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          37  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          38  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          39  +
                                .transpose()?, /* JsonParserGenerator.kt:415 */
   26     40   
                        );
   27         -
                    }
          41  +
                        /* JsonParserGenerator.kt:413 */
          42  +
                    } /* JsonParserGenerator.kt:409 */
   28     43   
                }
          44  +
                /* JsonParserGenerator.kt:408 */
   29     45   
            }
          46  +
            /* JsonParserGenerator.kt:446 */
   30     47   
            Ok(Some(items))
          48  +
            /* JsonParserGenerator.kt:713 */
   31     49   
        }
   32         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   33         -
            "expected start array or null",
   34         -
        )),
          50  +
        /* JsonParserGenerator.kt:722 */
          51  +
        _ => {
          52  +
            /* JsonParserGenerator.kt:723 */
          53  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          54  +
                "expected start array or null",
          55  +
            ))
          56  +
            /* JsonParserGenerator.kt:722 */
          57  +
        } /* JsonParserGenerator.kt:712 */
   35     58   
    }
          59  +
    /* JsonParserGenerator.kt:398 */
   36     60   
}

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

@@ -1,1 +39,66 @@
    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_sparse_string_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, ::std::option::Option<::std::string::String>>>,
    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| u.into_owned()))
   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:348 */u.into_owned()
          35  +
                                /* JsonParserGenerator.kt:339 */)
          36  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          37  +
                        /* JsonParserGenerator.kt:474 */;
          38  +
                        /* JsonParserGenerator.kt:478 */
   23     39   
                        map.insert(key, value);
          40  +
                        /* JsonParserGenerator.kt:686 */
   24     41   
                    }
          42  +
                    /* JsonParserGenerator.kt:695 */
   25     43   
                    other => {
   26     44   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     45   
                            "expected object key or end object, found: {:?}",
   28     46   
                            other
   29     47   
                        )))
   30         -
                    }
          48  +
                    } /* JsonParserGenerator.kt:685 */
   31     49   
                }
          50  +
                /* JsonParserGenerator.kt:684 */
   32     51   
            }
          52  +
            /* JsonParserGenerator.kt:504 */
   33     53   
            Ok(Some(map))
          54  +
            /* JsonParserGenerator.kt:713 */
   34     55   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36         -
            "expected start object or null",
   37         -
        )),
          56  +
        /* JsonParserGenerator.kt:722 */
          57  +
        _ => {
          58  +
            /* JsonParserGenerator.kt:723 */
          59  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          60  +
                "expected start object or null",
          61  +
            ))
          62  +
            /* JsonParserGenerator.kt:722 */
          63  +
        } /* JsonParserGenerator.kt:712 */
   38     64   
    }
          65  +
    /* JsonParserGenerator.kt:460 */
   39     66   
}

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

@@ -1,1 +37,62 @@
    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_sparse_struct_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, ::std::option::Option<crate::types::GreetingStruct>>>,
    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 = crate::protocol_serde::shape_greeting_struct::de_greeting_struct(tokens)?;
          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:544 */crate::protocol_serde::shape_greeting_struct::de_greeting_struct(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:478 */
   21     35   
                        map.insert(key, value);
          36  +
                        /* JsonParserGenerator.kt:686 */
   22     37   
                    }
          38  +
                    /* JsonParserGenerator.kt:695 */
   23     39   
                    other => {
   24     40   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   25     41   
                            "expected object key or end object, found: {:?}",
   26     42   
                            other
   27     43   
                        )))
   28         -
                    }
          44  +
                    } /* JsonParserGenerator.kt:685 */
   29     45   
                }
          46  +
                /* JsonParserGenerator.kt:684 */
   30     47   
            }
          48  +
            /* JsonParserGenerator.kt:504 */
   31     49   
            Ok(Some(map))
          50  +
            /* JsonParserGenerator.kt:713 */
   32     51   
        }
   33         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   34         -
            "expected start object or null",
   35         -
        )),
          52  +
        /* JsonParserGenerator.kt:722 */
          53  +
        _ => {
          54  +
            /* JsonParserGenerator.kt:723 */
          55  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          56  +
                "expected start object or null",
          57  +
            ))
          58  +
            /* JsonParserGenerator.kt:722 */
          59  +
        } /* JsonParserGenerator.kt:712 */
   36     60   
    }
          61  +
    /* JsonParserGenerator.kt:460 */
   37     62   
}

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

@@ -1,1 +55,81 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:200 */
    3      5   
pub fn de_streaming_traits_http_response(
    4      6   
    response: &mut ::aws_smithy_runtime_api::http::Response,
    5      7   
) -> std::result::Result<crate::operation::streaming_traits::StreamingTraitsOutput, crate::operation::streaming_traits::StreamingTraitsError> {
           8  +
    /* ProtocolParserGenerator.kt:206 */
    6      9   
    let mut _response_body = ::aws_smithy_types::body::SdkBody::taken();
    7     10   
    std::mem::swap(&mut _response_body, response.body_mut());
    8     11   
    let _response_body = &mut _response_body;
    9     12   
   10     13   
    let _response_status = response.status().as_u16();
   11     14   
    let _response_headers = response.headers();
          15  +
    /* ProtocolParserGenerator.kt:217 */
   12     16   
    Ok({
          17  +
        /* RustType.kt:516 */
   13     18   
        #[allow(unused_mut)]
          19  +
        /* ProtocolParserGenerator.kt:240 */
   14     20   
        let mut output = crate::operation::streaming_traits::builders::StreamingTraitsOutputBuilder::default();
   15         -
        output = output.set_blob(Some(crate::protocol_serde::shape_streaming_traits_output::de_blob_payload(
   16         -
            _response_body,
   17         -
        )?));
   18         -
        output = output.set_foo(
   19         -
            crate::protocol_serde::shape_streaming_traits_output::de_foo_header(_response_headers)
   20         -
                .map_err(|_| crate::operation::streaming_traits::StreamingTraitsError::unhandled("Failed to parse foo from header `X-Foo"))?,
          21  +
        /* ProtocolParserGenerator.kt:267 */
          22  +
        output = output.set_blob(
          23  +
            /* ProtocolParserGenerator.kt:325 */
          24  +
            Some(crate::protocol_serde::shape_streaming_traits_output::de_blob_payload(_response_body)?), /* ProtocolParserGenerator.kt:267 */
   21     25   
        );
          26  +
        /* ProtocolParserGenerator.kt:267 */
          27  +
        output = output.set_foo(
          28  +
            /* ProtocolParserGenerator.kt:302 */crate::protocol_serde::shape_streaming_traits_output::de_foo_header(_response_headers)
          29  +
                                        .map_err(|_|crate::operation::streaming_traits::StreamingTraitsError::unhandled("Failed to parse foo from header `X-Foo"))?
          30  +
        /* ProtocolParserGenerator.kt:267 */);
          31  +
        /* ClientBuilderInstantiator.kt:56 */
   22     32   
        output.build()
          33  +
        /* ProtocolParserGenerator.kt:217 */
   23     34   
    })
          35  +
    /* ProtocolParserGenerator.kt:200 */
   24     36   
}
   25     37   
          38  +
/* RustType.kt:516 */
   26     39   
#[allow(clippy::unnecessary_wraps)]
          40  +
/* ProtocolParserGenerator.kt:99 */
   27     41   
pub fn de_streaming_traits_http_error(
   28     42   
    _response_status: u16,
   29     43   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   30     44   
    _response_body: &[u8],
   31     45   
) -> std::result::Result<crate::operation::streaming_traits::StreamingTraitsOutput, crate::operation::streaming_traits::StreamingTraitsError> {
          46  +
    /* RustType.kt:516 */
   32     47   
    #[allow(unused_mut)]
          48  +
    /* ProtocolParserGenerator.kt:106 */
   33     49   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   34     50   
        .map_err(crate::operation::streaming_traits::StreamingTraitsError::unhandled)?;
          51  +
    /* ProtocolParserGenerator.kt:120 */
   35     52   
    let generic = generic_builder.build();
          53  +
    /* ProtocolParserGenerator.kt:185 */
   36     54   
    Err(crate::operation::streaming_traits::StreamingTraitsError::generic(generic))
          55  +
    /* ProtocolParserGenerator.kt:99 */
   37     56   
}
   38     57   
          58  +
/* HttpBindingGenerator.kt:542 */
   39     59   
pub fn ser_streaming_traits_headers(
   40     60   
    input: &crate::operation::streaming_traits::StreamingTraitsInput,
   41     61   
    mut builder: ::http::request::Builder,
   42     62   
) -> std::result::Result<::http::request::Builder, ::aws_smithy_types::error::operation::BuildError> {
          63  +
    /* HttpBindingGenerator.kt:592 */
   43     64   
    if let ::std::option::Option::Some(inner_1) = &input.foo {
          65  +
        /* HttpBindingGenerator.kt:704 */
   44     66   
        let formatted_2 = inner_1.as_str();
          67  +
        /* HttpBindingGenerator.kt:706 */
   45     68   
        let header_value = formatted_2;
   46     69   
        let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
   47     70   
            ::aws_smithy_types::error::operation::BuildError::invalid_field(
   48     71   
                "foo",
   49     72   
                format!("`{}` cannot be used as a header value: {}", &header_value, err),
   50     73   
            )
   51     74   
        })?;
   52     75   
        builder = builder.header("X-Foo", header_value);
          76  +
        /* HttpBindingGenerator.kt:592 */
   53     77   
    }
          78  +
    /* HttpBindingGenerator.kt:555 */
   54     79   
    Ok(builder)
          80  +
    /* HttpBindingGenerator.kt:542 */
   55     81   
}

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

@@ -1,1 +6,11 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* HttpBoundProtocolPayloadGenerator.kt:311 */
    2      3   
pub fn ser_blob_http_payload(
    3      4   
    payload: ::aws_smithy_types::byte_stream::ByteStream,
    4      5   
) -> ::std::result::Result<::aws_smithy_types::byte_stream::ByteStream, ::aws_smithy_types::error::operation::BuildError> {
    5         -
    Ok(payload)
           6  +
    /* HttpBoundProtocolPayloadGenerator.kt:345 */
           7  +
    Ok(
           8  +
        /* HttpBoundProtocolPayloadGenerator.kt:374 */ payload, /* HttpBoundProtocolPayloadGenerator.kt:345 */
           9  +
    )
          10  +
    /* HttpBoundProtocolPayloadGenerator.kt:311 */
    6     11   
}

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

@@ -1,1 +15,21 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* HttpBindingGenerator.kt:230 */
    2      3   
pub fn de_blob_payload(
    3      4   
    body: &mut ::aws_smithy_types::body::SdkBody,
    4      5   
) -> std::result::Result<::aws_smithy_types::byte_stream::ByteStream, crate::operation::streaming_traits::StreamingTraitsError> {
    5         -
    // replace the body with an empty body
           6  +
    /* HttpBindingGenerator.kt:299 */// replace the body with an empty body
    6      7   
    let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
    7      8   
    Ok(::aws_smithy_types::byte_stream::ByteStream::new(body))
           9  +
    /* HttpBindingGenerator.kt:230 */
    8     10   
}
    9     11   
          12  +
/* HttpBindingGenerator.kt:153 */
   10     13   
pub(crate) fn de_foo_header(
   11     14   
    header_map: &::aws_smithy_runtime_api::http::Headers,
   12     15   
) -> ::std::result::Result<::std::option::Option<::std::string::String>, ::aws_smithy_http::header::ParseError> {
          16  +
    /* HttpBindingGenerator.kt:160 */
   13     17   
    let headers = header_map.get_all("X-Foo");
          18  +
    /* HttpBindingGenerator.kt:375 */
   14     19   
    ::aws_smithy_http::header::one_or_none(headers)
          20  +
    /* HttpBindingGenerator.kt:153 */
   15     21   
}

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

@@ -1,1 +50,72 @@
    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_streaming_traits_require_length_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::streaming_traits_require_length::StreamingTraitsRequireLengthOutput,
    9     11   
    crate::operation::streaming_traits_require_length::StreamingTraitsRequireLengthError,
   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::streaming_traits_require_length::StreamingTraitsRequireLengthError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::streaming_traits_require_length::StreamingTraitsRequireLengthError::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_streaming_traits_require_length_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::streaming_traits_require_length::StreamingTraitsRequireLengthOutput,
   25     34   
    crate::operation::streaming_traits_require_length::StreamingTraitsRequireLengthError,
   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::streaming_traits_require_length::builders::StreamingTraitsRequireLengthOutputBuilder::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_streaming_traits_require_length_headers(
   35     51   
    input: &crate::operation::streaming_traits_require_length::StreamingTraitsRequireLengthInput,
   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.foo {
          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   
                "foo",
   44     63   
                format!("`{}` cannot be used as a header value: {}", &header_value, err),
   45     64   
            )
   46     65   
        })?;
   47     66   
        builder = builder.header("X-Foo", header_value);
          67  +
        /* HttpBindingGenerator.kt:592 */
   48     68   
    }
          69  +
    /* HttpBindingGenerator.kt:555 */
   49     70   
    Ok(builder)
          71  +
    /* HttpBindingGenerator.kt:542 */
   50     72   
}