Server Test

Server Test

rev. e142b602d868dbcdb3ff7160c87686e354cd0986 (ignoring whitespace)

Files changed:

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

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

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

@@ -80,80 +175,175 @@
  100    100   
    crate::input::document_type_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   
                    "documentValue" => {
  121    121   
                        /* JsonParserGenerator.kt:277 */
  122    122   
                        builder = builder.set_document_value(
  123    123   
                            /* JsonParserGenerator.kt:326 */
  124    124   
                            Some(::aws_smithy_json::deserialize::token::expect_document(
  125    125   
                                tokens,
  126    126   
                            )?), /* JsonParserGenerator.kt:277 */
  127    127   
                        );
  128    128   
                        /* JsonParserGenerator.kt:267 */
  129    129   
                    }
  130    130   
                    /* JsonParserGenerator.kt:267 */
  131    131   
                    "stringValue" => {
  132    132   
                        /* JsonParserGenerator.kt:277 */
  133    133   
                        builder = builder.set_string_value(
  134    134   
                            /* JsonParserGenerator.kt:361 */
  135    135   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(
  136    136   
                                tokens.next(),
  137    137   
                            )?
  138    138   
                            .map(|s|
  139    139   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
  140    140   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
  141    141   
                                /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
  142    142   
                            .transpose()?, /* JsonParserGenerator.kt:277 */
  143    143   
                        );
  144    144   
                        /* JsonParserGenerator.kt:267 */
  145    145   
                    }
  146    146   
                    /* JsonParserGenerator.kt:295 */
  147    147   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  148    148   
                }
  149         -
                /* JsonParserGenerator.kt:723 */
         149  +
                /* JsonParserGenerator.kt:705 */
  150    150   
            }
  151         -
            /* JsonParserGenerator.kt:732 */
         151  +
            /* JsonParserGenerator.kt:714 */
  152    152   
            other => {
  153    153   
                return Err(
  154    154   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  155    155   
                        "expected object key or end object, found: {other:?}"
  156    156   
                    )),
  157    157   
                )
  158         -
            } /* JsonParserGenerator.kt:722 */
         158  +
            } /* JsonParserGenerator.kt:704 */
  159    159   
        }
  160         -
        /* JsonParserGenerator.kt:721 */
         160  +
        /* JsonParserGenerator.kt:703 */
  161    161   
    }
  162    162   
    /* JsonParserGenerator.kt:255 */
  163    163   
    if tokens.next().is_some() {
  164    164   
        /* JsonParserGenerator.kt:256 */
  165    165   
        return Err(
  166    166   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  167    167   
                "found more JSON tokens after completing parsing",
  168    168   
            ),
  169    169   
        );
  170    170   
        /* JsonParserGenerator.kt:255 */

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

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

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

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

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

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

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

@@ -18,18 +102,102 @@
   38     38   
    crate::error::error_event::Builder,
   39     39   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   40     40   
> {
   41     41   
    /* JsonParserGenerator.kt:158 */
   42     42   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
   43     43   
        crate::protocol_serde::or_empty_doc(_value),
   44     44   
    )
   45     45   
    .peekable();
   46     46   
    let tokens = &mut tokens_owned;
   47     47   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
   48         -
    /* JsonParserGenerator.kt:721 */
          48  +
    /* JsonParserGenerator.kt:703 */
   49     49   
    loop {
   50         -
        /* JsonParserGenerator.kt:722 */
          50  +
        /* JsonParserGenerator.kt:704 */
   51     51   
        match tokens.next().transpose()? {
   52         -
            /* JsonParserGenerator.kt:723 */
          52  +
            /* JsonParserGenerator.kt:705 */
   53     53   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   54     54   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   55     55   
                /* JsonParserGenerator.kt:265 */
   56     56   
                match key.to_unescaped()?.as_ref() {
   57     57   
                    /* JsonParserGenerator.kt:267 */
   58     58   
                    "message" => {
   59     59   
                        /* JsonParserGenerator.kt:277 */
   60     60   
                        builder = builder.set_message(
   61     61   
                            /* JsonParserGenerator.kt:361 */
   62     62   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(
   63     63   
                                tokens.next(),
   64     64   
                            )?
   65     65   
                            .map(|s|
   66     66   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   67     67   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
   68     68   
                                /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
   69     69   
                            .transpose()?, /* JsonParserGenerator.kt:277 */
   70     70   
                        );
   71     71   
                        /* JsonParserGenerator.kt:267 */
   72     72   
                    }
   73     73   
                    /* JsonParserGenerator.kt:295 */
   74     74   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   75     75   
                }
   76         -
                /* JsonParserGenerator.kt:723 */
          76  +
                /* JsonParserGenerator.kt:705 */
   77     77   
            }
   78         -
            /* JsonParserGenerator.kt:732 */
          78  +
            /* JsonParserGenerator.kt:714 */
   79     79   
            other => {
   80     80   
                return Err(
   81     81   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   82     82   
                        "expected object key or end object, found: {other:?}"
   83     83   
                    )),
   84     84   
                )
   85         -
            } /* JsonParserGenerator.kt:722 */
          85  +
            } /* JsonParserGenerator.kt:704 */
   86     86   
        }
   87         -
        /* JsonParserGenerator.kt:721 */
          87  +
        /* JsonParserGenerator.kt:703 */
   88     88   
    }
   89     89   
    /* JsonParserGenerator.kt:255 */
   90     90   
    if tokens.next().is_some() {
   91     91   
        /* JsonParserGenerator.kt:256 */
   92     92   
        return Err(
   93     93   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   94     94   
                "found more JSON tokens after completing parsing",
   95     95   
            ),
   96     96   
        );
   97     97   
        /* JsonParserGenerator.kt:255 */

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

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

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

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

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

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

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

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

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

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

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

@@ -1,1 +87,87 @@
    7      7   
    crate::model::headers_and_implicit_payload_event::Builder,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
> {
   10     10   
    /* JsonParserGenerator.kt:158 */
   11     11   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
   12     12   
        crate::protocol_serde::or_empty_doc(_value),
   13     13   
    )
   14     14   
    .peekable();
   15     15   
    let tokens = &mut tokens_owned;
   16     16   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
   17         -
    /* JsonParserGenerator.kt:721 */
          17  +
    /* JsonParserGenerator.kt:703 */
   18     18   
    loop {
   19         -
        /* JsonParserGenerator.kt:722 */
          19  +
        /* JsonParserGenerator.kt:704 */
   20     20   
        match tokens.next().transpose()? {
   21         -
            /* JsonParserGenerator.kt:723 */
          21  +
            /* JsonParserGenerator.kt:705 */
   22     22   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   23     23   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   24     24   
                /* JsonParserGenerator.kt:265 */
   25     25   
                match key.to_unescaped()?.as_ref() {
   26     26   
                    /* JsonParserGenerator.kt:267 */
   27     27   
                    "header" => {
   28     28   
                        /* JsonParserGenerator.kt:277 */
   29     29   
                        builder = builder.set_header(
   30     30   
                            /* JsonParserGenerator.kt:361 */
   31     31   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(
   32     32   
                                tokens.next(),
   33     33   
                            )?
   34     34   
                            .map(|s|
   35     35   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   36     36   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
   37     37   
                                /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
   38     38   
                            .transpose()?, /* JsonParserGenerator.kt:277 */
   39     39   
                        );
   40     40   
                        /* JsonParserGenerator.kt:267 */
   41     41   
                    }
   42     42   
                    /* JsonParserGenerator.kt:267 */
   43     43   
                    "payload" => {
   44     44   
                        /* JsonParserGenerator.kt:277 */
   45     45   
                        builder = builder.set_payload(
   46     46   
                            /* JsonParserGenerator.kt:361 */
   47     47   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(
   48     48   
                                tokens.next(),
   49     49   
                            )?
   50     50   
                            .map(|s|
   51     51   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   52     52   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
   53     53   
                                /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
   54     54   
                            .transpose()?, /* JsonParserGenerator.kt:277 */
   55     55   
                        );
   56     56   
                        /* JsonParserGenerator.kt:267 */
   57     57   
                    }
   58     58   
                    /* JsonParserGenerator.kt:295 */
   59     59   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   60     60   
                }
   61         -
                /* JsonParserGenerator.kt:723 */
          61  +
                /* JsonParserGenerator.kt:705 */
   62     62   
            }
   63         -
            /* JsonParserGenerator.kt:732 */
          63  +
            /* JsonParserGenerator.kt:714 */
   64     64   
            other => {
   65     65   
                return Err(
   66     66   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   67     67   
                        "expected object key or end object, found: {other:?}"
   68     68   
                    )),
   69     69   
                )
   70         -
            } /* JsonParserGenerator.kt:722 */
          70  +
            } /* JsonParserGenerator.kt:704 */
   71     71   
        }
   72         -
        /* JsonParserGenerator.kt:721 */
          72  +
        /* JsonParserGenerator.kt:703 */
   73     73   
    }
   74     74   
    /* JsonParserGenerator.kt:255 */
   75     75   
    if tokens.next().is_some() {
   76     76   
        /* JsonParserGenerator.kt:256 */
   77     77   
        return Err(
   78     78   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
   79     79   
                "found more JSON tokens after completing parsing",
   80     80   
            ),
   81     81   
        );
   82     82   
        /* JsonParserGenerator.kt:255 */

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

@@ -80,80 +164,164 @@
  100    100   
    crate::input::http_checksum_required_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   
                    "foo" => {
  121    121   
                        /* JsonParserGenerator.kt:277 */
  122    122   
                        builder = builder.set_foo(
  123    123   
                            /* JsonParserGenerator.kt:361 */
  124    124   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(
  125    125   
                                tokens.next(),
  126    126   
                            )?
  127    127   
                            .map(|s|
  128    128   
                                /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
  129    129   
                                    /* JsonParserGenerator.kt:355 */u.into_owned()
  130    130   
                                /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
  131    131   
                            .transpose()?, /* JsonParserGenerator.kt:277 */
  132    132   
                        );
  133    133   
                        /* JsonParserGenerator.kt:267 */
  134    134   
                    }
  135    135   
                    /* JsonParserGenerator.kt:295 */
  136    136   
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  137    137   
                }
  138         -
                /* JsonParserGenerator.kt:723 */
         138  +
                /* JsonParserGenerator.kt:705 */
  139    139   
            }
  140         -
            /* JsonParserGenerator.kt:732 */
         140  +
            /* JsonParserGenerator.kt:714 */
  141    141   
            other => {
  142    142   
                return Err(
  143    143   
                    ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
  144    144   
                        "expected object key or end object, found: {other:?}"
  145    145   
                    )),
  146    146   
                )
  147         -
            } /* JsonParserGenerator.kt:722 */
         147  +
            } /* JsonParserGenerator.kt:704 */
  148    148   
        }
  149         -
        /* JsonParserGenerator.kt:721 */
         149  +
        /* JsonParserGenerator.kt:703 */
  150    150   
    }
  151    151   
    /* JsonParserGenerator.kt:255 */
  152    152   
    if tokens.next().is_some() {
  153    153   
        /* JsonParserGenerator.kt:256 */
  154    154   
        return Err(
  155    155   
            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  156    156   
                "found more JSON tokens after completing parsing",
  157    157   
            ),
  158    158   
        );
  159    159   
        /* JsonParserGenerator.kt:255 */

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

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

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

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

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

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