Server Test

Server Test

rev. a23878c81aa229b05ce2d03d6aa4e35b4eb4ed5a (ignoring whitespace)

Files changed:

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

@@ -181,181 +262,262 @@
  201    201   
    crate::input::malformed_short_input::Builder,
  202    202   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  203    203   
> {
  204    204   
    /* JsonParserGenerator.kt:158 */
  205    205   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  206    206   
        crate::protocol_serde::or_empty_doc(_value),
  207    207   
    )
  208    208   
    .peekable();
  209    209   
    let tokens = &mut tokens_owned;
  210    210   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  211         -
    /* JsonParserGenerator.kt:721 */
         211  +
    /* JsonParserGenerator.kt:703 */
  212    212   
    loop {
  213         -
        /* JsonParserGenerator.kt:722 */
         213  +
        /* JsonParserGenerator.kt:704 */
  214    214   
        match tokens.next().transpose()? {
  215         -
            /* JsonParserGenerator.kt:723 */
         215  +
            /* JsonParserGenerator.kt:705 */
  216    216   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  217    217   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  218    218   
                /* JsonParserGenerator.kt:265 */
  219    219   
                match key.to_unescaped()?.as_ref() {
  220    220   
                    /* JsonParserGenerator.kt:267 */
  221    221   
                    "shortInBody" => {
  222    222   
                        /* JsonParserGenerator.kt:277 */
  223    223   
                        builder = builder.set_short_in_body(
  224    224   
                            /* JsonParserGenerator.kt:372 */
  225    225   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(
  226    226   
                                tokens.next(),
  227    227   
                            )?
  228    228   
                            .map(i16::try_from)
  229    229   
                            .transpose()?, /* JsonParserGenerator.kt:277 */
  230    230   
                        );
  231    231   
                        /* JsonParserGenerator.kt:267 */
  232    232   
                    }
  233    233   
                    /* JsonParserGenerator.kt:295 */
  234    234   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  235    235   
                }
  236         -
                /* JsonParserGenerator.kt:723 */
         236  +
                /* JsonParserGenerator.kt:705 */
  237    237   
            }
  238         -
            /* JsonParserGenerator.kt:732 */
         238  +
            /* JsonParserGenerator.kt:714 */
  239    239   
            other => {
  240    240   
                return Err(
  241    241   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  242    242   
                        "expected object key or end object, found: {other:?}"
  243    243   
                    )),
  244    244   
                )
  245         -
            } /* JsonParserGenerator.kt:722 */
         245  +
            } /* JsonParserGenerator.kt:704 */
  246    246   
        }
  247         -
        /* JsonParserGenerator.kt:721 */
         247  +
        /* JsonParserGenerator.kt:703 */
  248    248   
    }
  249    249   
    /* JsonParserGenerator.kt:255 */
  250    250   
    if tokens.next().is_some() {
  251    251   
        /* JsonParserGenerator.kt:256 */
  252    252   
        return Err(
  253    253   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  254    254   
                "found more JSON tokens after completing parsing",
  255    255   
            ),
  256    256   
        );
  257    257   
        /* JsonParserGenerator.kt:255 */

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

@@ -132,132 +215,215 @@
  152    152   
    crate::input::malformed_timestamp_body_date_time_input::Builder,
  153    153   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  154    154   
> {
  155    155   
    /* JsonParserGenerator.kt:158 */
  156    156   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  157    157   
        crate::protocol_serde::or_empty_doc(_value),
  158    158   
    )
  159    159   
    .peekable();
  160    160   
    let tokens = &mut tokens_owned;
  161    161   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  162         -
    /* JsonParserGenerator.kt:721 */
         162  +
    /* JsonParserGenerator.kt:703 */
  163    163   
    loop {
  164         -
        /* JsonParserGenerator.kt:722 */
         164  +
        /* JsonParserGenerator.kt:704 */
  165    165   
        match tokens.next().transpose()? {
  166         -
            /* JsonParserGenerator.kt:723 */
         166  +
            /* JsonParserGenerator.kt:705 */
  167    167   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  168    168   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  169    169   
                /* JsonParserGenerator.kt:265 */
  170    170   
                match key.to_unescaped()?.as_ref() {
  171    171   
                    /* JsonParserGenerator.kt:267 */
  172    172   
                    "timestamp" => {
  173    173   
                        /* JsonParserGenerator.kt:281 */
  174    174   
                        if let Some(v) =
  175    175   
                            /* JsonParserGenerator.kt:421 */
  176    176   
                            ::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
  177    177   
                                    tokens.next(),
  178    178   
                                    ::aws_smithy_types::date_time::Format::DateTime,
  179    179   
                                )?
  180    180   
                        /* JsonParserGenerator.kt:283 */
  181    181   
                        {
  182    182   
                            builder = builder.set_timestamp(v);
  183    183   
                        }
  184    184   
                        /* JsonParserGenerator.kt:267 */
  185    185   
                    }
  186    186   
                    /* JsonParserGenerator.kt:295 */
  187    187   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  188    188   
                }
  189         -
                /* JsonParserGenerator.kt:723 */
         189  +
                /* JsonParserGenerator.kt:705 */
  190    190   
            }
  191         -
            /* JsonParserGenerator.kt:732 */
         191  +
            /* JsonParserGenerator.kt:714 */
  192    192   
            other => {
  193    193   
                return Err(
  194    194   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  195    195   
                        "expected object key or end object, found: {other:?}"
  196    196   
                    )),
  197    197   
                )
  198         -
            } /* JsonParserGenerator.kt:722 */
         198  +
            } /* JsonParserGenerator.kt:704 */
  199    199   
        }
  200         -
        /* JsonParserGenerator.kt:721 */
         200  +
        /* JsonParserGenerator.kt:703 */
  201    201   
    }
  202    202   
    /* JsonParserGenerator.kt:255 */
  203    203   
    if tokens.next().is_some() {
  204    204   
        /* JsonParserGenerator.kt:256 */
  205    205   
        return Err(
  206    206   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  207    207   
                "found more JSON tokens after completing parsing",
  208    208   
            ),
  209    209   
        );
  210    210   
        /* JsonParserGenerator.kt:255 */

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

@@ -132,132 +215,215 @@
  152    152   
    crate::input::malformed_timestamp_body_default_input::Builder,
  153    153   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  154    154   
> {
  155    155   
    /* JsonParserGenerator.kt:158 */
  156    156   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  157    157   
        crate::protocol_serde::or_empty_doc(_value),
  158    158   
    )
  159    159   
    .peekable();
  160    160   
    let tokens = &mut tokens_owned;
  161    161   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  162         -
    /* JsonParserGenerator.kt:721 */
         162  +
    /* JsonParserGenerator.kt:703 */
  163    163   
    loop {
  164         -
        /* JsonParserGenerator.kt:722 */
         164  +
        /* JsonParserGenerator.kt:704 */
  165    165   
        match tokens.next().transpose()? {
  166         -
            /* JsonParserGenerator.kt:723 */
         166  +
            /* JsonParserGenerator.kt:705 */
  167    167   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  168    168   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  169    169   
                /* JsonParserGenerator.kt:265 */
  170    170   
                match key.to_unescaped()?.as_ref() {
  171    171   
                    /* JsonParserGenerator.kt:267 */
  172    172   
                    "timestamp" => {
  173    173   
                        /* JsonParserGenerator.kt:281 */
  174    174   
                        if let Some(v) =
  175    175   
                            /* JsonParserGenerator.kt:421 */
  176    176   
                            ::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
  177    177   
                                    tokens.next(),
  178    178   
                                    ::aws_smithy_types::date_time::Format::EpochSeconds,
  179    179   
                                )?
  180    180   
                        /* JsonParserGenerator.kt:283 */
  181    181   
                        {
  182    182   
                            builder = builder.set_timestamp(v);
  183    183   
                        }
  184    184   
                        /* JsonParserGenerator.kt:267 */
  185    185   
                    }
  186    186   
                    /* JsonParserGenerator.kt:295 */
  187    187   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  188    188   
                }
  189         -
                /* JsonParserGenerator.kt:723 */
         189  +
                /* JsonParserGenerator.kt:705 */
  190    190   
            }
  191         -
            /* JsonParserGenerator.kt:732 */
         191  +
            /* JsonParserGenerator.kt:714 */
  192    192   
            other => {
  193    193   
                return Err(
  194    194   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  195    195   
                        "expected object key or end object, found: {other:?}"
  196    196   
                    )),
  197    197   
                )
  198         -
            } /* JsonParserGenerator.kt:722 */
         198  +
            } /* JsonParserGenerator.kt:704 */
  199    199   
        }
  200         -
        /* JsonParserGenerator.kt:721 */
         200  +
        /* JsonParserGenerator.kt:703 */
  201    201   
    }
  202    202   
    /* JsonParserGenerator.kt:255 */
  203    203   
    if tokens.next().is_some() {
  204    204   
        /* JsonParserGenerator.kt:256 */
  205    205   
        return Err(
  206    206   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  207    207   
                "found more JSON tokens after completing parsing",
  208    208   
            ),
  209    209   
        );
  210    210   
        /* JsonParserGenerator.kt:255 */

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

@@ -132,132 +215,215 @@
  152    152   
    crate::input::malformed_timestamp_body_http_date_input::Builder,
  153    153   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  154    154   
> {
  155    155   
    /* JsonParserGenerator.kt:158 */
  156    156   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  157    157   
        crate::protocol_serde::or_empty_doc(_value),
  158    158   
    )
  159    159   
    .peekable();
  160    160   
    let tokens = &mut tokens_owned;
  161    161   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  162         -
    /* JsonParserGenerator.kt:721 */
         162  +
    /* JsonParserGenerator.kt:703 */
  163    163   
    loop {
  164         -
        /* JsonParserGenerator.kt:722 */
         164  +
        /* JsonParserGenerator.kt:704 */
  165    165   
        match tokens.next().transpose()? {
  166         -
            /* JsonParserGenerator.kt:723 */
         166  +
            /* JsonParserGenerator.kt:705 */
  167    167   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  168    168   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  169    169   
                /* JsonParserGenerator.kt:265 */
  170    170   
                match key.to_unescaped()?.as_ref() {
  171    171   
                    /* JsonParserGenerator.kt:267 */
  172    172   
                    "timestamp" => {
  173    173   
                        /* JsonParserGenerator.kt:281 */
  174    174   
                        if let Some(v) =
  175    175   
                            /* JsonParserGenerator.kt:421 */
  176    176   
                            ::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
  177    177   
                                    tokens.next(),
  178    178   
                                    ::aws_smithy_types::date_time::Format::HttpDate,
  179    179   
                                )?
  180    180   
                        /* JsonParserGenerator.kt:283 */
  181    181   
                        {
  182    182   
                            builder = builder.set_timestamp(v);
  183    183   
                        }
  184    184   
                        /* JsonParserGenerator.kt:267 */
  185    185   
                    }
  186    186   
                    /* JsonParserGenerator.kt:295 */
  187    187   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  188    188   
                }
  189         -
                /* JsonParserGenerator.kt:723 */
         189  +
                /* JsonParserGenerator.kt:705 */
  190    190   
            }
  191         -
            /* JsonParserGenerator.kt:732 */
         191  +
            /* JsonParserGenerator.kt:714 */
  192    192   
            other => {
  193    193   
                return Err(
  194    194   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  195    195   
                        "expected object key or end object, found: {other:?}"
  196    196   
                    )),
  197    197   
                )
  198         -
            } /* JsonParserGenerator.kt:722 */
         198  +
            } /* JsonParserGenerator.kt:704 */
  199    199   
        }
  200         -
        /* JsonParserGenerator.kt:721 */
         200  +
        /* JsonParserGenerator.kt:703 */
  201    201   
    }
  202    202   
    /* JsonParserGenerator.kt:255 */
  203    203   
    if tokens.next().is_some() {
  204    204   
        /* JsonParserGenerator.kt:256 */
  205    205   
        return Err(
  206    206   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  207    207   
                "found more JSON tokens after completing parsing",
  208    208   
            ),
  209    209   
        );
  210    210   
        /* JsonParserGenerator.kt:255 */

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

@@ -83,83 +162,162 @@
  103    103   
    crate::input::malformed_union_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   
                    "union" => {
  124    124   
                        /* JsonParserGenerator.kt:277 */
  125    125   
                        builder = builder.set_union(
  126         -
                            /* JsonParserGenerator.kt:697 */
         126  +
                            /* JsonParserGenerator.kt:679 */
  127    127   
                            crate::protocol_serde::shape_simple_union::de_simple_union(
  128    128   
                                tokens, _value,
  129    129   
                            )?, /* JsonParserGenerator.kt:277 */
  130    130   
                        );
  131    131   
                        /* JsonParserGenerator.kt:267 */
  132    132   
                    }
  133    133   
                    /* JsonParserGenerator.kt:295 */
  134    134   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  135    135   
                }
  136         -
                /* JsonParserGenerator.kt:723 */
         136  +
                /* JsonParserGenerator.kt:705 */
  137    137   
            }
  138         -
            /* JsonParserGenerator.kt:732 */
         138  +
            /* JsonParserGenerator.kt:714 */
  139    139   
            other => {
  140    140   
                return Err(
  141    141   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  142    142   
                        "expected object key or end object, found: {other:?}"
  143    143   
                    )),
  144    144   
                )
  145         -
            } /* JsonParserGenerator.kt:722 */
         145  +
            } /* JsonParserGenerator.kt:704 */
  146    146   
        }
  147         -
        /* JsonParserGenerator.kt:721 */
         147  +
        /* JsonParserGenerator.kt:703 */
  148    148   
    }
  149    149   
    /* JsonParserGenerator.kt:255 */
  150    150   
    if tokens.next().is_some() {
  151    151   
        /* JsonParserGenerator.kt:256 */
  152    152   
        return Err(
  153    153   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  154    154   
                "found more JSON tokens after completing parsing",
  155    155   
            ),
  156    156   
        );
  157    157   
        /* JsonParserGenerator.kt:255 */

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

@@ -1,1 +228,228 @@
    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_my_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::unconstrained::my_union_unconstrained::MyUnionUnconstrained>,
    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   
                            "stringValue" => {
   57         -
                                /* JsonParserGenerator.kt:648 */
          57  +
                                /* JsonParserGenerator.kt:630 */
   58     58   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::StringValue(
   59     59   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   60     60   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   61     61   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   62     62   
                                        /* JsonParserGenerator.kt:346 */)
   63     63   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   64         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'stringValue' cannot be null"))?
   65         -
                                /* JsonParserGenerator.kt:648 */))
   66         -
                                /* JsonParserGenerator.kt:638 */
          64  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'stringValue' cannot be null"))?
          65  +
                                /* JsonParserGenerator.kt:630 */))
          66  +
                                /* JsonParserGenerator.kt:620 */
   67     67   
                            }
   68         -
                            /* JsonParserGenerator.kt:638 */
          68  +
                            /* JsonParserGenerator.kt:620 */
   69     69   
                            "booleanValue" => {
   70         -
                                /* JsonParserGenerator.kt:648 */
          70  +
                                /* JsonParserGenerator.kt:630 */
   71     71   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::BooleanValue(
   72     72   
                                    /* JsonParserGenerator.kt:303 */::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?
   73         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'booleanValue' cannot be null"))?
   74         -
                                /* JsonParserGenerator.kt:648 */))
   75         -
                                /* JsonParserGenerator.kt:638 */
          73  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'booleanValue' cannot be null"))?
          74  +
                                /* JsonParserGenerator.kt:630 */))
          75  +
                                /* JsonParserGenerator.kt:620 */
   76     76   
                            }
   77         -
                            /* JsonParserGenerator.kt:638 */
          77  +
                            /* JsonParserGenerator.kt:620 */
   78     78   
                            "numberValue" => {
   79         -
                                /* JsonParserGenerator.kt:648 */
          79  +
                                /* JsonParserGenerator.kt:630 */
   80     80   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::NumberValue(
   81     81   
                                    /* JsonParserGenerator.kt:372 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   82     82   
                                                        .map(i32::try_from)
   83     83   
                                                        .transpose()?
   84         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'numberValue' cannot be null"))?
   85         -
                                /* JsonParserGenerator.kt:648 */))
   86         -
                                /* JsonParserGenerator.kt:638 */
          84  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'numberValue' cannot be null"))?
          85  +
                                /* JsonParserGenerator.kt:630 */))
          86  +
                                /* JsonParserGenerator.kt:620 */
   87     87   
                            }
   88         -
                            /* JsonParserGenerator.kt:638 */
          88  +
                            /* JsonParserGenerator.kt:620 */
   89     89   
                            "blobValue" => {
   90         -
                                /* JsonParserGenerator.kt:648 */
          90  +
                                /* JsonParserGenerator.kt:630 */
   91     91   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::BlobValue(
   92     92   
                                    /* JsonParserGenerator.kt:333 */::aws_smithy_json::deserialize::token::expect_blob_or_null(tokens.next())?
   93         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'blobValue' cannot be null"))?
   94         -
                                /* JsonParserGenerator.kt:648 */))
   95         -
                                /* JsonParserGenerator.kt:638 */
          93  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'blobValue' cannot be null"))?
          94  +
                                /* JsonParserGenerator.kt:630 */))
          95  +
                                /* JsonParserGenerator.kt:620 */
   96     96   
                            }
   97         -
                            /* JsonParserGenerator.kt:638 */
          97  +
                            /* JsonParserGenerator.kt:620 */
   98     98   
                            "timestampValue" => {
   99         -
                                /* JsonParserGenerator.kt:648 */
          99  +
                                /* JsonParserGenerator.kt:630 */
  100    100   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::TimestampValue(
  101    101   
                                    /* JsonParserGenerator.kt:421 */::aws_smithy_json::deserialize::token::expect_timestamp_or_null(tokens.next(), ::aws_smithy_types::date_time::Format::EpochSeconds)?
  102         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'timestampValue' cannot be null"))?
  103         -
                                /* JsonParserGenerator.kt:648 */))
  104         -
                                /* JsonParserGenerator.kt:638 */
         102  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'timestampValue' cannot be null"))?
         103  +
                                /* JsonParserGenerator.kt:630 */))
         104  +
                                /* JsonParserGenerator.kt:620 */
  105    105   
                            }
  106         -
                            /* JsonParserGenerator.kt:638 */
         106  +
                            /* JsonParserGenerator.kt:620 */
  107    107   
                            "enumValue" => {
  108         -
                                /* JsonParserGenerator.kt:648 */
         108  +
                                /* JsonParserGenerator.kt:630 */
  109    109   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::EnumValue(
  110    110   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
  111    111   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
  112    112   
                                            /* JsonParserGenerator.kt:350 */u.into_owned()
  113    113   
                                        /* JsonParserGenerator.kt:346 */)
  114    114   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
  115         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'enumValue' cannot be null"))?
  116         -
                                /* JsonParserGenerator.kt:648 */))
  117         -
                                /* JsonParserGenerator.kt:638 */
         115  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'enumValue' cannot be null"))?
         116  +
                                /* JsonParserGenerator.kt:630 */))
         117  +
                                /* JsonParserGenerator.kt:620 */
  118    118   
                            }
  119         -
                            /* JsonParserGenerator.kt:638 */
         119  +
                            /* JsonParserGenerator.kt:620 */
  120    120   
                            "listValue" => {
  121         -
                                /* JsonParserGenerator.kt:648 */
         121  +
                                /* JsonParserGenerator.kt:630 */
  122    122   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::ListValue(
  123         -
                                    /* JsonParserGenerator.kt:488 */crate::protocol_serde::shape_string_list::de_string_list(tokens, _value)?
  124         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'listValue' cannot be null"))?
  125         -
                                /* JsonParserGenerator.kt:648 */))
  126         -
                                /* JsonParserGenerator.kt:638 */
         123  +
                                    /* JsonParserGenerator.kt:481 */crate::protocol_serde::shape_string_list::de_string_list(tokens, _value)?
         124  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'listValue' cannot be null"))?
         125  +
                                /* JsonParserGenerator.kt:630 */))
         126  +
                                /* JsonParserGenerator.kt:620 */
  127    127   
                            }
  128         -
                            /* JsonParserGenerator.kt:638 */
         128  +
                            /* JsonParserGenerator.kt:620 */
  129    129   
                            "mapValue" => {
  130         -
                                /* JsonParserGenerator.kt:648 */
         130  +
                                /* JsonParserGenerator.kt:630 */
  131    131   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::MapValue(
  132         -
                                    /* JsonParserGenerator.kt:546 */crate::protocol_serde::shape_string_map::de_string_map(tokens, _value)?
  133         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'mapValue' cannot be null"))?
  134         -
                                /* JsonParserGenerator.kt:648 */))
  135         -
                                /* JsonParserGenerator.kt:638 */
         132  +
                                    /* JsonParserGenerator.kt:528 */crate::protocol_serde::shape_string_map::de_string_map(tokens, _value)?
         133  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'mapValue' cannot be null"))?
         134  +
                                /* JsonParserGenerator.kt:630 */))
         135  +
                                /* JsonParserGenerator.kt:620 */
  136    136   
                            }
  137         -
                            /* JsonParserGenerator.kt:638 */
         137  +
                            /* JsonParserGenerator.kt:620 */
  138    138   
                            "structureValue" => {
  139         -
                                /* JsonParserGenerator.kt:648 */
         139  +
                                /* JsonParserGenerator.kt:630 */
  140    140   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::StructureValue(
  141         -
                                    /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_greeting_struct::de_greeting_struct(tokens, _value)?
  142         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'structureValue' cannot be null"))?
  143         -
                                /* JsonParserGenerator.kt:648 */))
  144         -
                                /* JsonParserGenerator.kt:638 */
         141  +
                                    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_greeting_struct::de_greeting_struct(tokens, _value)?
         142  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'structureValue' cannot be null"))?
         143  +
                                /* JsonParserGenerator.kt:630 */))
         144  +
                                /* JsonParserGenerator.kt:620 */
  145    145   
                            }
  146         -
                            /* JsonParserGenerator.kt:638 */
         146  +
                            /* JsonParserGenerator.kt:620 */
  147    147   
                            "renamedStructureValue" => {
  148         -
                                /* JsonParserGenerator.kt:648 */
         148  +
                                /* JsonParserGenerator.kt:630 */
  149    149   
                                Some(crate::unconstrained::my_union_unconstrained::MyUnionUnconstrained::RenamedStructureValue(
  150         -
                                    /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_renamed_greeting::de_renamed_greeting(tokens, _value)?
  151         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'renamedStructureValue' cannot be null"))?
  152         -
                                /* JsonParserGenerator.kt:648 */))
  153         -
                                /* JsonParserGenerator.kt:638 */
         150  +
                                    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_renamed_greeting::de_renamed_greeting(tokens, _value)?
         151  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'renamedStructureValue' cannot be null"))?
         152  +
                                /* JsonParserGenerator.kt:630 */))
         153  +
                                /* JsonParserGenerator.kt:620 */
  154    154   
                            }
  155         -
                            /* JsonParserGenerator.kt:671 */
         155  +
                            /* JsonParserGenerator.kt:653 */
  156    156   
                            variant => {
  157    157   
                                return Err(
  158    158   
                                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  159    159   
                                        format!("unexpected union variant: {variant}"),
  160    160   
                                    ),
  161    161   
                                )
  162         -
                            } /* JsonParserGenerator.kt:635 */
         162  +
                            } /* JsonParserGenerator.kt:617 */
  163    163   
                        };
  164         -
                        /* JsonParserGenerator.kt:723 */
         164  +
                        /* JsonParserGenerator.kt:705 */
  165    165   
                    }
  166         -
                    /* JsonParserGenerator.kt:732 */
         166  +
                    /* JsonParserGenerator.kt:714 */
  167    167   
                    other => {
  168    168   
                        return Err(
  169    169   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  170    170   
                                format!("expected object key or end object, found: {other:?}"),
  171    171   
                            ),
  172    172   
                        )
  173         -
                    } /* JsonParserGenerator.kt:722 */
         173  +
                    } /* JsonParserGenerator.kt:704 */
  174    174   
                }
  175         -
                /* JsonParserGenerator.kt:721 */
         175  +
                /* JsonParserGenerator.kt:703 */
  176    176   
            }
  177         -
            /* JsonParserGenerator.kt:605 */
         177  +
            /* JsonParserGenerator.kt:587 */
  178    178   
        }
  179         -
        /* JsonParserGenerator.kt:679 */
         179  +
        /* JsonParserGenerator.kt:661 */
  180    180   
        _ => {
  181    181   
            return Err(
  182    182   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  183    183   
                    "expected start object or null",
  184    184   
                ),
  185    185   
            )
  186         -
        } /* JsonParserGenerator.kt:604 */
         186  +
        } /* JsonParserGenerator.kt:586 */
  187    187   
    }
  188         -
    /* JsonParserGenerator.kt:686 */
         188  +
    /* JsonParserGenerator.kt:668 */
  189    189   
    if variant.is_none() {
  190    190   
        return Err(
  191    191   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  192    192   
                "Union did not contain a valid variant.",
  193    193   
            ),
  194    194   
        );
  195    195   
    }
  196         -
    /* JsonParserGenerator.kt:694 */
         196  +
    /* JsonParserGenerator.kt:676 */
  197    197   
    Ok(variant)
  198         -
    /* JsonParserGenerator.kt:588 */
         198  +
    /* JsonParserGenerator.kt:570 */
  199    199   
}
  200    200   
  201    201   
/* JsonSerializerGenerator.kt:559 */
  202    202   
pub fn ser_my_union(
  203    203   
    object_2: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
  204    204   
    input: &crate::model::MyUnion,
  205    205   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
  206    206   
    /* JsonSerializerGenerator.kt:568 */
  207    207   
    match input {
  208    208   
        /* JsonSerializerGenerator.kt:576 */

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

@@ -1,1 +146,146 @@
    7      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    8      8   
> {
    9      9   
    /* JsonParserGenerator.kt:192 */
   10     10   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
   11     11   
        crate::protocol_serde::or_empty_doc(_value),
   12     12   
    )
   13     13   
    .peekable();
   14     14   
    let tokens = &mut tokens_owned;
   15     15   
    /* JsonParserGenerator.kt:199 */
   16     16   
    let result =
   17         -
    /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_nested_payload::de_nested_payload(tokens, _value)?
          17  +
    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_nested_payload::de_nested_payload(tokens, _value)?
   18     18   
    /* JsonParserGenerator.kt:201 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("expected payload member value"));
   19     19   
    /* JsonParserGenerator.kt:255 */
   20     20   
    if tokens.next().is_some() {
   21     21   
        /* JsonParserGenerator.kt:256 */
   22     22   
        return Err(
   23     23   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   24     24   
                "found more JSON tokens after completing parsing",
   25     25   
            ),
   26     26   
        );
   27     27   
        /* JsonParserGenerator.kt:255 */
   28     28   
    }
   29     29   
    /* JsonParserGenerator.kt:203 */
   30     30   
    result
   31     31   
    /* JsonParserGenerator.kt:180 */
   32     32   
}
   33     33   
   34     34   
/* JsonSerializerGenerator.kt:360 */
   35     35   
pub fn ser_nested_payload(
   36     36   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   37     37   
    input: &crate::model::NestedPayload,
   38     38   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
   39     39   
    /* JsonSerializerGenerator.kt:384 */
   40     40   
    if let Some(var_1) = &input.greeting {
   41     41   
        /* JsonSerializerGenerator.kt:425 */
   42     42   
        object.key("greeting").string(var_1.as_str());
   43     43   
        /* JsonSerializerGenerator.kt:384 */
   44     44   
    }
   45     45   
    /* JsonSerializerGenerator.kt:384 */
   46     46   
    if let Some(var_2) = &input.name {
   47     47   
        /* JsonSerializerGenerator.kt:425 */
   48     48   
        object.key("name").string(var_2.as_str());
   49     49   
        /* JsonSerializerGenerator.kt:384 */
   50     50   
    }
   51     51   
    /* JsonSerializerGenerator.kt:374 */
   52     52   
    Ok(())
   53     53   
    /* JsonSerializerGenerator.kt:360 */
   54     54   
}
   55     55   
   56         -
/* JsonParserGenerator.kt:553 */
          56  +
/* JsonParserGenerator.kt:535 */
   57     57   
pub(crate) fn de_nested_payload<'a, I>(
   58     58   
    tokens: &mut ::std::iter::Peekable<I>,
   59     59   
    _value: &'a [u8],
   60     60   
) -> ::std::result::Result<
   61     61   
    Option<crate::model::NestedPayload>,
   62     62   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   63     63   
>
   64     64   
where
   65     65   
    I: Iterator<
   66     66   
        Item = Result<
   67     67   
            ::aws_smithy_json::deserialize::Token<'a>,
   68     68   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   69     69   
        >,
   70     70   
    >,
   71     71   
{
   72         -
    /* JsonParserGenerator.kt:749 */
          72  +
    /* JsonParserGenerator.kt:731 */
   73     73   
    match tokens.next().transpose()? {
   74         -
        /* JsonParserGenerator.kt:750 */
          74  +
        /* JsonParserGenerator.kt:732 */
   75     75   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   76     76   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   77     77   
            /* RustType.kt:534 */
   78     78   
            #[allow(unused_mut)]
   79         -
            /* JsonParserGenerator.kt:563 */
          79  +
            /* JsonParserGenerator.kt:545 */
   80     80   
            let mut builder = crate::model::nested_payload::Builder::default();
   81         -
            /* JsonParserGenerator.kt:721 */
          81  +
            /* JsonParserGenerator.kt:703 */
   82     82   
            loop {
   83         -
                /* JsonParserGenerator.kt:722 */
          83  +
                /* JsonParserGenerator.kt:704 */
   84     84   
                match tokens.next().transpose()? {
   85         -
                    /* JsonParserGenerator.kt:723 */
          85  +
                    /* JsonParserGenerator.kt:705 */
   86     86   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   87     87   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   88     88   
                        /* JsonParserGenerator.kt:265 */
   89     89   
                        match key.to_unescaped()?.as_ref() {
   90     90   
                            /* JsonParserGenerator.kt:267 */
   91     91   
                            "greeting" => {
   92     92   
                                /* JsonParserGenerator.kt:277 */
   93     93   
                                builder = builder.set_greeting(
   94     94   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   95     95   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   96     96   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   97     97   
                                        /* JsonParserGenerator.kt:346 */)
   98     98   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   99     99   
                                /* JsonParserGenerator.kt:277 */);
  100    100   
                                /* JsonParserGenerator.kt:267 */
  101    101   
                            }
  102    102   
                            /* JsonParserGenerator.kt:267 */
  103    103   
                            "name" => {
  104    104   
                                /* JsonParserGenerator.kt:277 */
  105    105   
                                builder = builder.set_name(
  106    106   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
  107    107   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
  108    108   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
  109    109   
                                        /* JsonParserGenerator.kt:346 */)
  110    110   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
  111    111   
                                /* JsonParserGenerator.kt:277 */);
  112    112   
                                /* JsonParserGenerator.kt:267 */
  113    113   
                            }
  114    114   
                            /* JsonParserGenerator.kt:295 */
  115    115   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  116    116   
                        }
  117         -
                        /* JsonParserGenerator.kt:723 */
         117  +
                        /* JsonParserGenerator.kt:705 */
  118    118   
                    }
  119         -
                    /* JsonParserGenerator.kt:732 */
         119  +
                    /* JsonParserGenerator.kt:714 */
  120    120   
                    other => {
  121    121   
                        return Err(
  122    122   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  123    123   
                                format!("expected object key or end object, found: {other:?}"),
  124    124   
                            ),
  125    125   
                        )
  126         -
                    } /* JsonParserGenerator.kt:722 */
         126  +
                    } /* JsonParserGenerator.kt:704 */
  127    127   
                }
  128         -
                /* JsonParserGenerator.kt:721 */
         128  +
                /* JsonParserGenerator.kt:703 */
  129    129   
            }
  130         -
            /* JsonParserGenerator.kt:577 */
         130  +
            /* JsonParserGenerator.kt:559 */
  131    131   
            Ok(Some(builder.build()))
  132         -
            /* JsonParserGenerator.kt:750 */
         132  +
            /* JsonParserGenerator.kt:732 */
  133    133   
        }
  134         -
        /* JsonParserGenerator.kt:759 */
         134  +
        /* JsonParserGenerator.kt:741 */
  135    135   
        _ => {
  136         -
            /* JsonParserGenerator.kt:760 */
         136  +
            /* JsonParserGenerator.kt:742 */
  137    137   
            Err(
  138    138   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  139    139   
                    "expected start object or null",
  140    140   
                ),
  141    141   
            )
  142         -
            /* JsonParserGenerator.kt:759 */
  143         -
        } /* JsonParserGenerator.kt:749 */
         142  +
            /* JsonParserGenerator.kt:741 */
         143  +
        } /* JsonParserGenerator.kt:731 */
  144    144   
    }
  145         -
    /* JsonParserGenerator.kt:553 */
         145  +
    /* JsonParserGenerator.kt:535 */
  146    146   
}

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

@@ -1,1 +75,73 @@
    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         -
                            /* JsonParserGenerator.kt:488 */crate::protocol_serde::shape_string_list::de_string_list(tokens, _value)?
          40  +
                            /* JsonParserGenerator.kt:481 */crate::protocol_serde::shape_string_list::de_string_list(tokens, _value)?
   41     41   
                        /* JsonParserGenerator.kt:456 */;
   42     42   
                        /* JsonParserGenerator.kt:459 */
   43     43   
                        if let Some(value) = value {
   44     44   
                            items.push(value);
   45         -
                        }
   46         -
                        /* JsonParserGenerator.kt:467 */
   47         -
                        else {
          45  +
                        } else {
   48     46   
                            return Err(
   49     47   
                                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   50     48   
                                    "dense list cannot contain null values",
   51     49   
                                ),
   52     50   
                            );
   53     51   
                        }
   54     52   
                        /* JsonParserGenerator.kt:450 */
   55     53   
                    } /* JsonParserGenerator.kt:446 */
   56     54   
                }
   57     55   
                /* JsonParserGenerator.kt:445 */
   58     56   
            }
   59         -
            /* JsonParserGenerator.kt:483 */
          57  +
            /* JsonParserGenerator.kt:476 */
   60     58   
            Ok(Some(items))
   61         -
            /* JsonParserGenerator.kt:750 */
          59  +
            /* JsonParserGenerator.kt:732 */
   62     60   
        }
   63         -
        /* JsonParserGenerator.kt:759 */
          61  +
        /* JsonParserGenerator.kt:741 */
   64     62   
        _ => {
   65         -
            /* JsonParserGenerator.kt:760 */
          63  +
            /* JsonParserGenerator.kt:742 */
   66     64   
            Err(
   67     65   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   68     66   
                    "expected start array or null",
   69     67   
                ),
   70     68   
            )
   71         -
            /* JsonParserGenerator.kt:759 */
   72         -
        } /* JsonParserGenerator.kt:749 */
          69  +
            /* JsonParserGenerator.kt:741 */
          70  +
        } /* JsonParserGenerator.kt:731 */
   73     71   
    }
   74     72   
    /* JsonParserGenerator.kt:435 */
   75     73   
}

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

@@ -136,136 +255,255 @@
  156    156   
    crate::input::operation_with_defaults_input::Builder,
  157    157   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  158    158   
> {
  159    159   
    /* JsonParserGenerator.kt:158 */
  160    160   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  161    161   
        crate::protocol_serde::or_empty_doc(_value),
  162    162   
    )
  163    163   
    .peekable();
  164    164   
    let tokens = &mut tokens_owned;
  165    165   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  166         -
    /* JsonParserGenerator.kt:721 */
         166  +
    /* JsonParserGenerator.kt:703 */
  167    167   
    loop {
  168         -
        /* JsonParserGenerator.kt:722 */
         168  +
        /* JsonParserGenerator.kt:704 */
  169    169   
        match tokens.next().transpose()? {
  170         -
            /* JsonParserGenerator.kt:723 */
         170  +
            /* JsonParserGenerator.kt:705 */
  171    171   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  172    172   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  173    173   
                /* JsonParserGenerator.kt:265 */
  174    174   
                match key.to_unescaped()?.as_ref() {
  175    175   
                    /* JsonParserGenerator.kt:267 */
  176    176   
                    "clientOptionalDefaults" => {
  177    177   
                        /* JsonParserGenerator.kt:277 */
  178    178   
                        builder = builder.set_client_optional_defaults(
  179         -
                            /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_client_optional_defaults::de_client_optional_defaults(tokens, _value)?
         179  +
                            /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_client_optional_defaults::de_client_optional_defaults(tokens, _value)?
  180    180   
                        /* JsonParserGenerator.kt:277 */);
  181    181   
                        /* JsonParserGenerator.kt:267 */
  182    182   
                    }
  183    183   
                    /* JsonParserGenerator.kt:267 */
  184    184   
                    "defaults" => {
  185    185   
                        /* JsonParserGenerator.kt:277 */
  186    186   
                        builder = builder.set_defaults(
  187         -
                            /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_defaults::de_defaults(tokens, _value)?
         187  +
                            /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_defaults::de_defaults(tokens, _value)?
  188    188   
                        /* JsonParserGenerator.kt:277 */);
  189    189   
                        /* JsonParserGenerator.kt:267 */
  190    190   
                    }
  191    191   
                    /* JsonParserGenerator.kt:267 */
  192    192   
                    "otherTopLevelDefault" => {
  193    193   
                        /* JsonParserGenerator.kt:281 */
  194    194   
                        if let Some(v) =
  195    195   
                            /* JsonParserGenerator.kt:372 */
  196    196   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(
  197    197   
                                    tokens.next(),
  198    198   
                                )?
  199    199   
                                .map(i32::try_from)
  200    200   
                                .transpose()?
  201    201   
                        /* JsonParserGenerator.kt:283 */
  202    202   
                        {
  203    203   
                            builder = builder.set_other_top_level_default(v);
  204    204   
                        }
  205    205   
                        /* JsonParserGenerator.kt:267 */
  206    206   
                    }
  207    207   
                    /* JsonParserGenerator.kt:267 */
  208    208   
                    "topLevelDefault" => {
  209    209   
                        /* JsonParserGenerator.kt:281 */
  210    210   
                        if let Some(v) =
  211    211   
                            /* JsonParserGenerator.kt:361 */
  212    212   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(
  213    213   
                                    tokens.next(),
  214    214   
                                )?
  215    215   
                                .map(|s|
  216    216   
                            /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
  217    217   
                                /* JsonParserGenerator.kt:355 */u.into_owned()
  218    218   
                            /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
  219    219   
                                .transpose()?
  220    220   
                        /* JsonParserGenerator.kt:283 */
  221    221   
                        {
  222    222   
                            builder = builder.set_top_level_default(v);
  223    223   
                        }
  224    224   
                        /* JsonParserGenerator.kt:267 */
  225    225   
                    }
  226    226   
                    /* JsonParserGenerator.kt:295 */
  227    227   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  228    228   
                }
  229         -
                /* JsonParserGenerator.kt:723 */
         229  +
                /* JsonParserGenerator.kt:705 */
  230    230   
            }
  231         -
            /* JsonParserGenerator.kt:732 */
         231  +
            /* JsonParserGenerator.kt:714 */
  232    232   
            other => {
  233    233   
                return Err(
  234    234   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  235    235   
                        "expected object key or end object, found: {other:?}"
  236    236   
                    )),
  237    237   
                )
  238         -
            } /* JsonParserGenerator.kt:722 */
         238  +
            } /* JsonParserGenerator.kt:704 */
  239    239   
        }
  240         -
        /* JsonParserGenerator.kt:721 */
         240  +
        /* JsonParserGenerator.kt:703 */
  241    241   
    }
  242    242   
    /* JsonParserGenerator.kt:255 */
  243    243   
    if tokens.next().is_some() {
  244    244   
        /* JsonParserGenerator.kt:256 */
  245    245   
        return Err(
  246    246   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  247    247   
                "found more JSON tokens after completing parsing",
  248    248   
            ),
  249    249   
        );
  250    250   
        /* JsonParserGenerator.kt:255 */

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

@@ -132,132 +214,214 @@
  152    152   
    crate::input::operation_with_nested_structure_input::Builder,
  153    153   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  154    154   
> {
  155    155   
    /* JsonParserGenerator.kt:158 */
  156    156   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  157    157   
        crate::protocol_serde::or_empty_doc(_value),
  158    158   
    )
  159    159   
    .peekable();
  160    160   
    let tokens = &mut tokens_owned;
  161    161   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  162         -
    /* JsonParserGenerator.kt:721 */
         162  +
    /* JsonParserGenerator.kt:703 */
  163    163   
    loop {
  164         -
        /* JsonParserGenerator.kt:722 */
         164  +
        /* JsonParserGenerator.kt:704 */
  165    165   
        match tokens.next().transpose()? {
  166         -
            /* JsonParserGenerator.kt:723 */
         166  +
            /* JsonParserGenerator.kt:705 */
  167    167   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  168    168   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  169    169   
                /* JsonParserGenerator.kt:265 */
  170    170   
                match key.to_unescaped()?.as_ref() {
  171    171   
                    /* JsonParserGenerator.kt:267 */
  172    172   
                    "topLevel" => {
  173    173   
                        /* JsonParserGenerator.kt:281 */
  174    174   
                        if let Some(v) =
  175         -
                            /* JsonParserGenerator.kt:581 */
         175  +
                            /* JsonParserGenerator.kt:563 */
  176    176   
                            crate::protocol_serde::shape_top_level::de_top_level(
  177    177   
                                tokens, _value,
  178    178   
                            )?
  179    179   
                        /* JsonParserGenerator.kt:283 */
  180    180   
                        {
  181    181   
                            builder = builder.set_top_level(v);
  182    182   
                        }
  183    183   
                        /* JsonParserGenerator.kt:267 */
  184    184   
                    }
  185    185   
                    /* JsonParserGenerator.kt:295 */
  186    186   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  187    187   
                }
  188         -
                /* JsonParserGenerator.kt:723 */
         188  +
                /* JsonParserGenerator.kt:705 */
  189    189   
            }
  190         -
            /* JsonParserGenerator.kt:732 */
         190  +
            /* JsonParserGenerator.kt:714 */
  191    191   
            other => {
  192    192   
                return Err(
  193    193   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  194    194   
                        "expected object key or end object, found: {other:?}"
  195    195   
                    )),
  196    196   
                )
  197         -
            } /* JsonParserGenerator.kt:722 */
         197  +
            } /* JsonParserGenerator.kt:704 */
  198    198   
        }
  199         -
        /* JsonParserGenerator.kt:721 */
         199  +
        /* JsonParserGenerator.kt:703 */
  200    200   
    }
  201    201   
    /* JsonParserGenerator.kt:255 */
  202    202   
    if tokens.next().is_some() {
  203    203   
        /* JsonParserGenerator.kt:256 */
  204    204   
        return Err(
  205    205   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  206    206   
                "found more JSON tokens after completing parsing",
  207    207   
            ),
  208    208   
        );
  209    209   
        /* JsonParserGenerator.kt:255 */

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

@@ -1,1 +132,132 @@
    7      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    8      8   
> {
    9      9   
    /* JsonParserGenerator.kt:192 */
   10     10   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
   11     11   
        crate::protocol_serde::or_empty_doc(_value),
   12     12   
    )
   13     13   
    .peekable();
   14     14   
    let tokens = &mut tokens_owned;
   15     15   
    /* JsonParserGenerator.kt:199 */
   16     16   
    let result =
   17         -
    /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_payload_config::de_payload_config(tokens, _value)?
          17  +
    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_payload_config::de_payload_config(tokens, _value)?
   18     18   
    /* JsonParserGenerator.kt:201 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("expected payload member value"));
   19     19   
    /* JsonParserGenerator.kt:255 */
   20     20   
    if tokens.next().is_some() {
   21     21   
        /* JsonParserGenerator.kt:256 */
   22     22   
        return Err(
   23     23   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   24     24   
                "found more JSON tokens after completing parsing",
   25     25   
            ),
   26     26   
        );
   27     27   
        /* JsonParserGenerator.kt:255 */
   28     28   
    }
   29     29   
    /* JsonParserGenerator.kt:203 */
   30     30   
    result
   31     31   
    /* JsonParserGenerator.kt:180 */
   32     32   
}
   33     33   
   34         -
/* JsonParserGenerator.kt:553 */
          34  +
/* JsonParserGenerator.kt:535 */
   35     35   
pub(crate) fn de_payload_config<'a, I>(
   36     36   
    tokens: &mut ::std::iter::Peekable<I>,
   37     37   
    _value: &'a [u8],
   38     38   
) -> ::std::result::Result<
   39     39   
    Option<crate::model::PayloadConfig>,
   40     40   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   41     41   
>
   42     42   
where
   43     43   
    I: Iterator<
   44     44   
        Item = Result<
   45     45   
            ::aws_smithy_json::deserialize::Token<'a>,
   46     46   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   47     47   
        >,
   48     48   
    >,
   49     49   
{
   50         -
    /* JsonParserGenerator.kt:749 */
          50  +
    /* JsonParserGenerator.kt:731 */
   51     51   
    match tokens.next().transpose()? {
   52         -
        /* JsonParserGenerator.kt:750 */
          52  +
        /* JsonParserGenerator.kt:732 */
   53     53   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   54     54   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   55     55   
            /* RustType.kt:534 */
   56     56   
            #[allow(unused_mut)]
   57         -
            /* JsonParserGenerator.kt:563 */
          57  +
            /* JsonParserGenerator.kt:545 */
   58     58   
            let mut builder = crate::model::payload_config::Builder::default();
   59         -
            /* JsonParserGenerator.kt:721 */
          59  +
            /* JsonParserGenerator.kt:703 */
   60     60   
            loop {
   61         -
                /* JsonParserGenerator.kt:722 */
          61  +
                /* JsonParserGenerator.kt:704 */
   62     62   
                match tokens.next().transpose()? {
   63         -
                    /* JsonParserGenerator.kt:723 */
          63  +
                    /* JsonParserGenerator.kt:705 */
   64     64   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   65     65   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   66     66   
                        /* JsonParserGenerator.kt:265 */
   67     67   
                        match key.to_unescaped()?.as_ref() {
   68     68   
                            /* JsonParserGenerator.kt:267 */
   69     69   
                            "data" => {
   70     70   
                                /* JsonParserGenerator.kt:277 */
   71     71   
                                builder = builder.set_data(
   72     72   
                                    /* JsonParserGenerator.kt:372 */
   73     73   
                                    ::aws_smithy_json::deserialize::token::expect_number_or_null(
   74     74   
                                        tokens.next(),
   75     75   
                                    )?
   76     76   
                                    .map(i32::try_from)
   77     77   
                                    .transpose()?, /* JsonParserGenerator.kt:277 */
   78     78   
                                );
   79     79   
                                /* JsonParserGenerator.kt:267 */
   80     80   
                            }
   81     81   
                            /* JsonParserGenerator.kt:295 */
   82     82   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   83     83   
                        }
   84         -
                        /* JsonParserGenerator.kt:723 */
          84  +
                        /* JsonParserGenerator.kt:705 */
   85     85   
                    }
   86         -
                    /* JsonParserGenerator.kt:732 */
          86  +
                    /* JsonParserGenerator.kt:714 */
   87     87   
                    other => {
   88     88   
                        return Err(
   89     89   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   90     90   
                                format!("expected object key or end object, found: {other:?}"),
   91     91   
                            ),
   92     92   
                        )
   93         -
                    } /* JsonParserGenerator.kt:722 */
          93  +
                    } /* JsonParserGenerator.kt:704 */
   94     94   
                }
   95         -
                /* JsonParserGenerator.kt:721 */
          95  +
                /* JsonParserGenerator.kt:703 */
   96     96   
            }
   97         -
            /* JsonParserGenerator.kt:577 */
          97  +
            /* JsonParserGenerator.kt:559 */
   98     98   
            Ok(Some(builder.build()))
   99         -
            /* JsonParserGenerator.kt:750 */
          99  +
            /* JsonParserGenerator.kt:732 */
  100    100   
        }
  101         -
        /* JsonParserGenerator.kt:759 */
         101  +
        /* JsonParserGenerator.kt:741 */
  102    102   
        _ => {
  103         -
            /* JsonParserGenerator.kt:760 */
         103  +
            /* JsonParserGenerator.kt:742 */
  104    104   
            Err(
  105    105   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  106    106   
                    "expected start object or null",
  107    107   
                ),
  108    108   
            )
  109         -
            /* JsonParserGenerator.kt:759 */
  110         -
        } /* JsonParserGenerator.kt:749 */
         109  +
            /* JsonParserGenerator.kt:741 */
         110  +
        } /* JsonParserGenerator.kt:731 */
  111    111   
    }
  112         -
    /* JsonParserGenerator.kt:553 */
         112  +
    /* JsonParserGenerator.kt:535 */
  113    113   
}
  114    114   
  115    115   
/* JsonSerializerGenerator.kt:360 */
  116    116   
pub fn ser_payload_config(
  117    117   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
  118    118   
    input: &crate::model::PayloadConfig,
  119    119   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
  120    120   
    /* JsonSerializerGenerator.kt:384 */
  121    121   
    if let Some(var_1) = &input.data {
  122    122   
        /* JsonSerializerGenerator.kt:444 */

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

@@ -1,1 +128,128 @@
    7      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    8      8   
> {
    9      9   
    /* JsonParserGenerator.kt:192 */
   10     10   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
   11     11   
        crate::protocol_serde::or_empty_doc(_value),
   12     12   
    )
   13     13   
    .peekable();
   14     14   
    let tokens = &mut tokens_owned;
   15     15   
    /* JsonParserGenerator.kt:199 */
   16     16   
    let result =
   17         -
    /* JsonParserGenerator.kt:581 */crate::protocol_serde::shape_payload_structure::de_payload_structure(tokens, _value)?
          17  +
    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_payload_structure::de_payload_structure(tokens, _value)?
   18     18   
    /* JsonParserGenerator.kt:201 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("expected payload member value"));
   19     19   
    /* JsonParserGenerator.kt:255 */
   20     20   
    if tokens.next().is_some() {
   21     21   
        /* JsonParserGenerator.kt:256 */
   22     22   
        return Err(
   23     23   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   24     24   
                "found more JSON tokens after completing parsing",
   25     25   
            ),
   26     26   
        );
   27     27   
        /* JsonParserGenerator.kt:255 */
   28     28   
    }
   29     29   
    /* JsonParserGenerator.kt:203 */
   30     30   
    result
   31     31   
    /* JsonParserGenerator.kt:180 */
   32     32   
}
   33     33   
   34     34   
/* JsonSerializerGenerator.kt:360 */
   35     35   
pub fn ser_payload_structure(
   36     36   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   37     37   
    input: &crate::model::PayloadStructure,
   38     38   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
   39     39   
    /* JsonSerializerGenerator.kt:384 */
   40     40   
    if let Some(var_1) = &input.structure_member {
   41     41   
        /* JsonSerializerGenerator.kt:425 */
   42     42   
        object.key("structureMember").string(var_1.as_str());
   43     43   
        /* JsonSerializerGenerator.kt:384 */
   44     44   
    }
   45     45   
    /* JsonSerializerGenerator.kt:374 */
   46     46   
    Ok(())
   47     47   
    /* JsonSerializerGenerator.kt:360 */
   48     48   
}
   49     49   
   50         -
/* JsonParserGenerator.kt:553 */
          50  +
/* JsonParserGenerator.kt:535 */
   51     51   
pub(crate) fn de_payload_structure<'a, I>(
   52     52   
    tokens: &mut ::std::iter::Peekable<I>,
   53     53   
    _value: &'a [u8],
   54     54   
) -> ::std::result::Result<
   55     55   
    Option<crate::model::PayloadStructure>,
   56     56   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   57     57   
>
   58     58   
where
   59     59   
    I: Iterator<
   60     60   
        Item = Result<
   61     61   
            ::aws_smithy_json::deserialize::Token<'a>,
   62     62   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   63     63   
        >,
   64     64   
    >,
   65     65   
{
   66         -
    /* JsonParserGenerator.kt:749 */
          66  +
    /* JsonParserGenerator.kt:731 */
   67     67   
    match tokens.next().transpose()? {
   68         -
        /* JsonParserGenerator.kt:750 */
          68  +
        /* JsonParserGenerator.kt:732 */
   69     69   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   70     70   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   71     71   
            /* RustType.kt:534 */
   72     72   
            #[allow(unused_mut)]
   73         -
            /* JsonParserGenerator.kt:563 */
          73  +
            /* JsonParserGenerator.kt:545 */
   74     74   
            let mut builder = crate::model::payload_structure::Builder::default();
   75         -
            /* JsonParserGenerator.kt:721 */
          75  +
            /* JsonParserGenerator.kt:703 */
   76     76   
            loop {
   77         -
                /* JsonParserGenerator.kt:722 */
          77  +
                /* JsonParserGenerator.kt:704 */
   78     78   
                match tokens.next().transpose()? {
   79         -
                    /* JsonParserGenerator.kt:723 */
          79  +
                    /* JsonParserGenerator.kt:705 */
   80     80   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   81     81   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   82     82   
                        /* JsonParserGenerator.kt:265 */
   83     83   
                        match key.to_unescaped()?.as_ref() {
   84     84   
                            /* JsonParserGenerator.kt:267 */
   85     85   
                            "structureMember" => {
   86     86   
                                /* JsonParserGenerator.kt:277 */
   87     87   
                                builder = builder.set_structure_member(
   88     88   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   89     89   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   90     90   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   91     91   
                                        /* JsonParserGenerator.kt:346 */)
   92     92   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   93     93   
                                /* JsonParserGenerator.kt:277 */);
   94     94   
                                /* JsonParserGenerator.kt:267 */
   95     95   
                            }
   96     96   
                            /* JsonParserGenerator.kt:295 */
   97     97   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   98     98   
                        }
   99         -
                        /* JsonParserGenerator.kt:723 */
          99  +
                        /* JsonParserGenerator.kt:705 */
  100    100   
                    }
  101         -
                    /* JsonParserGenerator.kt:732 */
         101  +
                    /* JsonParserGenerator.kt:714 */
  102    102   
                    other => {
  103    103   
                        return Err(
  104    104   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  105    105   
                                format!("expected object key or end object, found: {other:?}"),
  106    106   
                            ),
  107    107   
                        )
  108         -
                    } /* JsonParserGenerator.kt:722 */
         108  +
                    } /* JsonParserGenerator.kt:704 */
  109    109   
                }
  110         -
                /* JsonParserGenerator.kt:721 */
         110  +
                /* JsonParserGenerator.kt:703 */
  111    111   
            }
  112         -
            /* JsonParserGenerator.kt:577 */
         112  +
            /* JsonParserGenerator.kt:559 */
  113    113   
            Ok(Some(builder.build()))
  114         -
            /* JsonParserGenerator.kt:750 */
         114  +
            /* JsonParserGenerator.kt:732 */
  115    115   
        }
  116         -
        /* JsonParserGenerator.kt:759 */
         116  +
        /* JsonParserGenerator.kt:741 */
  117    117   
        _ => {
  118         -
            /* JsonParserGenerator.kt:760 */
         118  +
            /* JsonParserGenerator.kt:742 */
  119    119   
            Err(
  120    120   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  121    121   
                    "expected start object or null",
  122    122   
                ),
  123    123   
            )
  124         -
            /* JsonParserGenerator.kt:759 */
  125         -
        } /* JsonParserGenerator.kt:749 */
         124  +
            /* JsonParserGenerator.kt:741 */
         125  +
        } /* JsonParserGenerator.kt:731 */
  126    126   
    }
  127         -
    /* JsonParserGenerator.kt:553 */
         127  +
    /* JsonParserGenerator.kt:535 */
  128    128   
}

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

@@ -1,1 +168,168 @@
    7      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    8      8   
> {
    9      9   
    /* JsonParserGenerator.kt:192 */
   10     10   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
   11     11   
        crate::protocol_serde::or_empty_doc(_value),
   12     12   
    )
   13     13   
    .peekable();
   14     14   
    let tokens = &mut tokens_owned;
   15     15   
    /* JsonParserGenerator.kt:199 */
   16     16   
    let result =
   17         -
    /* JsonParserGenerator.kt:697 */crate::protocol_serde::shape_payload_union::de_payload_union(tokens, _value)?
          17  +
    /* JsonParserGenerator.kt:679 */crate::protocol_serde::shape_payload_union::de_payload_union(tokens, _value)?
   18     18   
    /* JsonParserGenerator.kt:201 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("expected payload member value"));
   19     19   
    /* JsonParserGenerator.kt:255 */
   20     20   
    if tokens.next().is_some() {
   21     21   
        /* JsonParserGenerator.kt:256 */
   22     22   
        return Err(
   23     23   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   24     24   
                "found more JSON tokens after completing parsing",
   25     25   
            ),
   26     26   
        );
   27     27   
        /* JsonParserGenerator.kt:255 */
   28     28   
    }
   29     29   
    /* JsonParserGenerator.kt:203 */
   30     30   
    result
   31     31   
    /* JsonParserGenerator.kt:180 */
   32     32   
}
   33     33   
   34     34   
/* JsonSerializerGenerator.kt:559 */
   35     35   
pub fn ser_payload_union(
   36     36   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
   37     37   
    input: &crate::model::PayloadUnion,
   38     38   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
   39     39   
    /* JsonSerializerGenerator.kt:568 */
   40     40   
    match input {
   41     41   
        /* JsonSerializerGenerator.kt:576 */
   42     42   
        crate::model::PayloadUnion::UnionMember(inner) => {
   43     43   
            /* SerializerUtil.kt:42 */
   44     44   
            {
   45     45   
                /* JsonSerializerGenerator.kt:425 */
   46     46   
                object.key("unionMember").string(inner.as_str());
   47     47   
                /* SerializerUtil.kt:42 */
   48     48   
            }
   49     49   
            /* JsonSerializerGenerator.kt:576 */
   50     50   
        }
   51     51   
        /* JsonSerializerGenerator.kt:568 */
   52     52   
    }
   53     53   
    /* JsonSerializerGenerator.kt:588 */
   54     54   
    Ok(())
   55     55   
    /* JsonSerializerGenerator.kt:559 */
   56     56   
}
   57     57   
   58         -
/* JsonParserGenerator.kt:588 */
          58  +
/* JsonParserGenerator.kt:570 */
   59     59   
pub(crate) fn de_payload_union<'a, I>(
   60     60   
    tokens: &mut ::std::iter::Peekable<I>,
   61     61   
    _value: &'a [u8],
   62     62   
) -> ::std::result::Result<
   63     63   
    Option<crate::model::PayloadUnion>,
   64     64   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   65     65   
>
   66     66   
where
   67     67   
    I: Iterator<
   68     68   
        Item = Result<
   69     69   
            ::aws_smithy_json::deserialize::Token<'a>,
   70     70   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   71     71   
        >,
   72     72   
    >,
   73     73   
{
   74         -
    /* JsonParserGenerator.kt:602 */
          74  +
    /* JsonParserGenerator.kt:584 */
   75     75   
    let mut variant = None;
   76         -
    /* JsonParserGenerator.kt:604 */
          76  +
    /* JsonParserGenerator.kt:586 */
   77     77   
    match tokens.next().transpose()? {
   78         -
        /* JsonParserGenerator.kt:605 */
          78  +
        /* JsonParserGenerator.kt:587 */
   79     79   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => return Ok(None),
   80     80   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   81         -
            /* JsonParserGenerator.kt:721 */
          81  +
            /* JsonParserGenerator.kt:703 */
   82     82   
            loop {
   83         -
                /* JsonParserGenerator.kt:722 */
          83  +
                /* JsonParserGenerator.kt:704 */
   84     84   
                match tokens.next().transpose()? {
   85         -
                    /* JsonParserGenerator.kt:723 */
          85  +
                    /* JsonParserGenerator.kt:705 */
   86     86   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   87     87   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   88         -
                        /* JsonParserGenerator.kt:613 */
          88  +
                        /* JsonParserGenerator.kt:595 */
   89     89   
                        if let ::std::option::Option::Some(::std::result::Result::Ok(
   90     90   
                            ::aws_smithy_json::deserialize::Token::ValueNull { .. },
   91     91   
                        )) = tokens.peek()
   92     92   
                        {
   93     93   
                            let _ = tokens.next().expect("peek returned a token")?;
   94     94   
                            continue;
   95     95   
                        }
   96         -
                        /* JsonParserGenerator.kt:622 */
          96  +
                        /* JsonParserGenerator.kt:604 */
   97     97   
                        let key = key.to_unescaped()?;
   98     98   
                        if key == "__type" {
   99     99   
                            ::aws_smithy_json::deserialize::token::skip_value(tokens)?;
  100    100   
                            continue;
  101    101   
                        }
  102    102   
                        if variant.is_some() {
  103    103   
                            return Err(
  104    104   
                                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  105    105   
                                    "encountered mixed variants in union",
  106    106   
                                ),
  107    107   
                            );
  108    108   
                        }
  109         -
                        /* JsonParserGenerator.kt:635 */
         109  +
                        /* JsonParserGenerator.kt:617 */
  110    110   
                        variant = match key.as_ref() {
  111         -
                            /* JsonParserGenerator.kt:638 */
         111  +
                            /* JsonParserGenerator.kt:620 */
  112    112   
                            "unionMember" => {
  113         -
                                /* JsonParserGenerator.kt:648 */
         113  +
                                /* JsonParserGenerator.kt:630 */
  114    114   
                                Some(crate::model::PayloadUnion::UnionMember(
  115    115   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
  116    116   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
  117    117   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
  118    118   
                                        /* JsonParserGenerator.kt:346 */)
  119    119   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
  120         -
                                    /* JsonParserGenerator.kt:707 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'unionMember' cannot be null"))?
  121         -
                                /* JsonParserGenerator.kt:648 */))
  122         -
                                /* JsonParserGenerator.kt:638 */
         120  +
                                    /* JsonParserGenerator.kt:689 */.ok_or_else(|| ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'unionMember' cannot be null"))?
         121  +
                                /* JsonParserGenerator.kt:630 */))
         122  +
                                /* JsonParserGenerator.kt:620 */
  123    123   
                            }
  124         -
                            /* JsonParserGenerator.kt:671 */
         124  +
                            /* JsonParserGenerator.kt:653 */
  125    125   
                            variant => {
  126    126   
                                return Err(
  127    127   
                                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  128    128   
                                        format!("unexpected union variant: {variant}"),
  129    129   
                                    ),
  130    130   
                                )
  131         -
                            } /* JsonParserGenerator.kt:635 */
         131  +
                            } /* JsonParserGenerator.kt:617 */
  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(
  139    139   
                                format!("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         -
            /* JsonParserGenerator.kt:605 */
         146  +
            /* JsonParserGenerator.kt:587 */
  147    147   
        }
  148         -
        /* JsonParserGenerator.kt:679 */
         148  +
        /* JsonParserGenerator.kt:661 */
  149    149   
        _ => {
  150    150   
            return Err(
  151    151   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  152    152   
                    "expected start object or null",
  153    153   
                ),
  154    154   
            )
  155         -
        } /* JsonParserGenerator.kt:604 */
         155  +
        } /* JsonParserGenerator.kt:586 */
  156    156   
    }
  157         -
    /* JsonParserGenerator.kt:686 */
         157  +
    /* JsonParserGenerator.kt:668 */
  158    158   
    if variant.is_none() {
  159    159   
        return Err(
  160    160   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  161    161   
                "Union did not contain a valid variant.",
  162    162   
            ),
  163    163   
        );
  164    164   
    }
  165         -
    /* JsonParserGenerator.kt:694 */
         165  +
    /* JsonParserGenerator.kt:676 */
  166    166   
    Ok(variant)
  167         -
    /* JsonParserGenerator.kt:588 */
         167  +
    /* JsonParserGenerator.kt:570 */
  168    168   
}

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

@@ -1,1 +133,133 @@
    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_player_action<'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::PlayerAction>,
    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 =
   55     55   
                            match key.as_ref() {
   56         -
                                /* JsonParserGenerator.kt:638 */
          56  +
                                /* JsonParserGenerator.kt:620 */
   57     57   
                                "quit" => {
   58         -
                                    /* JsonParserGenerator.kt:640 */
          58  +
                                    /* JsonParserGenerator.kt:622 */
   59     59   
                                    ::aws_smithy_json::deserialize::token::skip_value(tokens)?;
   60     60   
                                    Some(crate::model::PlayerAction::Quit)
   61         -
                                    /* JsonParserGenerator.kt:638 */
          61  +
                                    /* JsonParserGenerator.kt:620 */
   62     62   
                                }
   63         -
                                /* JsonParserGenerator.kt:671 */
          63  +
                                /* JsonParserGenerator.kt:653 */
   64     64   
                                variant => return Err(
   65     65   
                                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   66     66   
                                        format!("unexpected union variant: {variant}"),
   67     67   
                                    ),
   68         -
                                ), /* JsonParserGenerator.kt:635 */
          68  +
                                ), /* JsonParserGenerator.kt:617 */
   69     69   
                            };
   70         -
                        /* JsonParserGenerator.kt:723 */
          70  +
                        /* JsonParserGenerator.kt:705 */
   71     71   
                    }
   72         -
                    /* JsonParserGenerator.kt:732 */
          72  +
                    /* JsonParserGenerator.kt:714 */
   73     73   
                    other => {
   74     74   
                        return Err(
   75     75   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   76     76   
                                format!("expected object key or end object, found: {other:?}"),
   77     77   
                            ),
   78     78   
                        )
   79         -
                    } /* JsonParserGenerator.kt:722 */
          79  +
                    } /* JsonParserGenerator.kt:704 */
   80     80   
                }
   81         -
                /* JsonParserGenerator.kt:721 */
          81  +
                /* JsonParserGenerator.kt:703 */
   82     82   
            }
   83         -
            /* JsonParserGenerator.kt:605 */
          83  +
            /* JsonParserGenerator.kt:587 */
   84     84   
        }
   85         -
        /* JsonParserGenerator.kt:679 */
          85  +
        /* JsonParserGenerator.kt:661 */
   86     86   
        _ => {
   87     87   
            return Err(
   88     88   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   89     89   
                    "expected start object or null",
   90     90   
                ),
   91     91   
            )
   92         -
        } /* JsonParserGenerator.kt:604 */
          92  +
        } /* JsonParserGenerator.kt:586 */
   93     93   
    }
   94         -
    /* JsonParserGenerator.kt:686 */
          94  +
    /* JsonParserGenerator.kt:668 */
   95     95   
    if variant.is_none() {
   96     96   
        return Err(
   97     97   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   98     98   
                "Union did not contain a valid variant.",
   99     99   
            ),
  100    100   
        );
  101    101   
    }
  102         -
    /* JsonParserGenerator.kt:694 */
         102  +
    /* JsonParserGenerator.kt:676 */
  103    103   
    Ok(variant)
  104         -
    /* JsonParserGenerator.kt:588 */
         104  +
    /* JsonParserGenerator.kt:570 */
  105    105   
}
  106    106   
  107    107   
/* JsonSerializerGenerator.kt:559 */
  108    108   
pub fn ser_player_action(
  109    109   
    object_1: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
  110    110   
    input: &crate::model::PlayerAction,
  111    111   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
  112    112   
    /* JsonSerializerGenerator.kt:568 */
  113    113   
    match input {
  114    114   
        /* JsonSerializerGenerator.kt:576 */

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

@@ -83,83 +162,162 @@
  103    103   
    crate::input::post_player_action_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   
                    "action" => {
  124    124   
                        /* JsonParserGenerator.kt:277 */
  125    125   
                        builder = builder.set_action(
  126         -
                            /* JsonParserGenerator.kt:697 */
         126  +
                            /* JsonParserGenerator.kt:679 */
  127    127   
                            crate::protocol_serde::shape_player_action::de_player_action(
  128    128   
                                tokens, _value,
  129    129   
                            )?, /* JsonParserGenerator.kt:277 */
  130    130   
                        );
  131    131   
                        /* JsonParserGenerator.kt:267 */
  132    132   
                    }
  133    133   
                    /* JsonParserGenerator.kt:295 */
  134    134   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  135    135   
                }
  136         -
                /* JsonParserGenerator.kt:723 */
         136  +
                /* JsonParserGenerator.kt:705 */
  137    137   
            }
  138         -
            /* JsonParserGenerator.kt:732 */
         138  +
            /* JsonParserGenerator.kt:714 */
  139    139   
            other => {
  140    140   
                return Err(
  141    141   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  142    142   
                        "expected object key or end object, found: {other:?}"
  143    143   
                    )),
  144    144   
                )
  145         -
            } /* JsonParserGenerator.kt:722 */
         145  +
            } /* JsonParserGenerator.kt:704 */
  146    146   
        }
  147         -
        /* JsonParserGenerator.kt:721 */
         147  +
        /* JsonParserGenerator.kt:703 */
  148    148   
    }
  149    149   
    /* JsonParserGenerator.kt:255 */
  150    150   
    if tokens.next().is_some() {
  151    151   
        /* JsonParserGenerator.kt:256 */
  152    152   
        return Err(
  153    153   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  154    154   
                "found more JSON tokens after completing parsing",
  155    155   
            ),
  156    156   
        );
  157    157   
        /* JsonParserGenerator.kt:255 */

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

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