Server Test

Server Test

rev. 70b05a5296f85c2653fee05487976373e11ea4dc

Files changed:

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

@@ -88,88 +172,172 @@
  108    108   
    crate::input::put_with_content_encoding_input::Builder,
  109    109   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  110    110   
> {
  111    111   
    /* JsonParserGenerator.kt:158 */
  112    112   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  113    113   
        crate::protocol_serde::or_empty_doc(_value),
  114    114   
    )
  115    115   
    .peekable();
  116    116   
    let tokens = &mut tokens_owned;
  117    117   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  118         -
    /* JsonParserGenerator.kt:721 */
         118  +
    /* JsonParserGenerator.kt:703 */
  119    119   
    loop {
  120         -
        /* JsonParserGenerator.kt:722 */
         120  +
        /* JsonParserGenerator.kt:704 */
  121    121   
        match tokens.next().transpose()? {
  122         -
            /* JsonParserGenerator.kt:723 */
         122  +
            /* JsonParserGenerator.kt:705 */
  123    123   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  124    124   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  125    125   
                /* JsonParserGenerator.kt:265 */
  126    126   
                match key.to_unescaped()?.as_ref() {
  127    127   
                    /* JsonParserGenerator.kt:267 */
  128    128   
                    "data" => {
  129    129   
                        /* JsonParserGenerator.kt:277 */
  130    130   
                        builder = builder.set_data(
  131    131   
                            /* JsonParserGenerator.kt:361 */
  132    132   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(
  133    133   
                                tokens.next(),
  134    134   
                            )?
  135    135   
                            .map(|s|
  136    136   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
  137    137   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
  138    138   
                                /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
  139    139   
                            .transpose()?, /* JsonParserGenerator.kt:277 */
  140    140   
                        );
  141    141   
                        /* JsonParserGenerator.kt:267 */
  142    142   
                    }
  143    143   
                    /* JsonParserGenerator.kt:295 */
  144    144   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  145    145   
                }
  146         -
                /* JsonParserGenerator.kt:723 */
         146  +
                /* JsonParserGenerator.kt:705 */
  147    147   
            }
  148         -
            /* JsonParserGenerator.kt:732 */
         148  +
            /* JsonParserGenerator.kt:714 */
  149    149   
            other => {
  150    150   
                return Err(
  151    151   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  152    152   
                        "expected object key or end object, found: {other:?}"
  153    153   
                    )),
  154    154   
                )
  155         -
            } /* JsonParserGenerator.kt:722 */
         155  +
            } /* JsonParserGenerator.kt:704 */
  156    156   
        }
  157         -
        /* JsonParserGenerator.kt:721 */
         157  +
        /* JsonParserGenerator.kt:703 */
  158    158   
    }
  159    159   
    /* JsonParserGenerator.kt:255 */
  160    160   
    if tokens.next().is_some() {
  161    161   
        /* JsonParserGenerator.kt:256 */
  162    162   
        return Err(
  163    163   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  164    164   
                "found more JSON tokens after completing parsing",
  165    165   
            ),
  166    166   
        );
  167    167   
        /* JsonParserGenerator.kt:255 */

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

@@ -83,83 +159,159 @@
  103    103   
    crate::input::recursive_shapes_input::Builder,
  104    104   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  105    105   
> {
  106    106   
    /* JsonParserGenerator.kt:158 */
  107    107   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  108    108   
        crate::protocol_serde::or_empty_doc(_value),
  109    109   
    )
  110    110   
    .peekable();
  111    111   
    let tokens = &mut tokens_owned;
  112    112   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  113         -
    /* JsonParserGenerator.kt:721 */
         113  +
    /* JsonParserGenerator.kt:703 */
  114    114   
    loop {
  115         -
        /* JsonParserGenerator.kt:722 */
         115  +
        /* JsonParserGenerator.kt:704 */
  116    116   
        match tokens.next().transpose()? {
  117         -
            /* JsonParserGenerator.kt:723 */
         117  +
            /* JsonParserGenerator.kt:705 */
  118    118   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  119    119   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  120    120   
                /* JsonParserGenerator.kt:265 */
  121    121   
                match key.to_unescaped()?.as_ref() {
  122    122   
                    /* JsonParserGenerator.kt:267 */
  123    123   
                    "nested" => {
  124    124   
                        /* JsonParserGenerator.kt:277 */
  125    125   
                        builder = builder.set_nested(
  126         -
                            /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_recursive_shapes_input_output_nested1::de_recursive_shapes_input_output_nested1(tokens, _value)?
         126  +
                            /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_recursive_shapes_input_output_nested1::de_recursive_shapes_input_output_nested1(tokens, _value)?
  127    127   
                        /* JsonParserGenerator.kt:277 */);
  128    128   
                        /* JsonParserGenerator.kt:267 */
  129    129   
                    }
  130    130   
                    /* JsonParserGenerator.kt:295 */
  131    131   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  132    132   
                }
  133         -
                /* JsonParserGenerator.kt:723 */
         133  +
                /* JsonParserGenerator.kt:705 */
  134    134   
            }
  135         -
            /* JsonParserGenerator.kt:732 */
         135  +
            /* JsonParserGenerator.kt:714 */
  136    136   
            other => {
  137    137   
                return Err(
  138    138   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  139    139   
                        "expected object key or end object, found: {other:?}"
  140    140   
                    )),
  141    141   
                )
  142         -
            } /* JsonParserGenerator.kt:722 */
         142  +
            } /* JsonParserGenerator.kt:704 */
  143    143   
        }
  144         -
        /* JsonParserGenerator.kt:721 */
         144  +
        /* JsonParserGenerator.kt:703 */
  145    145   
    }
  146    146   
    /* JsonParserGenerator.kt:255 */
  147    147   
    if tokens.next().is_some() {
  148    148   
        /* JsonParserGenerator.kt:256 */
  149    149   
        return Err(
  150    150   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  151    151   
                "found more JSON tokens after completing parsing",
  152    152   
            ),
  153    153   
        );
  154    154   
        /* JsonParserGenerator.kt:255 */

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

@@ -1,1 +118,118 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
/* JsonParserGenerator.kt:553 */
           2  +
/* JsonParserGenerator.kt:535 */
    3      3   
pub(crate) fn de_recursive_shapes_input_output_nested1<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<crate::model::RecursiveShapesInputOutputNested1>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23     23   
            /* RustType.kt:534 */
   24     24   
            #[allow(unused_mut)]
   25         -
            /* JsonParserGenerator.kt:563 */
          25  +
            /* JsonParserGenerator.kt:545 */
   26     26   
            let mut builder =
   27     27   
                crate::model::recursive_shapes_input_output_nested1::Builder::default();
   28         -
            /* JsonParserGenerator.kt:721 */
          28  +
            /* JsonParserGenerator.kt:703 */
   29     29   
            loop {
   30         -
                /* JsonParserGenerator.kt:722 */
          30  +
                /* JsonParserGenerator.kt:704 */
   31     31   
                match tokens.next().transpose()? {
   32         -
                    /* JsonParserGenerator.kt:723 */
          32  +
                    /* JsonParserGenerator.kt:705 */
   33     33   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   34     34   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   35     35   
                        /* JsonParserGenerator.kt:265 */
   36     36   
                        match key.to_unescaped()?.as_ref() {
   37     37   
                            /* JsonParserGenerator.kt:267 */
   38     38   
                            "foo" => {
   39     39   
                                /* JsonParserGenerator.kt:277 */
   40     40   
                                builder = builder.set_foo(
   41     41   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   42     42   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   43     43   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   44     44   
                                        /* JsonParserGenerator.kt:346 */)
   45     45   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   46     46   
                                /* JsonParserGenerator.kt:277 */);
   47     47   
                                /* JsonParserGenerator.kt:267 */
   48     48   
                            }
   49     49   
                            /* JsonParserGenerator.kt:267 */
   50     50   
                            "nested" => {
   51     51   
                                /* JsonParserGenerator.kt:277 */
   52     52   
                                builder = builder.set_nested(
   53         -
                                    /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_recursive_shapes_input_output_nested2::de_recursive_shapes_input_output_nested2(tokens, _value)?
          53  +
                                    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_recursive_shapes_input_output_nested2::de_recursive_shapes_input_output_nested2(tokens, _value)?
   54     54   
                                    /* JsonParserGenerator.kt:321 */.map(Box::new)
   55     55   
                                /* JsonParserGenerator.kt:277 */);
   56     56   
                                /* JsonParserGenerator.kt:267 */
   57     57   
                            }
   58     58   
                            /* JsonParserGenerator.kt:295 */
   59     59   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   60     60   
                        }
   61         -
                        /* JsonParserGenerator.kt:723 */
          61  +
                        /* JsonParserGenerator.kt:705 */
   62     62   
                    }
   63         -
                    /* JsonParserGenerator.kt:732 */
          63  +
                    /* JsonParserGenerator.kt:714 */
   64     64   
                    other => {
   65     65   
                        return Err(
   66     66   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   67     67   
                                format!("expected object key or end object, found: {other:?}"),
   68     68   
                            ),
   69     69   
                        )
   70         -
                    } /* JsonParserGenerator.kt:722 */
          70  +
                    } /* JsonParserGenerator.kt:704 */
   71     71   
                }
   72         -
                /* JsonParserGenerator.kt:721 */
          72  +
                /* JsonParserGenerator.kt:703 */
   73     73   
            }
   74         -
            /* JsonParserGenerator.kt:577 */
          74  +
            /* JsonParserGenerator.kt:559 */
   75     75   
            Ok(Some(builder.build()))
   76         -
            /* JsonParserGenerator.kt:750 */
          76  +
            /* JsonParserGenerator.kt:732 */
   77     77   
        }
   78         -
        /* JsonParserGenerator.kt:759 */
          78  +
        /* JsonParserGenerator.kt:741 */
   79     79   
        _ => {
   80         -
            /* JsonParserGenerator.kt:760 */
          80  +
            /* JsonParserGenerator.kt:742 */
   81     81   
            Err(
   82     82   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   83     83   
                    "expected start object or null",
   84     84   
                ),
   85     85   
            )
   86         -
            /* JsonParserGenerator.kt:759 */
   87         -
        } /* JsonParserGenerator.kt:749 */
          86  +
            /* JsonParserGenerator.kt:741 */
          87  +
        } /* JsonParserGenerator.kt:731 */
   88     88   
    }
   89         -
    /* JsonParserGenerator.kt:553 */
          89  +
    /* JsonParserGenerator.kt:535 */
   90     90   
}
   91     91   
   92     92   
/* JsonSerializerGenerator.kt:360 */
   93     93   
pub fn ser_recursive_shapes_input_output_nested1(
   94     94   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   95     95   
    input: &crate::model::RecursiveShapesInputOutputNested1,
   96     96   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
   97     97   
    /* JsonSerializerGenerator.kt:384 */
   98     98   
    if let Some(var_1) = &input.foo {
   99     99   
        /* JsonSerializerGenerator.kt:425 */

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

@@ -1,1 +117,117 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
/* JsonParserGenerator.kt:553 */
           2  +
/* JsonParserGenerator.kt:535 */
    3      3   
pub(crate) fn de_recursive_shapes_input_output_nested2<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<crate::model::RecursiveShapesInputOutputNested2>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23     23   
            /* RustType.kt:534 */
   24     24   
            #[allow(unused_mut)]
   25         -
            /* JsonParserGenerator.kt:563 */
          25  +
            /* JsonParserGenerator.kt:545 */
   26     26   
            let mut builder =
   27     27   
                crate::model::recursive_shapes_input_output_nested2::Builder::default();
   28         -
            /* JsonParserGenerator.kt:721 */
          28  +
            /* JsonParserGenerator.kt:703 */
   29     29   
            loop {
   30         -
                /* JsonParserGenerator.kt:722 */
          30  +
                /* JsonParserGenerator.kt:704 */
   31     31   
                match tokens.next().transpose()? {
   32         -
                    /* JsonParserGenerator.kt:723 */
          32  +
                    /* JsonParserGenerator.kt:705 */
   33     33   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   34     34   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   35     35   
                        /* JsonParserGenerator.kt:265 */
   36     36   
                        match key.to_unescaped()?.as_ref() {
   37     37   
                            /* JsonParserGenerator.kt:267 */
   38     38   
                            "bar" => {
   39     39   
                                /* JsonParserGenerator.kt:277 */
   40     40   
                                builder = builder.set_bar(
   41     41   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   42     42   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   43     43   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   44     44   
                                        /* JsonParserGenerator.kt:346 */)
   45     45   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   46     46   
                                /* JsonParserGenerator.kt:277 */);
   47     47   
                                /* JsonParserGenerator.kt:267 */
   48     48   
                            }
   49     49   
                            /* JsonParserGenerator.kt:267 */
   50     50   
                            "recursiveMember" => {
   51     51   
                                /* JsonParserGenerator.kt:277 */
   52     52   
                                builder = builder.set_recursive_member(
   53         -
                                    /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_recursive_shapes_input_output_nested1::de_recursive_shapes_input_output_nested1(tokens, _value)?
          53  +
                                    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_recursive_shapes_input_output_nested1::de_recursive_shapes_input_output_nested1(tokens, _value)?
   54     54   
                                /* JsonParserGenerator.kt:277 */);
   55     55   
                                /* JsonParserGenerator.kt:267 */
   56     56   
                            }
   57     57   
                            /* JsonParserGenerator.kt:295 */
   58     58   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   59     59   
                        }
   60         -
                        /* JsonParserGenerator.kt:723 */
          60  +
                        /* JsonParserGenerator.kt:705 */
   61     61   
                    }
   62         -
                    /* JsonParserGenerator.kt:732 */
          62  +
                    /* JsonParserGenerator.kt:714 */
   63     63   
                    other => {
   64     64   
                        return Err(
   65     65   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   66     66   
                                format!("expected object key or end object, found: {other:?}"),
   67     67   
                            ),
   68     68   
                        )
   69         -
                    } /* JsonParserGenerator.kt:722 */
          69  +
                    } /* JsonParserGenerator.kt:704 */
   70     70   
                }
   71         -
                /* JsonParserGenerator.kt:721 */
          71  +
                /* JsonParserGenerator.kt:703 */
   72     72   
            }
   73         -
            /* JsonParserGenerator.kt:577 */
          73  +
            /* JsonParserGenerator.kt:559 */
   74     74   
            Ok(Some(builder.build()))
   75         -
            /* JsonParserGenerator.kt:750 */
          75  +
            /* JsonParserGenerator.kt:732 */
   76     76   
        }
   77         -
        /* JsonParserGenerator.kt:759 */
          77  +
        /* JsonParserGenerator.kt:741 */
   78     78   
        _ => {
   79         -
            /* JsonParserGenerator.kt:760 */
          79  +
            /* JsonParserGenerator.kt:742 */
   80     80   
            Err(
   81     81   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   82     82   
                    "expected start object or null",
   83     83   
                ),
   84     84   
            )
   85         -
            /* JsonParserGenerator.kt:759 */
   86         -
        } /* JsonParserGenerator.kt:749 */
          85  +
            /* JsonParserGenerator.kt:741 */
          86  +
        } /* JsonParserGenerator.kt:731 */
   87     87   
    }
   88         -
    /* JsonParserGenerator.kt:553 */
          88  +
    /* JsonParserGenerator.kt:535 */
   89     89   
}
   90     90   
   91     91   
/* JsonSerializerGenerator.kt:360 */
   92     92   
pub fn ser_recursive_shapes_input_output_nested2(
   93     93   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   94     94   
    input: &crate::model::RecursiveShapesInputOutputNested2,
   95     95   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
   96     96   
    /* JsonSerializerGenerator.kt:384 */
   97     97   
    if let Some(var_1) = &input.bar {
   98     98   
        /* JsonSerializerGenerator.kt:425 */

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_renamed_greeting.rs

@@ -1,1 +96,96 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
/* JsonParserGenerator.kt:553 */
           2  +
/* JsonParserGenerator.kt:535 */
    3      3   
pub(crate) fn de_renamed_greeting<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<crate::model::RenamedGreeting>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23     23   
            /* RustType.kt:534 */
   24     24   
            #[allow(unused_mut)]
   25         -
            /* JsonParserGenerator.kt:563 */
          25  +
            /* JsonParserGenerator.kt:545 */
   26     26   
            let mut builder = crate::model::renamed_greeting::Builder::default();
   27         -
            /* JsonParserGenerator.kt:721 */
          27  +
            /* JsonParserGenerator.kt:703 */
   28     28   
            loop {
   29         -
                /* JsonParserGenerator.kt:722 */
          29  +
                /* JsonParserGenerator.kt:704 */
   30     30   
                match tokens.next().transpose()? {
   31         -
                    /* JsonParserGenerator.kt:723 */
          31  +
                    /* JsonParserGenerator.kt:705 */
   32     32   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   33     33   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   34     34   
                        /* JsonParserGenerator.kt:265 */
   35     35   
                        match key.to_unescaped()?.as_ref() {
   36     36   
                            /* JsonParserGenerator.kt:267 */
   37     37   
                            "salutation" => {
   38     38   
                                /* JsonParserGenerator.kt:277 */
   39     39   
                                builder = builder.set_salutation(
   40     40   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   41     41   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   42     42   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   43     43   
                                        /* JsonParserGenerator.kt:346 */)
   44     44   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   45     45   
                                /* JsonParserGenerator.kt:277 */);
   46     46   
                                /* JsonParserGenerator.kt:267 */
   47     47   
                            }
   48     48   
                            /* JsonParserGenerator.kt:295 */
   49     49   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   50     50   
                        }
   51         -
                        /* JsonParserGenerator.kt:723 */
          51  +
                        /* JsonParserGenerator.kt:705 */
   52     52   
                    }
   53         -
                    /* JsonParserGenerator.kt:732 */
          53  +
                    /* JsonParserGenerator.kt:714 */
   54     54   
                    other => {
   55     55   
                        return Err(
   56     56   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   57     57   
                                format!("expected object key or end object, found: {other:?}"),
   58     58   
                            ),
   59     59   
                        )
   60         -
                    } /* JsonParserGenerator.kt:722 */
          60  +
                    } /* JsonParserGenerator.kt:704 */
   61     61   
                }
   62         -
                /* JsonParserGenerator.kt:721 */
          62  +
                /* JsonParserGenerator.kt:703 */
   63     63   
            }
   64         -
            /* JsonParserGenerator.kt:577 */
          64  +
            /* JsonParserGenerator.kt:559 */
   65     65   
            Ok(Some(builder.build()))
   66         -
            /* JsonParserGenerator.kt:750 */
          66  +
            /* JsonParserGenerator.kt:732 */
   67     67   
        }
   68         -
        /* JsonParserGenerator.kt:759 */
          68  +
        /* JsonParserGenerator.kt:741 */
   69     69   
        _ => {
   70         -
            /* JsonParserGenerator.kt:760 */
          70  +
            /* JsonParserGenerator.kt:742 */
   71     71   
            Err(
   72     72   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   73     73   
                    "expected start object or null",
   74     74   
                ),
   75     75   
            )
   76         -
            /* JsonParserGenerator.kt:759 */
   77         -
        } /* JsonParserGenerator.kt:749 */
          76  +
            /* JsonParserGenerator.kt:741 */
          77  +
        } /* JsonParserGenerator.kt:731 */
   78     78   
    }
   79         -
    /* JsonParserGenerator.kt:553 */
          79  +
    /* JsonParserGenerator.kt:535 */
   80     80   
}
   81     81   
   82     82   
/* JsonSerializerGenerator.kt:360 */
   83     83   
pub fn ser_renamed_greeting(
   84     84   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   85     85   
    input: &crate::model::RenamedGreeting,
   86     86   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
   87     87   
    /* JsonSerializerGenerator.kt:384 */
   88     88   
    if let Some(var_1) = &input.salutation {
   89     89   
        /* JsonSerializerGenerator.kt:425 */

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_simple_list.rs

@@ -1,1 +79,77 @@
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
   23     23   
            /* JsonParserGenerator.kt:444 */
   24     24   
            let mut items = Vec::new();
   25     25   
            /* JsonParserGenerator.kt:445 */
   26     26   
            loop {
   27     27   
                /* JsonParserGenerator.kt:446 */
   28     28   
                match tokens.peek() {
   29     29   
                    /* JsonParserGenerator.kt:447 */
   30     30   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
   31     31   
                        /* JsonParserGenerator.kt:448 */
   32     32   
                        tokens.next().transpose().unwrap();
   33     33   
                        break;
   34     34   
                        /* JsonParserGenerator.kt:447 */
   35     35   
                    }
   36     36   
                    /* JsonParserGenerator.kt:450 */
   37     37   
                    _ => {
   38     38   
                        /* JsonParserGenerator.kt:456 */
   39     39   
                        let value =
   40     40   
                            /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   41     41   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   42     42   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
   43     43   
                                /* JsonParserGenerator.kt:346 */)
   44     44   
                            /* JsonParserGenerator.kt:361 */).transpose()?
   45     45   
                        /* JsonParserGenerator.kt:456 */;
   46     46   
                        /* JsonParserGenerator.kt:459 */
   47     47   
                        if let Some(value) = value {
   48     48   
                            items.push(value);
   49         -
                        }
   50         -
                        /* JsonParserGenerator.kt:467 */
   51         -
                        else {
          49  +
                        } else {
   52     50   
                            return Err(
   53     51   
                                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   54     52   
                                    "dense list cannot contain null values",
   55     53   
                                ),
   56     54   
                            );
   57     55   
                        }
   58     56   
                        /* JsonParserGenerator.kt:450 */
   59     57   
                    } /* JsonParserGenerator.kt:446 */
   60     58   
                }
   61     59   
                /* JsonParserGenerator.kt:445 */
   62     60   
            }
   63         -
            /* JsonParserGenerator.kt:483 */
          61  +
            /* JsonParserGenerator.kt:476 */
   64     62   
            Ok(Some(items))
   65         -
            /* JsonParserGenerator.kt:750 */
          63  +
            /* JsonParserGenerator.kt:732 */
   66     64   
        }
   67         -
        /* JsonParserGenerator.kt:759 */
          65  +
        /* JsonParserGenerator.kt:741 */
   68     66   
        _ => {
   69         -
            /* JsonParserGenerator.kt:760 */
          67  +
            /* JsonParserGenerator.kt:742 */
   70     68   
            Err(
   71     69   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   72     70   
                    "expected start array or null",
   73     71   
                ),
   74     72   
            )
   75         -
            /* JsonParserGenerator.kt:759 */
   76         -
        } /* JsonParserGenerator.kt:749 */
          73  +
            /* JsonParserGenerator.kt:741 */
          74  +
        } /* JsonParserGenerator.kt:731 */
   77     75   
    }
   78     76   
    /* JsonParserGenerator.kt:435 */
   79     77   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_simple_map.rs

@@ -1,1 +88,88 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
/* JsonParserGenerator.kt:497 */
           2  +
/* JsonParserGenerator.kt:490 */
    3      3   
pub(crate) fn de_simple_map<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<::std::collections::HashMap<::std::string::String, ::std::string::String>>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23         -
            /* JsonParserGenerator.kt:506 */
          23  +
            /* JsonParserGenerator.kt:499 */
   24     24   
            let mut map = ::std::collections::HashMap::new();
   25         -
            /* JsonParserGenerator.kt:721 */
          25  +
            /* JsonParserGenerator.kt:703 */
   26     26   
            loop {
   27         -
                /* JsonParserGenerator.kt:722 */
          27  +
                /* JsonParserGenerator.kt:704 */
   28     28   
                match tokens.next().transpose()? {
   29         -
                    /* JsonParserGenerator.kt:723 */
          29  +
                    /* JsonParserGenerator.kt:705 */
   30     30   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   31     31   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   32         -
                        /* JsonParserGenerator.kt:508 */
          32  +
                        /* JsonParserGenerator.kt:501 */
   33     33   
                        let key =
   34     34   
                            /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
   35     35   
                                /* JsonParserGenerator.kt:355 */u.into_owned()
   36     36   
                            /* JsonParserGenerator.kt:346 */)
   37         -
                        /* JsonParserGenerator.kt:508 */?;
   38         -
                        /* JsonParserGenerator.kt:511 */
          37  +
                        /* JsonParserGenerator.kt:501 */?;
          38  +
                        /* JsonParserGenerator.kt:504 */
   39     39   
                        let value =
   40     40   
                            /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   41     41   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   42     42   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
   43     43   
                                /* JsonParserGenerator.kt:346 */)
   44     44   
                            /* JsonParserGenerator.kt:361 */).transpose()?
   45         -
                        /* JsonParserGenerator.kt:511 */;
   46         -
                        /* JsonParserGenerator.kt:518 */
          45  +
                        /* JsonParserGenerator.kt:504 */;
          46  +
                        /* JsonParserGenerator.kt:510 */
   47     47   
                        match value {
   48     48   
                            Some(value) => {
   49     49   
                                map.insert(key, value);
   50     50   
                            }
   51     51   
                            None => {
   52     52   
                                return Err(
   53     53   
                                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   54     54   
                                        "dense map cannot contain null values",
   55     55   
                                    ),
   56     56   
                                )
   57     57   
                            }
   58     58   
                        }
   59         -
                        /* JsonParserGenerator.kt:723 */
          59  +
                        /* JsonParserGenerator.kt:705 */
   60     60   
                    }
   61         -
                    /* JsonParserGenerator.kt:732 */
          61  +
                    /* JsonParserGenerator.kt:714 */
   62     62   
                    other => {
   63     63   
                        return Err(
   64     64   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   65     65   
                                format!("expected object key or end object, found: {other:?}"),
   66     66   
                            ),
   67     67   
                        )
   68         -
                    } /* JsonParserGenerator.kt:722 */
          68  +
                    } /* JsonParserGenerator.kt:704 */
   69     69   
                }
   70         -
                /* JsonParserGenerator.kt:721 */
          70  +
                /* JsonParserGenerator.kt:703 */
   71     71   
            }
   72         -
            /* JsonParserGenerator.kt:541 */
          72  +
            /* JsonParserGenerator.kt:523 */
   73     73   
            Ok(Some(map))
   74         -
            /* JsonParserGenerator.kt:750 */
          74  +
            /* JsonParserGenerator.kt:732 */
   75     75   
        }
   76         -
        /* JsonParserGenerator.kt:759 */
          76  +
        /* JsonParserGenerator.kt:741 */
   77     77   
        _ => {
   78         -
            /* JsonParserGenerator.kt:760 */
          78  +
            /* JsonParserGenerator.kt:742 */
   79     79   
            Err(
   80     80   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   81     81   
                    "expected start object or null",
   82     82   
                ),
   83     83   
            )
   84         -
            /* JsonParserGenerator.kt:759 */
   85         -
        } /* JsonParserGenerator.kt:749 */
          84  +
            /* JsonParserGenerator.kt:741 */
          85  +
        } /* JsonParserGenerator.kt:731 */
   86     86   
    }
   87         -
    /* JsonParserGenerator.kt:497 */
          87  +
    /* JsonParserGenerator.kt:490 */
   88     88   
}

tmp-codegen-diff/codegen-server-test/rest_json/rust-server-codegen/src/protocol_serde/shape_simple_scalar_properties.rs

@@ -92,92 +156,156 @@
  112    112   
    crate::input::simple_scalar_properties_input::Builder,
  113    113   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  114    114   
> {
  115    115   
    /* JsonParserGenerator.kt:158 */
  116    116   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  117    117   
        crate::protocol_serde::or_empty_doc(_value),
  118    118   
    )
  119    119   
    .peekable();
  120    120   
    let tokens = &mut tokens_owned;
  121    121   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  122         -
    /* JsonParserGenerator.kt:721 */
         122  +
    /* JsonParserGenerator.kt:703 */
  123    123   
    loop {
  124         -
        /* JsonParserGenerator.kt:722 */
         124  +
        /* JsonParserGenerator.kt:704 */
  125    125   
        match tokens.next().transpose()? {
  126         -
            /* JsonParserGenerator.kt:723 */
         126  +
            /* JsonParserGenerator.kt:705 */
  127    127   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  128    128   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  129    129   
                /* JsonParserGenerator.kt:265 */
  130    130   
                match key.to_unescaped()?.as_ref() {
  131    131   
                    /* JsonParserGenerator.kt:267 */
  132    132   
                    "byteValue" => {
  133    133   
                        /* JsonParserGenerator.kt:277 */
  134    134   
                        builder = builder.set_byte_value(
  135    135   
                            /* JsonParserGenerator.kt:372 */
  136    136   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(
@@ -218,218 +289,289 @@
  238    238   
                            /* JsonParserGenerator.kt:303 */
  239    239   
                            ::aws_smithy_json::deserialize::token::expect_bool_or_null(
  240    240   
                                tokens.next(),
  241    241   
                            )?, /* JsonParserGenerator.kt:277 */
  242    242   
                        );
  243    243   
                        /* JsonParserGenerator.kt:267 */
  244    244   
                    }
  245    245   
                    /* JsonParserGenerator.kt:295 */
  246    246   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  247    247   
                }
  248         -
                /* JsonParserGenerator.kt:723 */
         248  +
                /* JsonParserGenerator.kt:705 */
  249    249   
            }
  250         -
            /* JsonParserGenerator.kt:732 */
         250  +
            /* JsonParserGenerator.kt:714 */
  251    251   
            other => {
  252    252   
                return Err(
  253    253   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  254    254   
                        "expected object key or end object, found: {other:?}"
  255    255   
                    )),
  256    256   
                )
  257         -
            } /* JsonParserGenerator.kt:722 */
         257  +
            } /* JsonParserGenerator.kt:704 */
  258    258   
        }
  259         -
        /* JsonParserGenerator.kt:721 */
         259  +
        /* JsonParserGenerator.kt:703 */
  260    260   
    }
  261    261   
    /* JsonParserGenerator.kt:255 */
  262    262   
    if tokens.next().is_some() {
  263    263   
        /* JsonParserGenerator.kt:256 */
  264    264   
        return Err(
  265    265   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  266    266   
                "found more JSON tokens after completing parsing",
  267    267   
            ),
  268    268   
        );
  269    269   
        /* JsonParserGenerator.kt:255 */

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

@@ -1,1 +123,123 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
/* JsonParserGenerator.kt:588 */
           2  +
/* JsonParserGenerator.kt:570 */
    3      3   
pub(crate) fn de_simple_union<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<crate::model::SimpleUnion>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:602 */
          18  +
    /* JsonParserGenerator.kt:584 */
   19     19   
    let mut variant = None;
   20         -
    /* JsonParserGenerator.kt:604 */
          20  +
    /* JsonParserGenerator.kt:586 */
   21     21   
    match tokens.next().transpose()? {
   22         -
        /* JsonParserGenerator.kt:605 */
          22  +
        /* JsonParserGenerator.kt:587 */
   23     23   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => return Ok(None),
   24     24   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   25         -
            /* JsonParserGenerator.kt:721 */
          25  +
            /* JsonParserGenerator.kt:703 */
   26     26   
            loop {
   27         -
                /* JsonParserGenerator.kt:722 */
          27  +
                /* JsonParserGenerator.kt:704 */
   28     28   
                match tokens.next().transpose()? {
   29         -
                    /* JsonParserGenerator.kt:723 */
          29  +
                    /* JsonParserGenerator.kt:705 */
   30     30   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   31     31   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   32         -
                        /* JsonParserGenerator.kt:613 */
          32  +
                        /* JsonParserGenerator.kt:595 */
   33     33   
                        if let ::std::option::Option::Some(::std::result::Result::Ok(
   34     34   
                            ::aws_smithy_json::deserialize::Token::ValueNull { .. },
   35     35   
                        )) = tokens.peek()
   36     36   
                        {
   37     37   
                            let _ = tokens.next().expect("peek returned a token")?;
   38     38   
                            continue;
   39     39   
                        }
   40         -
                        /* JsonParserGenerator.kt:622 */
          40  +
                        /* JsonParserGenerator.kt:604 */
   41     41   
                        let key = key.to_unescaped()?;
   42     42   
                        if key == "__type" {
   43     43   
                            ::aws_smithy_json::deserialize::token::skip_value(tokens)?;
   44     44   
                            continue;
   45     45   
                        }
   46     46   
                        if variant.is_some() {
   47     47   
                            return Err(
   48     48   
                                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   49     49   
                                    "encountered mixed variants in union",
   50     50   
                                ),
   51     51   
                            );
   52     52   
                        }
   53         -
                        /* JsonParserGenerator.kt:635 */
          53  +
                        /* JsonParserGenerator.kt:617 */
   54     54   
                        variant = match key.as_ref() {
   55         -
                            /* JsonParserGenerator.kt:638 */
          55  +
                            /* JsonParserGenerator.kt:620 */
   56     56   
                            "int" => {
   57         -
                                /* JsonParserGenerator.kt:648 */
          57  +
                                /* JsonParserGenerator.kt:630 */
   58     58   
                                Some(crate::model::SimpleUnion::Int(
   59     59   
                                    /* JsonParserGenerator.kt:372 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   60     60   
                                                        .map(i32::try_from)
   61     61   
                                                        .transpose()?
   62         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'int' cannot be null"))?
   63         -
                                /* JsonParserGenerator.kt:648 */))
   64         -
                                /* JsonParserGenerator.kt:638 */
          62  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'int' cannot be null"))?
          63  +
                                /* JsonParserGenerator.kt:630 */))
          64  +
                                /* JsonParserGenerator.kt:620 */
   65     65   
                            }
   66         -
                            /* JsonParserGenerator.kt:638 */
          66  +
                            /* JsonParserGenerator.kt:620 */
   67     67   
                            "string" => {
   68         -
                                /* JsonParserGenerator.kt:648 */
          68  +
                                /* JsonParserGenerator.kt:630 */
   69     69   
                                Some(crate::model::SimpleUnion::String(
   70     70   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   71     71   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   72     72   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   73     73   
                                        /* JsonParserGenerator.kt:346 */)
   74     74   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   75         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'string' cannot be null"))?
   76         -
                                /* JsonParserGenerator.kt:648 */))
   77         -
                                /* JsonParserGenerator.kt:638 */
          75  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'string' cannot be null"))?
          76  +
                                /* JsonParserGenerator.kt:630 */))
          77  +
                                /* JsonParserGenerator.kt:620 */
   78     78   
                            }
   79         -
                            /* JsonParserGenerator.kt:671 */
          79  +
                            /* JsonParserGenerator.kt:653 */
   80     80   
                            variant => {
   81     81   
                                return Err(
   82     82   
                                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   83     83   
                                        format!("unexpected union variant: {variant}"),
   84     84   
                                    ),
   85     85   
                                )
   86         -
                            } /* JsonParserGenerator.kt:635 */
          86  +
                            } /* JsonParserGenerator.kt:617 */
   87     87   
                        };
   88         -
                        /* JsonParserGenerator.kt:723 */
          88  +
                        /* JsonParserGenerator.kt:705 */
   89     89   
                    }
   90         -
                    /* JsonParserGenerator.kt:732 */
          90  +
                    /* JsonParserGenerator.kt:714 */
   91     91   
                    other => {
   92     92   
                        return Err(
   93     93   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   94     94   
                                format!("expected object key or end object, found: {other:?}"),
   95     95   
                            ),
   96     96   
                        )
   97         -
                    } /* JsonParserGenerator.kt:722 */
          97  +
                    } /* JsonParserGenerator.kt:704 */
   98     98   
                }
   99         -
                /* JsonParserGenerator.kt:721 */
          99  +
                /* JsonParserGenerator.kt:703 */
  100    100   
            }
  101         -
            /* JsonParserGenerator.kt:605 */
         101  +
            /* JsonParserGenerator.kt:587 */
  102    102   
        }
  103         -
        /* JsonParserGenerator.kt:679 */
         103  +
        /* JsonParserGenerator.kt:661 */
  104    104   
        _ => {
  105    105   
            return Err(
  106    106   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  107    107   
                    "expected start object or null",
  108    108   
                ),
  109    109   
            )
  110         -
        } /* JsonParserGenerator.kt:604 */
         110  +
        } /* JsonParserGenerator.kt:586 */
  111    111   
    }
  112         -
    /* JsonParserGenerator.kt:686 */
         112  +
    /* JsonParserGenerator.kt:668 */
  113    113   
    if variant.is_none() {
  114    114   
        return Err(
  115    115   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  116    116   
                "Union did not contain a valid variant.",
  117    117   
            ),
  118    118   
        );
  119    119   
    }
  120         -
    /* JsonParserGenerator.kt:694 */
         120  +
    /* JsonParserGenerator.kt:676 */
  121    121   
    Ok(variant)
  122         -
    /* JsonParserGenerator.kt:588 */
         122  +
    /* JsonParserGenerator.kt:570 */
  123    123   
}

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

@@ -1,1 +73,73 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
/* JsonParserGenerator.kt:497 */
           2  +
/* JsonParserGenerator.kt:490 */
    3      3   
pub(crate) fn de_sparse_boolean_map<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<::std::collections::HashMap<::std::string::String, ::std::option::Option<bool>>>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23         -
            /* JsonParserGenerator.kt:506 */
          23  +
            /* JsonParserGenerator.kt:499 */
   24     24   
            let mut map = ::std::collections::HashMap::new();
   25         -
            /* JsonParserGenerator.kt:721 */
          25  +
            /* JsonParserGenerator.kt:703 */
   26     26   
            loop {
   27         -
                /* JsonParserGenerator.kt:722 */
          27  +
                /* JsonParserGenerator.kt:704 */
   28     28   
                match tokens.next().transpose()? {
   29         -
                    /* JsonParserGenerator.kt:723 */
          29  +
                    /* JsonParserGenerator.kt:705 */
   30     30   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   31     31   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   32         -
                        /* JsonParserGenerator.kt:508 */
          32  +
                        /* JsonParserGenerator.kt:501 */
   33     33   
                        let key =
   34     34   
                            /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
   35     35   
                                /* JsonParserGenerator.kt:355 */u.into_owned()
   36     36   
                            /* JsonParserGenerator.kt:346 */)
   37         -
                        /* JsonParserGenerator.kt:508 */?;
   38         -
                        /* JsonParserGenerator.kt:511 */
          37  +
                        /* JsonParserGenerator.kt:501 */?;
          38  +
                        /* JsonParserGenerator.kt:504 */
   39     39   
                        let value =
   40     40   
                            /* JsonParserGenerator.kt:303 */::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?
   41         -
                        /* JsonParserGenerator.kt:511 */;
   42         -
                        /* JsonParserGenerator.kt:515 */
          41  +
                        /* JsonParserGenerator.kt:504 */;
          42  +
                        /* JsonParserGenerator.kt:508 */
   43     43   
                        map.insert(key, value);
   44         -
                        /* JsonParserGenerator.kt:723 */
          44  +
                        /* JsonParserGenerator.kt:705 */
   45     45   
                    }
   46         -
                    /* JsonParserGenerator.kt:732 */
          46  +
                    /* JsonParserGenerator.kt:714 */
   47     47   
                    other => {
   48     48   
                        return Err(
   49     49   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   50     50   
                                format!("expected object key or end object, found: {other:?}"),
   51     51   
                            ),
   52     52   
                        )
   53         -
                    } /* JsonParserGenerator.kt:722 */
          53  +
                    } /* JsonParserGenerator.kt:704 */
   54     54   
                }
   55         -
                /* JsonParserGenerator.kt:721 */
          55  +
                /* JsonParserGenerator.kt:703 */
   56     56   
            }
   57         -
            /* JsonParserGenerator.kt:541 */
          57  +
            /* JsonParserGenerator.kt:523 */
   58     58   
            Ok(Some(map))
   59         -
            /* JsonParserGenerator.kt:750 */
          59  +
            /* JsonParserGenerator.kt:732 */
   60     60   
        }
   61         -
        /* JsonParserGenerator.kt:759 */
          61  +
        /* JsonParserGenerator.kt:741 */
   62     62   
        _ => {
   63         -
            /* JsonParserGenerator.kt:760 */
          63  +
            /* JsonParserGenerator.kt:742 */
   64     64   
            Err(
   65     65   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   66     66   
                    "expected start object or null",
   67     67   
                ),
   68     68   
            )
   69         -
            /* JsonParserGenerator.kt:759 */
   70         -
        } /* JsonParserGenerator.kt:749 */
          69  +
            /* JsonParserGenerator.kt:741 */
          70  +
        } /* JsonParserGenerator.kt:731 */
   71     71   
    }
   72         -
    /* JsonParserGenerator.kt:497 */
          72  +
    /* JsonParserGenerator.kt:490 */
   73     73   
}

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

@@ -83,83 +173,173 @@
  103    103   
    crate::input::sparse_json_lists_input::Builder,
  104    104   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  105    105   
> {
  106    106   
    /* JsonParserGenerator.kt:158 */
  107    107   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  108    108   
        crate::protocol_serde::or_empty_doc(_value),
  109    109   
    )
  110    110   
    .peekable();
  111    111   
    let tokens = &mut tokens_owned;
  112    112   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  113         -
    /* JsonParserGenerator.kt:721 */
         113  +
    /* JsonParserGenerator.kt:703 */
  114    114   
    loop {
  115         -
        /* JsonParserGenerator.kt:722 */
         115  +
        /* JsonParserGenerator.kt:704 */
  116    116   
        match tokens.next().transpose()? {
  117         -
            /* JsonParserGenerator.kt:723 */
         117  +
            /* JsonParserGenerator.kt:705 */
  118    118   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  119    119   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  120    120   
                /* JsonParserGenerator.kt:265 */
  121    121   
                match key.to_unescaped()?.as_ref() {
  122    122   
                    /* JsonParserGenerator.kt:267 */
  123    123   
                    "sparseShortList" => {
  124    124   
                        /* JsonParserGenerator.kt:277 */
  125    125   
                        builder = builder.set_sparse_short_list(
  126         -
                            /* JsonParserGenerator.kt:488 */
         126  +
                            /* JsonParserGenerator.kt:481 */
  127    127   
                            crate::protocol_serde::shape_sparse_short_list::de_sparse_short_list(
  128    128   
                                tokens, _value,
  129    129   
                            )?, /* JsonParserGenerator.kt:277 */
  130    130   
                        );
  131    131   
                        /* JsonParserGenerator.kt:267 */
  132    132   
                    }
  133    133   
                    /* JsonParserGenerator.kt:267 */
  134    134   
                    "sparseStringList" => {
  135    135   
                        /* JsonParserGenerator.kt:277 */
  136    136   
                        builder = builder.set_sparse_string_list(
  137         -
                            /* JsonParserGenerator.kt:488 */
         137  +
                            /* JsonParserGenerator.kt:481 */
  138    138   
                            crate::protocol_serde::shape_sparse_string_list::de_sparse_string_list(
  139    139   
                                tokens, _value,
  140    140   
                            )?, /* JsonParserGenerator.kt:277 */
  141    141   
                        );
  142    142   
                        /* JsonParserGenerator.kt:267 */
  143    143   
                    }
  144    144   
                    /* JsonParserGenerator.kt:295 */
  145    145   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  146    146   
                }
  147         -
                /* JsonParserGenerator.kt:723 */
         147  +
                /* JsonParserGenerator.kt:705 */
  148    148   
            }
  149         -
            /* JsonParserGenerator.kt:732 */
         149  +
            /* JsonParserGenerator.kt:714 */
  150    150   
            other => {
  151    151   
                return Err(
  152    152   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  153    153   
                        "expected object key or end object, found: {other:?}"
  154    154   
                    )),
  155    155   
                )
  156         -
            } /* JsonParserGenerator.kt:722 */
         156  +
            } /* JsonParserGenerator.kt:704 */
  157    157   
        }
  158         -
        /* JsonParserGenerator.kt:721 */
         158  +
        /* JsonParserGenerator.kt:703 */
  159    159   
    }
  160    160   
    /* JsonParserGenerator.kt:255 */
  161    161   
    if tokens.next().is_some() {
  162    162   
        /* JsonParserGenerator.kt:256 */
  163    163   
        return Err(
  164    164   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  165    165   
                "found more JSON tokens after completing parsing",
  166    166   
            ),
  167    167   
        );
  168    168   
        /* JsonParserGenerator.kt:255 */

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

@@ -135,135 +258,258 @@
  155    155   
    crate::input::sparse_json_maps_input::Builder,
  156    156   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  157    157   
> {
  158    158   
    /* JsonParserGenerator.kt:158 */
  159    159   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  160    160   
        crate::protocol_serde::or_empty_doc(_value),
  161    161   
    )
  162    162   
    .peekable();
  163    163   
    let tokens = &mut tokens_owned;
  164    164   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  165         -
    /* JsonParserGenerator.kt:721 */
         165  +
    /* JsonParserGenerator.kt:703 */
  166    166   
    loop {
  167         -
        /* JsonParserGenerator.kt:722 */
         167  +
        /* JsonParserGenerator.kt:704 */
  168    168   
        match tokens.next().transpose()? {
  169         -
            /* JsonParserGenerator.kt:723 */
         169  +
            /* JsonParserGenerator.kt:705 */
  170    170   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  171    171   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  172    172   
                /* JsonParserGenerator.kt:265 */
  173    173   
                match key.to_unescaped()?.as_ref() {
  174    174   
                    /* JsonParserGenerator.kt:267 */
  175    175   
                    "sparseBooleanMap" => {
  176    176   
                        /* JsonParserGenerator.kt:277 */
  177    177   
                        builder = builder.set_sparse_boolean_map(
  178         -
                            /* JsonParserGenerator.kt:546 */
         178  +
                            /* JsonParserGenerator.kt:528 */
  179    179   
                            crate::protocol_serde::shape_sparse_boolean_map::de_sparse_boolean_map(
  180    180   
                                tokens, _value,
  181    181   
                            )?, /* JsonParserGenerator.kt:277 */
  182    182   
                        );
  183    183   
                        /* JsonParserGenerator.kt:267 */
  184    184   
                    }
  185    185   
                    /* JsonParserGenerator.kt:267 */
  186    186   
                    "sparseNumberMap" => {
  187    187   
                        /* JsonParserGenerator.kt:277 */
  188    188   
                        builder = builder.set_sparse_number_map(
  189         -
                            /* JsonParserGenerator.kt:546 */
         189  +
                            /* JsonParserGenerator.kt:528 */
  190    190   
                            crate::protocol_serde::shape_sparse_number_map::de_sparse_number_map(
  191    191   
                                tokens, _value,
  192    192   
                            )?, /* JsonParserGenerator.kt:277 */
  193    193   
                        );
  194    194   
                        /* JsonParserGenerator.kt:267 */
  195    195   
                    }
  196    196   
                    /* JsonParserGenerator.kt:267 */
  197    197   
                    "sparseSetMap" => {
  198    198   
                        /* JsonParserGenerator.kt:277 */
  199    199   
                        builder = builder.set_sparse_set_map(
  200         -
                            /* JsonParserGenerator.kt:546 */
         200  +
                            /* JsonParserGenerator.kt:528 */
  201    201   
                            crate::protocol_serde::shape_sparse_set_map::de_sparse_set_map(
  202    202   
                                tokens, _value,
  203    203   
                            )?, /* JsonParserGenerator.kt:277 */
  204    204   
                        );
  205    205   
                        /* JsonParserGenerator.kt:267 */
  206    206   
                    }
  207    207   
                    /* JsonParserGenerator.kt:267 */
  208    208   
                    "sparseStringMap" => {
  209    209   
                        /* JsonParserGenerator.kt:277 */
  210    210   
                        builder = builder.set_sparse_string_map(
  211         -
                            /* JsonParserGenerator.kt:546 */
         211  +
                            /* JsonParserGenerator.kt:528 */
  212    212   
                            crate::protocol_serde::shape_sparse_string_map::de_sparse_string_map(
  213    213   
                                tokens, _value,
  214    214   
                            )?, /* JsonParserGenerator.kt:277 */
  215    215   
                        );
  216    216   
                        /* JsonParserGenerator.kt:267 */
  217    217   
                    }
  218    218   
                    /* JsonParserGenerator.kt:267 */
  219    219   
                    "sparseStructMap" => {
  220    220   
                        /* JsonParserGenerator.kt:277 */
  221    221   
                        builder = builder.set_sparse_struct_map(
  222         -
                            /* JsonParserGenerator.kt:546 */
         222  +
                            /* JsonParserGenerator.kt:528 */
  223    223   
                            crate::protocol_serde::shape_sparse_struct_map::de_sparse_struct_map(
  224    224   
                                tokens, _value,
  225    225   
                            )?, /* JsonParserGenerator.kt:277 */
  226    226   
                        );
  227    227   
                        /* JsonParserGenerator.kt:267 */
  228    228   
                    }
  229    229   
                    /* JsonParserGenerator.kt:295 */
  230    230   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  231    231   
                }
  232         -
                /* JsonParserGenerator.kt:723 */
         232  +
                /* JsonParserGenerator.kt:705 */
  233    233   
            }
  234         -
            /* JsonParserGenerator.kt:732 */
         234  +
            /* JsonParserGenerator.kt:714 */
  235    235   
            other => {
  236    236   
                return Err(
  237    237   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  238    238   
                        "expected object key or end object, found: {other:?}"
  239    239   
                    )),
  240    240   
                )
  241         -
            } /* JsonParserGenerator.kt:722 */
         241  +
            } /* JsonParserGenerator.kt:704 */
  242    242   
        }
  243         -
        /* JsonParserGenerator.kt:721 */
         243  +
        /* JsonParserGenerator.kt:703 */
  244    244   
    }
  245    245   
    /* JsonParserGenerator.kt:255 */
  246    246   
    if tokens.next().is_some() {
  247    247   
        /* JsonParserGenerator.kt:256 */
  248    248   
        return Err(
  249    249   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  250    250   
                "found more JSON tokens after completing parsing",
  251    251   
            ),
  252    252   
        );
  253    253   
        /* JsonParserGenerator.kt:255 */

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

@@ -1,1 +75,75 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
/* JsonParserGenerator.kt:497 */
           2  +
/* JsonParserGenerator.kt:490 */
    3      3   
pub(crate) fn de_sparse_number_map<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<::std::collections::HashMap<::std::string::String, ::std::option::Option<i32>>>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23         -
            /* JsonParserGenerator.kt:506 */
          23  +
            /* JsonParserGenerator.kt:499 */
   24     24   
            let mut map = ::std::collections::HashMap::new();
   25         -
            /* JsonParserGenerator.kt:721 */
          25  +
            /* JsonParserGenerator.kt:703 */
   26     26   
            loop {
   27         -
                /* JsonParserGenerator.kt:722 */
          27  +
                /* JsonParserGenerator.kt:704 */
   28     28   
                match tokens.next().transpose()? {
   29         -
                    /* JsonParserGenerator.kt:723 */
          29  +
                    /* JsonParserGenerator.kt:705 */
   30     30   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   31     31   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   32         -
                        /* JsonParserGenerator.kt:508 */
          32  +
                        /* JsonParserGenerator.kt:501 */
   33     33   
                        let key =
   34     34   
                            /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
   35     35   
                                /* JsonParserGenerator.kt:355 */u.into_owned()
   36     36   
                            /* JsonParserGenerator.kt:346 */)
   37         -
                        /* JsonParserGenerator.kt:508 */?;
   38         -
                        /* JsonParserGenerator.kt:511 */
          37  +
                        /* JsonParserGenerator.kt:501 */?;
          38  +
                        /* JsonParserGenerator.kt:504 */
   39     39   
                        let value =
   40     40   
                            /* JsonParserGenerator.kt:372 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   41     41   
                                                .map(i32::try_from)
   42     42   
                                                .transpose()?
   43         -
                        /* JsonParserGenerator.kt:511 */;
   44         -
                        /* JsonParserGenerator.kt:515 */
          43  +
                        /* JsonParserGenerator.kt:504 */;
          44  +
                        /* JsonParserGenerator.kt:508 */
   45     45   
                        map.insert(key, value);
   46         -
                        /* JsonParserGenerator.kt:723 */
          46  +
                        /* JsonParserGenerator.kt:705 */
   47     47   
                    }
   48         -
                    /* JsonParserGenerator.kt:732 */
          48  +
                    /* JsonParserGenerator.kt:714 */
   49     49   
                    other => {
   50     50   
                        return Err(
   51     51   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   52     52   
                                format!("expected object key or end object, found: {other:?}"),
   53     53   
                            ),
   54     54   
                        )
   55         -
                    } /* JsonParserGenerator.kt:722 */
          55  +
                    } /* JsonParserGenerator.kt:704 */
   56     56   
                }
   57         -
                /* JsonParserGenerator.kt:721 */
          57  +
                /* JsonParserGenerator.kt:703 */
   58     58   
            }
   59         -
            /* JsonParserGenerator.kt:541 */
          59  +
            /* JsonParserGenerator.kt:523 */
   60     60   
            Ok(Some(map))
   61         -
            /* JsonParserGenerator.kt:750 */
          61  +
            /* JsonParserGenerator.kt:732 */
   62     62   
        }
   63         -
        /* JsonParserGenerator.kt:759 */
          63  +
        /* JsonParserGenerator.kt:741 */
   64     64   
        _ => {
   65         -
            /* JsonParserGenerator.kt:760 */
          65  +
            /* JsonParserGenerator.kt:742 */
   66     66   
            Err(
   67     67   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   68     68   
                    "expected start object or null",
   69     69   
                ),
   70     70   
            )
   71         -
            /* JsonParserGenerator.kt:759 */
   72         -
        } /* JsonParserGenerator.kt:749 */
          71  +
            /* JsonParserGenerator.kt:741 */
          72  +
        } /* JsonParserGenerator.kt:731 */
   73     73   
    }
   74         -
    /* JsonParserGenerator.kt:497 */
          74  +
    /* JsonParserGenerator.kt:490 */
   75     75   
}

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

@@ -1,1 +75,75 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
/* JsonParserGenerator.kt:497 */
           2  +
/* JsonParserGenerator.kt:490 */
    3      3   
pub(crate) fn de_sparse_set_map<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<crate::unconstrained::sparse_set_map_unconstrained::SparseSetMapUnconstrained>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23         -
            /* JsonParserGenerator.kt:506 */
          23  +
            /* JsonParserGenerator.kt:499 */
   24     24   
            let mut map = ::std::collections::HashMap::new();
   25         -
            /* JsonParserGenerator.kt:721 */
          25  +
            /* JsonParserGenerator.kt:703 */
   26     26   
            loop {
   27         -
                /* JsonParserGenerator.kt:722 */
          27  +
                /* JsonParserGenerator.kt:704 */
   28     28   
                match tokens.next().transpose()? {
   29         -
                    /* JsonParserGenerator.kt:723 */
          29  +
                    /* JsonParserGenerator.kt:705 */
   30     30   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   31     31   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   32         -
                        /* JsonParserGenerator.kt:508 */
          32  +
                        /* JsonParserGenerator.kt:501 */
   33     33   
                        let key =
   34     34   
                            /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
   35     35   
                                /* JsonParserGenerator.kt:355 */u.into_owned()
   36     36   
                            /* JsonParserGenerator.kt:346 */)
   37         -
                        /* JsonParserGenerator.kt:508 */?;
   38         -
                        /* JsonParserGenerator.kt:511 */
          37  +
                        /* JsonParserGenerator.kt:501 */?;
          38  +
                        /* JsonParserGenerator.kt:504 */
   39     39   
                        let value =
   40         -
                            /* JsonParserGenerator.kt:488 */crate::protocol_serde::shape_string_set::de_string_set(tokens, _value)?
   41         -
                        /* JsonParserGenerator.kt:511 */;
   42         -
                        /* JsonParserGenerator.kt:515 */
          40  +
                            /* JsonParserGenerator.kt:481 */crate::protocol_serde::shape_string_set::de_string_set(tokens, _value)?
          41  +
                        /* JsonParserGenerator.kt:504 */;
          42  +
                        /* JsonParserGenerator.kt:508 */
   43     43   
                        map.insert(key, value);
   44         -
                        /* JsonParserGenerator.kt:723 */
          44  +
                        /* JsonParserGenerator.kt:705 */
   45     45   
                    }
   46         -
                    /* JsonParserGenerator.kt:732 */
          46  +
                    /* JsonParserGenerator.kt:714 */
   47     47   
                    other => {
   48     48   
                        return Err(
   49     49   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   50     50   
                                format!("expected object key or end object, found: {other:?}"),
   51     51   
                            ),
   52     52   
                        )
   53         -
                    } /* JsonParserGenerator.kt:722 */
          53  +
                    } /* JsonParserGenerator.kt:704 */
   54     54   
                }
   55         -
                /* JsonParserGenerator.kt:721 */
          55  +
                /* JsonParserGenerator.kt:703 */
   56     56   
            }
   57         -
            /* JsonParserGenerator.kt:539 */
          57  +
            /* JsonParserGenerator.kt:521 */
   58     58   
            Ok(Some(
   59     59   
                crate::unconstrained::sparse_set_map_unconstrained::SparseSetMapUnconstrained(map),
   60     60   
            ))
   61         -
            /* JsonParserGenerator.kt:750 */
          61  +
            /* JsonParserGenerator.kt:732 */
   62     62   
        }
   63         -
        /* JsonParserGenerator.kt:759 */
          63  +
        /* JsonParserGenerator.kt:741 */
   64     64   
        _ => {
   65         -
            /* JsonParserGenerator.kt:760 */
          65  +
            /* JsonParserGenerator.kt:742 */
   66     66   
            Err(
   67     67   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   68     68   
                    "expected start object or null",
   69     69   
                ),
   70     70   
            )
   71         -
            /* JsonParserGenerator.kt:759 */
   72         -
        } /* JsonParserGenerator.kt:749 */
          71  +
            /* JsonParserGenerator.kt:741 */
          72  +
        } /* JsonParserGenerator.kt:731 */
   73     73   
    }
   74         -
    /* JsonParserGenerator.kt:497 */
          74  +
    /* JsonParserGenerator.kt:490 */
   75     75   
}

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

@@ -1,1 +68,68 @@
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
   23     23   
            /* JsonParserGenerator.kt:444 */
   24     24   
            let mut items = Vec::new();
   25     25   
            /* JsonParserGenerator.kt:445 */
   26     26   
            loop {
   27     27   
                /* JsonParserGenerator.kt:446 */
   28     28   
                match tokens.peek() {
   29     29   
                    /* JsonParserGenerator.kt:447 */
   30     30   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
   31     31   
                        /* JsonParserGenerator.kt:448 */
   32     32   
                        tokens.next().transpose().unwrap();
   33     33   
                        break;
   34     34   
                        /* JsonParserGenerator.kt:447 */
   35     35   
                    }
   36     36   
                    /* JsonParserGenerator.kt:450 */
   37     37   
                    _ => {
   38     38   
                        /* JsonParserGenerator.kt:452 */
   39     39   
                        items.push(
   40     40   
                            /* JsonParserGenerator.kt:372 */
   41     41   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(
   42     42   
                                tokens.next(),
   43     43   
                            )?
   44     44   
                            .map(i16::try_from)
   45     45   
                            .transpose()?, /* JsonParserGenerator.kt:452 */
   46     46   
                        );
   47     47   
                        /* JsonParserGenerator.kt:450 */
   48     48   
                    } /* JsonParserGenerator.kt:446 */
   49     49   
                }
   50     50   
                /* JsonParserGenerator.kt:445 */
   51     51   
            }
   52         -
            /* JsonParserGenerator.kt:483 */
          52  +
            /* JsonParserGenerator.kt:476 */
   53     53   
            Ok(Some(items))
   54         -
            /* JsonParserGenerator.kt:750 */
          54  +
            /* JsonParserGenerator.kt:732 */
   55     55   
        }
   56         -
        /* JsonParserGenerator.kt:759 */
          56  +
        /* JsonParserGenerator.kt:741 */
   57     57   
        _ => {
   58         -
            /* JsonParserGenerator.kt:760 */
          58  +
            /* JsonParserGenerator.kt:742 */
   59     59   
            Err(
   60     60   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   61     61   
                    "expected start array or null",
   62     62   
                ),
   63     63   
            )
   64         -
            /* JsonParserGenerator.kt:759 */
   65         -
        } /* JsonParserGenerator.kt:749 */
          64  +
            /* JsonParserGenerator.kt:741 */
          65  +
        } /* JsonParserGenerator.kt:731 */
   66     66   
    }
   67     67   
    /* JsonParserGenerator.kt:435 */
   68     68   
}

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

@@ -1,1 +71,71 @@
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
   23     23   
            /* JsonParserGenerator.kt:444 */
   24     24   
            let mut items = Vec::new();
   25     25   
            /* JsonParserGenerator.kt:445 */
   26     26   
            loop {
   27     27   
                /* JsonParserGenerator.kt:446 */
   28     28   
                match tokens.peek() {
   29     29   
                    /* JsonParserGenerator.kt:447 */
   30     30   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
   31     31   
                        /* JsonParserGenerator.kt:448 */
   32     32   
                        tokens.next().transpose().unwrap();
   33     33   
                        break;
   34     34   
                        /* JsonParserGenerator.kt:447 */
   35     35   
                    }
   36     36   
                    /* JsonParserGenerator.kt:450 */
   37     37   
                    _ => {
   38     38   
                        /* JsonParserGenerator.kt:452 */
   39     39   
                        items.push(
   40     40   
                            /* JsonParserGenerator.kt:361 */
   41     41   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(
   42     42   
                                tokens.next(),
   43     43   
                            )?
   44     44   
                            .map(|s|
   45     45   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   46     46   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
   47     47   
                                /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
   48     48   
                            .transpose()?, /* JsonParserGenerator.kt:452 */
   49     49   
                        );
   50     50   
                        /* JsonParserGenerator.kt:450 */
   51     51   
                    } /* JsonParserGenerator.kt:446 */
   52     52   
                }
   53     53   
                /* JsonParserGenerator.kt:445 */
   54     54   
            }
   55         -
            /* JsonParserGenerator.kt:483 */
          55  +
            /* JsonParserGenerator.kt:476 */
   56     56   
            Ok(Some(items))
   57         -
            /* JsonParserGenerator.kt:750 */
          57  +
            /* JsonParserGenerator.kt:732 */
   58     58   
        }
   59         -
        /* JsonParserGenerator.kt:759 */
          59  +
        /* JsonParserGenerator.kt:741 */
   60     60   
        _ => {
   61         -
            /* JsonParserGenerator.kt:760 */
          61  +
            /* JsonParserGenerator.kt:742 */
   62     62   
            Err(
   63     63   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   64     64   
                    "expected start array or null",
   65     65   
                ),
   66     66   
            )
   67         -
            /* JsonParserGenerator.kt:759 */
   68         -
        } /* JsonParserGenerator.kt:749 */
          67  +
            /* JsonParserGenerator.kt:741 */
          68  +
        } /* JsonParserGenerator.kt:731 */
   69     69   
    }
   70     70   
    /* JsonParserGenerator.kt:435 */
   71     71   
}