Server Test

Server Test

rev. e142b602d868dbcdb3ff7160c87686e354cd0986 (ignoring whitespace)

Files changed:

tmp-codegen-diff/codegen-server-test/pokemon-service-server-sdk-http0x/rust-server-codegen/src/protocol_serde/shape_capturing_payload.rs

@@ -1,1 +124,124 @@
    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_capturing_payload::de_capturing_payload(tokens, _value)?
          17  +
    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_capturing_payload::de_capturing_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         -
/* JsonParserGenerator.kt:553 */
          34  +
/* JsonParserGenerator.kt:535 */
   35     35   
pub(crate) fn de_capturing_payload<'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::CapturingPayload>,
   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::capturing_payload::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   
                            "name" => {
   70     70   
                                /* JsonParserGenerator.kt:277 */
   71     71   
                                builder = builder.set_name(
   72     72   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   73     73   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   74     74   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   75     75   
                                        /* JsonParserGenerator.kt:346 */)
   76     76   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   77     77   
                                /* JsonParserGenerator.kt:277 */);
   78     78   
                                /* JsonParserGenerator.kt:267 */
   79     79   
                            }
   80     80   
                            /* JsonParserGenerator.kt:267 */
   81     81   
                            "pokeball" => {
   82     82   
                                /* JsonParserGenerator.kt:277 */
   83     83   
                                builder = builder.set_pokeball(
   84     84   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   85     85   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   86     86   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   87     87   
                                        /* JsonParserGenerator.kt:346 */)
   88     88   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   89     89   
                                /* JsonParserGenerator.kt:277 */);
   90     90   
                                /* JsonParserGenerator.kt:267 */
   91     91   
                            }
   92     92   
                            /* JsonParserGenerator.kt:295 */
   93     93   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   94     94   
                        }
   95         -
                        /* JsonParserGenerator.kt:723 */
          95  +
                        /* JsonParserGenerator.kt:705 */
   96     96   
                    }
   97         -
                    /* JsonParserGenerator.kt:732 */
          97  +
                    /* JsonParserGenerator.kt:714 */
   98     98   
                    other => {
   99     99   
                        return Err(
  100    100   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  101    101   
                                format!("expected object key or end object, found: {other:?}"),
  102    102   
                            ),
  103    103   
                        )
  104         -
                    } /* JsonParserGenerator.kt:722 */
         104  +
                    } /* JsonParserGenerator.kt:704 */
  105    105   
                }
  106         -
                /* JsonParserGenerator.kt:721 */
         106  +
                /* JsonParserGenerator.kt:703 */
  107    107   
            }
  108         -
            /* JsonParserGenerator.kt:577 */
         108  +
            /* JsonParserGenerator.kt:559 */
  109    109   
            Ok(Some(builder.build()))
  110         -
            /* JsonParserGenerator.kt:750 */
         110  +
            /* JsonParserGenerator.kt:732 */
  111    111   
        }
  112         -
        /* JsonParserGenerator.kt:759 */
         112  +
        /* JsonParserGenerator.kt:741 */
  113    113   
        _ => {
  114         -
            /* JsonParserGenerator.kt:760 */
         114  +
            /* JsonParserGenerator.kt:742 */
  115    115   
            Err(
  116    116   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  117    117   
                    "expected start object or null",
  118    118   
                ),
  119    119   
            )
  120         -
            /* JsonParserGenerator.kt:759 */
  121         -
        } /* JsonParserGenerator.kt:749 */
         120  +
            /* JsonParserGenerator.kt:741 */
         121  +
        } /* JsonParserGenerator.kt:731 */
  122    122   
    }
  123         -
    /* JsonParserGenerator.kt:553 */
         123  +
    /* JsonParserGenerator.kt:535 */
  124    124   
}

tmp-codegen-diff/codegen-server-test/pokemon-service-server-sdk-http0x/rust-server-codegen/src/protocol_serde/shape_master_ball_unsuccessful.rs

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

tmp-codegen-diff/codegen-server-test/pokemon-service-server-sdk/rust-server-codegen/src/protocol_serde/shape_capturing_payload.rs

@@ -1,1 +124,124 @@
    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_capturing_payload::de_capturing_payload(tokens, _value)?
          17  +
    /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_capturing_payload::de_capturing_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         -
/* JsonParserGenerator.kt:553 */
          34  +
/* JsonParserGenerator.kt:535 */
   35     35   
pub(crate) fn de_capturing_payload<'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::CapturingPayload>,
   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::capturing_payload::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   
                            "name" => {
   70     70   
                                /* JsonParserGenerator.kt:277 */
   71     71   
                                builder = builder.set_name(
   72     72   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   73     73   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   74     74   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   75     75   
                                        /* JsonParserGenerator.kt:346 */)
   76     76   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   77     77   
                                /* JsonParserGenerator.kt:277 */);
   78     78   
                                /* JsonParserGenerator.kt:267 */
   79     79   
                            }
   80     80   
                            /* JsonParserGenerator.kt:267 */
   81     81   
                            "pokeball" => {
   82     82   
                                /* JsonParserGenerator.kt:277 */
   83     83   
                                builder = builder.set_pokeball(
   84     84   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   85     85   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   86     86   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   87     87   
                                        /* JsonParserGenerator.kt:346 */)
   88     88   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   89     89   
                                /* JsonParserGenerator.kt:277 */);
   90     90   
                                /* JsonParserGenerator.kt:267 */
   91     91   
                            }
   92     92   
                            /* JsonParserGenerator.kt:295 */
   93     93   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
   94     94   
                        }
   95         -
                        /* JsonParserGenerator.kt:723 */
          95  +
                        /* JsonParserGenerator.kt:705 */
   96     96   
                    }
   97         -
                    /* JsonParserGenerator.kt:732 */
          97  +
                    /* JsonParserGenerator.kt:714 */
   98     98   
                    other => {
   99     99   
                        return Err(
  100    100   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  101    101   
                                format!("expected object key or end object, found: {other:?}"),
  102    102   
                            ),
  103    103   
                        )
  104         -
                    } /* JsonParserGenerator.kt:722 */
         104  +
                    } /* JsonParserGenerator.kt:704 */
  105    105   
                }
  106         -
                /* JsonParserGenerator.kt:721 */
         106  +
                /* JsonParserGenerator.kt:703 */
  107    107   
            }
  108         -
            /* JsonParserGenerator.kt:577 */
         108  +
            /* JsonParserGenerator.kt:559 */
  109    109   
            Ok(Some(builder.build()))
  110         -
            /* JsonParserGenerator.kt:750 */
         110  +
            /* JsonParserGenerator.kt:732 */
  111    111   
        }
  112         -
        /* JsonParserGenerator.kt:759 */
         112  +
        /* JsonParserGenerator.kt:741 */
  113    113   
        _ => {
  114         -
            /* JsonParserGenerator.kt:760 */
         114  +
            /* JsonParserGenerator.kt:742 */
  115    115   
            Err(
  116    116   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  117    117   
                    "expected start object or null",
  118    118   
                ),
  119    119   
            )
  120         -
            /* JsonParserGenerator.kt:759 */
  121         -
        } /* JsonParserGenerator.kt:749 */
         120  +
            /* JsonParserGenerator.kt:741 */
         121  +
        } /* JsonParserGenerator.kt:731 */
  122    122   
    }
  123         -
    /* JsonParserGenerator.kt:553 */
         123  +
    /* JsonParserGenerator.kt:535 */
  124    124   
}

tmp-codegen-diff/codegen-server-test/pokemon-service-server-sdk/rust-server-codegen/src/protocol_serde/shape_master_ball_unsuccessful.rs

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

tmp-codegen-diff/codegen-server-test/rest_json-http0x/rust-server-codegen/src/protocol_serde/shape_boolean_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     40   
                            /* JsonParserGenerator.kt:303 */::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?
   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-http0x/rust-server-codegen/src/protocol_serde/shape_client_optional_defaults.rs

@@ -1,1 +80,80 @@
    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_client_optional_defaults<'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::ClientOptionalDefaults>,
    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::client_optional_defaults::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   
                            "member" => {
   38     38   
                                /* JsonParserGenerator.kt:281 */
   39     39   
                                if let Some(v) =
   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:283 */{
   44     44   
                                                                            builder = builder.set_member(v);
   45     45   
                                                                        }
   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   
}

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

@@ -81,81 +162,162 @@
  101    101   
    crate::input::content_type_parameters_input::Builder,
  102    102   
    ::aws_smithy_json::deserialize::error::DeserializeError,
  103    103   
> {
  104    104   
    /* JsonParserGenerator.kt:158 */
  105    105   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
  106    106   
        crate::protocol_serde::or_empty_doc(_value),
  107    107   
    )
  108    108   
    .peekable();
  109    109   
    let tokens = &mut tokens_owned;
  110    110   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
  111         -
    /* JsonParserGenerator.kt:721 */
         111  +
    /* JsonParserGenerator.kt:703 */
  112    112   
    loop {
  113         -
        /* JsonParserGenerator.kt:722 */
         113  +
        /* JsonParserGenerator.kt:704 */
  114    114   
        match tokens.next().transpose()? {
  115         -
            /* JsonParserGenerator.kt:723 */
         115  +
            /* JsonParserGenerator.kt:705 */
  116    116   
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
  117    117   
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
  118    118   
                /* JsonParserGenerator.kt:265 */
  119    119   
                match key.to_unescaped()?.as_ref() {
  120    120   
                    /* JsonParserGenerator.kt:267 */
  121    121   
                    "value" => {
  122    122   
                        /* JsonParserGenerator.kt:277 */
  123    123   
                        builder = builder.set_value(
  124    124   
                            /* JsonParserGenerator.kt:372 */
  125    125   
                            ::aws_smithy_json::deserialize::token::expect_number_or_null(
  126    126   
                                tokens.next(),
  127    127   
                            )?
  128    128   
                            .map(i32::try_from)
  129    129   
                            .transpose()?, /* 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-http0x/rust-server-codegen/src/protocol_serde/shape_defaults.rs

@@ -1,1 +94,94 @@
    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_defaults<'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::defaults::Builder>,
    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::defaults::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   
                            "defaultString" => {
   38     38   
                                /* JsonParserGenerator.kt:281 */
   39     39   
                                if let Some(v) =
   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:283 */{
   46     46   
                                                                            builder = builder.set_default_string(v);
   47     47   
                                                                        }
   48     48   
                                /* JsonParserGenerator.kt:267 */
   49     49   
                            }
   50     50   
                            /* JsonParserGenerator.kt:267 */
   51     51   
                            "defaultBoolean" => {
   52     52   
                                /* JsonParserGenerator.kt:281 */
   53     53   
                                if let Some(v) =
   54     54   
                                /* JsonParserGenerator.kt:303 */::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?
   55     55   
                                /* JsonParserGenerator.kt:283 */{
   56     56   
                                                                            builder = builder.set_default_boolean(v);
   57     57   
                                                                        }
   58     58   
                                /* JsonParserGenerator.kt:267 */
   59     59   
                            }
   60     60   
                            /* JsonParserGenerator.kt:267 */
   61     61   
                            "defaultList" => {
   62     62   
                                /* JsonParserGenerator.kt:281 */
   63     63   
                                if let Some(v) =
   64         -
                                /* JsonParserGenerator.kt:488 */crate::protocol_serde::shape_test_string_list::de_test_string_list(tokens, _value)?
          64  +
                                /* JsonParserGenerator.kt:481 */crate::protocol_serde::shape_test_string_list::de_test_string_list(tokens, _value)?
   65     65   
                                /* JsonParserGenerator.kt:283 */{
   66     66   
                                                                            builder = builder.set_default_list(v);
   67     67   
                                                                        }
   68     68   
                                /* JsonParserGenerator.kt:267 */
   69     69   
                            }
   70     70   
                            /* JsonParserGenerator.kt:267 */
   71     71   
                            "defaultDocumentMap" => {
   72     72   
                                /* JsonParserGenerator.kt:281 */
   73     73   
                                if let Some(v) =
   74     74   
                                    /* JsonParserGenerator.kt:326 */
@@ -207,207 +267,267 @@
  227    227   
                                /* JsonParserGenerator.kt:370 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?.map(|v| v.to_f64_lossy())
  228    228   
                                /* JsonParserGenerator.kt:283 */{
  229    229   
                                                                            builder = builder.set_default_double(v);
  230    230   
                                                                        }
  231    231   
                                /* JsonParserGenerator.kt:267 */
  232    232   
                            }
  233    233   
                            /* JsonParserGenerator.kt:267 */
  234    234   
                            "defaultMap" => {
  235    235   
                                /* JsonParserGenerator.kt:281 */
  236    236   
                                if let Some(v) =
  237         -
                                /* JsonParserGenerator.kt:546 */crate::protocol_serde::shape_test_string_map::de_test_string_map(tokens, _value)?
         237  +
                                /* JsonParserGenerator.kt:528 */crate::protocol_serde::shape_test_string_map::de_test_string_map(tokens, _value)?
  238    238   
                                /* JsonParserGenerator.kt:283 */{
  239    239   
                                                                            builder = builder.set_default_map(v);
  240    240   
                                                                        }
  241    241   
                                /* JsonParserGenerator.kt:267 */
  242    242   
                            }
  243    243   
                            /* JsonParserGenerator.kt:267 */
  244    244   
                            "defaultEnum" => {
  245    245   
                                /* JsonParserGenerator.kt:281 */
  246    246   
                                if let Some(v) =
  247    247   
                                /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
@@ -344,344 +403,403 @@
  364    364   
                                if let Some(v) =
  365    365   
                                /* JsonParserGenerator.kt:370 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?.map(|v| v.to_f64_lossy())
  366    366   
                                /* JsonParserGenerator.kt:283 */{
  367    367   
                                                                            builder = builder.set_zero_double(v);
  368    368   
                                                                        }
  369    369   
                                /* JsonParserGenerator.kt:267 */
  370    370   
                            }
  371    371   
                            /* JsonParserGenerator.kt:295 */
  372    372   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  373    373   
                        }
  374         -
                        /* JsonParserGenerator.kt:723 */
         374  +
                        /* JsonParserGenerator.kt:705 */
  375    375   
                    }
  376         -
                    /* JsonParserGenerator.kt:732 */
         376  +
                    /* JsonParserGenerator.kt:714 */
  377    377   
                    other => {
  378    378   
                        return Err(
  379    379   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  380    380   
                                format!("expected object key or end object, found: {other:?}"),
  381    381   
                            ),
  382    382   
                        )
  383         -
                    } /* JsonParserGenerator.kt:722 */
         383  +
                    } /* JsonParserGenerator.kt:704 */
  384    384   
                }
  385         -
                /* JsonParserGenerator.kt:721 */
         385  +
                /* JsonParserGenerator.kt:703 */
  386    386   
            }
  387         -
            /* JsonParserGenerator.kt:577 */
         387  +
            /* JsonParserGenerator.kt:559 */
  388    388   
            Ok(Some(builder))
  389         -
            /* JsonParserGenerator.kt:750 */
         389  +
            /* JsonParserGenerator.kt:732 */
  390    390   
        }
  391         -
        /* JsonParserGenerator.kt:759 */
         391  +
        /* JsonParserGenerator.kt:741 */
  392    392   
        _ => {
  393         -
            /* JsonParserGenerator.kt:760 */
         393  +
            /* JsonParserGenerator.kt:742 */
  394    394   
            Err(
  395    395   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  396    396   
                    "expected start object or null",
  397    397   
                ),
  398    398   
            )
  399         -
            /* JsonParserGenerator.kt:759 */
  400         -
        } /* JsonParserGenerator.kt:749 */
         399  +
            /* JsonParserGenerator.kt:741 */
         400  +
        } /* JsonParserGenerator.kt:731 */
  401    401   
    }
  402         -
    /* JsonParserGenerator.kt:553 */
         402  +
    /* JsonParserGenerator.kt:535 */
  403    403   
}

tmp-codegen-diff/codegen-server-test/rest_json-http0x/rust-server-codegen/src/protocol_serde/shape_dense_boolean_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_dense_boolean_map<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<::std::collections::HashMap<::std::string::String, bool>>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23         -
            /* JsonParserGenerator.kt:506 */
          23  +
            /* JsonParserGenerator.kt:499 */
   24     24   
            let mut map = ::std::collections::HashMap::new();
   25         -
            /* JsonParserGenerator.kt:721 */
          25  +
            /* JsonParserGenerator.kt:703 */
   26     26   
            loop {
   27         -
                /* JsonParserGenerator.kt:722 */
          27  +
                /* JsonParserGenerator.kt:704 */
   28     28   
                match tokens.next().transpose()? {
   29         -
                    /* JsonParserGenerator.kt:723 */
          29  +
                    /* JsonParserGenerator.kt:705 */
   30     30   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   31     31   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   32         -
                        /* JsonParserGenerator.kt:508 */
          32  +
                        /* JsonParserGenerator.kt:501 */
   33     33   
                        let key =
   34     34   
                            /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
   35     35   
                                /* JsonParserGenerator.kt:355 */u.into_owned()
   36     36   
                            /* JsonParserGenerator.kt:346 */)
   37         -
                        /* JsonParserGenerator.kt:508 */?;
   38         -
                        /* JsonParserGenerator.kt:511 */
          37  +
                        /* JsonParserGenerator.kt:501 */?;
          38  +
                        /* JsonParserGenerator.kt:504 */
   39     39   
                        let value =
   40     40   
                            /* JsonParserGenerator.kt:303 */::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?
   41         -
                        /* JsonParserGenerator.kt:511 */;
   42         -
                        /* JsonParserGenerator.kt: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_dense_number_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_dense_number_map<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<::std::collections::HashMap<::std::string::String, 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_dense_set_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_dense_set_map<'a, I>(
    4      4   
    tokens: &mut ::std::iter::Peekable<I>,
    5      5   
    _value: &'a [u8],
    6      6   
) -> ::std::result::Result<
    7      7   
    Option<crate::unconstrained::dense_set_map_unconstrained::DenseSetMapUnconstrained>,
    8      8   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    9      9   
>
   10     10   
where
   11     11   
    I: Iterator<
   12     12   
        Item = Result<
   13     13   
            ::aws_smithy_json::deserialize::Token<'a>,
   14     14   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   15     15   
        >,
   16     16   
    >,
   17     17   
{
   18         -
    /* JsonParserGenerator.kt:749 */
          18  +
    /* JsonParserGenerator.kt:731 */
   19     19   
    match tokens.next().transpose()? {
   20         -
        /* JsonParserGenerator.kt:750 */
          20  +
        /* JsonParserGenerator.kt:732 */
   21     21   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   22     22   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   23         -
            /* JsonParserGenerator.kt:506 */
          23  +
            /* JsonParserGenerator.kt:499 */
   24     24   
            let mut map = ::std::collections::HashMap::new();
   25         -
            /* JsonParserGenerator.kt:721 */
          25  +
            /* JsonParserGenerator.kt:703 */
   26     26   
            loop {
   27         -
                /* JsonParserGenerator.kt:722 */
          27  +
                /* JsonParserGenerator.kt:704 */
   28     28   
                match tokens.next().transpose()? {
   29         -
                    /* JsonParserGenerator.kt:723 */
          29  +
                    /* JsonParserGenerator.kt:705 */
   30     30   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   31     31   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   32         -
                        /* JsonParserGenerator.kt:508 */
          32  +
                        /* JsonParserGenerator.kt:501 */
   33     33   
                        let key =
   34     34   
                            /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
   35     35   
                                /* JsonParserGenerator.kt:355 */u.into_owned()
   36     36   
                            /* JsonParserGenerator.kt:346 */)
   37         -
                        /* JsonParserGenerator.kt:508 */?;
   38         -
                        /* JsonParserGenerator.kt:511 */
          37  +
                        /* JsonParserGenerator.kt:501 */?;
          38  +
                        /* JsonParserGenerator.kt:504 */
   39     39   
                        let value =
   40         -
                            /* JsonParserGenerator.kt:488 */crate::protocol_serde::shape_string_set::de_string_set(tokens, _value)?
   41         -
                        /* JsonParserGenerator.kt:511 */;
   42         -
                        /* JsonParserGenerator.kt:518 */
          40  +
                            /* JsonParserGenerator.kt:481 */crate::protocol_serde::shape_string_set::de_string_set(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:539 */
          68  +
            /* JsonParserGenerator.kt:521 */
   69     69   
            Ok(Some(
   70     70   
                crate::unconstrained::dense_set_map_unconstrained::DenseSetMapUnconstrained(map),
   71     71   
            ))
   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_dense_string_map.rs

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

tmp-codegen-diff/codegen-server-test/rest_json-http0x/rust-server-codegen/src/protocol_serde/shape_dense_struct_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_dense_struct_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::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         -
            /* 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_greeting_struct::de_greeting_struct(tokens, _value)?
   41         -
                        /* JsonParserGenerator.kt:511 */;
   42         -
                        /* JsonParserGenerator.kt:518 */
          40  +
                            /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_greeting_struct::de_greeting_struct(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_dialog.rs

@@ -6,6 +139,139 @@
   26     26   
        crate::protocol_serde::shape_farewell::ser_farewell(&mut object_3, var_2)?;
   27     27   
        /* JsonSerializerGenerator.kt:527 */
   28     28   
        object_3.finish();
   29     29   
        /* JsonSerializerGenerator.kt:384 */
   30     30   
    }
   31     31   
    /* JsonSerializerGenerator.kt:374 */
   32     32   
    Ok(())
   33     33   
    /* JsonSerializerGenerator.kt:360 */
   34     34   
}
   35     35   
   36         -
/* JsonParserGenerator.kt:553 */
          36  +
/* JsonParserGenerator.kt:535 */
   37     37   
pub(crate) fn de_dialog<'a, I>(
   38     38   
    tokens: &mut ::std::iter::Peekable<I>,
   39     39   
    _value: &'a [u8],
   40     40   
) -> ::std::result::Result<
   41     41   
    Option<crate::model::Dialog>,
   42     42   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   43     43   
>
   44     44   
where
   45     45   
    I: Iterator<
   46     46   
        Item = Result<
   47     47   
            ::aws_smithy_json::deserialize::Token<'a>,
   48     48   
            ::aws_smithy_json::deserialize::error::DeserializeError,
   49     49   
        >,
   50     50   
    >,
   51     51   
{
   52         -
    /* JsonParserGenerator.kt:749 */
          52  +
    /* JsonParserGenerator.kt:731 */
   53     53   
    match tokens.next().transpose()? {
   54         -
        /* JsonParserGenerator.kt:750 */
          54  +
        /* JsonParserGenerator.kt:732 */
   55     55   
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   56     56   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
   57     57   
            /* RustType.kt:534 */
   58     58   
            #[allow(unused_mut)]
   59         -
            /* JsonParserGenerator.kt:563 */
          59  +
            /* JsonParserGenerator.kt:545 */
   60     60   
            let mut builder = crate::model::dialog::Builder::default();
   61         -
            /* JsonParserGenerator.kt:721 */
          61  +
            /* JsonParserGenerator.kt:703 */
   62     62   
            loop {
   63         -
                /* JsonParserGenerator.kt:722 */
          63  +
                /* JsonParserGenerator.kt:704 */
   64     64   
                match tokens.next().transpose()? {
   65         -
                    /* JsonParserGenerator.kt:723 */
          65  +
                    /* JsonParserGenerator.kt:705 */
   66     66   
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   67     67   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   68     68   
                        /* JsonParserGenerator.kt:265 */
   69     69   
                        match key.to_unescaped()?.as_ref() {
   70     70   
                            /* JsonParserGenerator.kt:267 */
   71     71   
                            "language" => {
   72     72   
                                /* JsonParserGenerator.kt:277 */
   73     73   
                                builder = builder.set_language(
   74     74   
                                    /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   75     75   
                                        /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   76     76   
                                            /* JsonParserGenerator.kt:355 */u.into_owned()
   77     77   
                                        /* JsonParserGenerator.kt:346 */)
   78     78   
                                    /* JsonParserGenerator.kt:361 */).transpose()?
   79     79   
                                /* JsonParserGenerator.kt:277 */);
   80     80   
                                /* JsonParserGenerator.kt:267 */
   81     81   
                            }
   82     82   
                            /* JsonParserGenerator.kt:267 */
   83     83   
                            "greeting" => {
   84     84   
                                /* JsonParserGenerator.kt:281 */
   85     85   
                                if let Some(v) =
   86     86   
                                /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
   87     87   
                                    /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
   88     88   
                                        /* JsonParserGenerator.kt:355 */u.into_owned()
   89     89   
                                    /* JsonParserGenerator.kt:346 */)
   90     90   
                                /* JsonParserGenerator.kt:361 */).transpose()?
   91     91   
                                /* JsonParserGenerator.kt:283 */{
   92     92   
                                                                            builder = builder.set_greeting(v);
   93     93   
                                                                        }
   94     94   
                                /* JsonParserGenerator.kt:267 */
   95     95   
                            }
   96     96   
                            /* JsonParserGenerator.kt:267 */
   97     97   
                            "farewell" => {
   98     98   
                                /* JsonParserGenerator.kt:277 */
   99     99   
                                builder = builder.set_farewell(
  100         -
                                    /* JsonParserGenerator.kt:581 */
         100  +
                                    /* JsonParserGenerator.kt:563 */
  101    101   
                                    crate::protocol_serde::shape_farewell::de_farewell(
  102    102   
                                        tokens, _value,
  103    103   
                                    )?, /* JsonParserGenerator.kt:277 */
  104    104   
                                );
  105    105   
                                /* JsonParserGenerator.kt:267 */
  106    106   
                            }
  107    107   
                            /* JsonParserGenerator.kt:295 */
  108    108   
                            _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
  109    109   
                        }
  110         -
                        /* JsonParserGenerator.kt:723 */
         110  +
                        /* JsonParserGenerator.kt:705 */
  111    111   
                    }
  112         -
                    /* JsonParserGenerator.kt:732 */
         112  +
                    /* JsonParserGenerator.kt:714 */
  113    113   
                    other => {
  114    114   
                        return Err(
  115    115   
                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  116    116   
                                format!("expected object key or end object, found: {other:?}"),
  117    117   
                            ),
  118    118   
                        )
  119         -
                    } /* JsonParserGenerator.kt:722 */
         119  +
                    } /* JsonParserGenerator.kt:704 */
  120    120   
                }
  121         -
                /* JsonParserGenerator.kt:721 */
         121  +
                /* JsonParserGenerator.kt:703 */
  122    122   
            }
  123         -
            /* JsonParserGenerator.kt:577 */
         123  +
            /* JsonParserGenerator.kt:559 */
  124    124   
            Ok(Some(builder.build()))
  125         -
            /* JsonParserGenerator.kt:750 */
         125  +
            /* JsonParserGenerator.kt:732 */
  126    126   
        }
  127         -
        /* JsonParserGenerator.kt:759 */
         127  +
        /* JsonParserGenerator.kt:741 */
  128    128   
        _ => {
  129         -
            /* JsonParserGenerator.kt:760 */
         129  +
            /* JsonParserGenerator.kt:742 */
  130    130   
            Err(
  131    131   
                ::aws_smithy_json::deserialize::error::DeserializeError::custom(
  132    132   
                    "expected start object or null",
  133    133   
                ),
  134    134   
            )
  135         -
            /* JsonParserGenerator.kt:759 */
  136         -
        } /* JsonParserGenerator.kt:749 */
         135  +
            /* JsonParserGenerator.kt:741 */
         136  +
        } /* JsonParserGenerator.kt:731 */
  137    137   
    }
  138         -
    /* JsonParserGenerator.kt:553 */
         138  +
    /* JsonParserGenerator.kt:535 */
  139    139   
}

tmp-codegen-diff/codegen-server-test/rest_json-http0x/rust-server-codegen/src/protocol_serde/shape_dialog_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:581 */crate::protocol_serde::shape_dialog::de_dialog(tokens, _value)?
          40  +
                            /* JsonParserGenerator.kt:563 */crate::protocol_serde::shape_dialog::de_dialog(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   
}