Client Test

Client Test

rev. dfb5149b65b7bcc09edd15b8e071ad43b5ac5943 (ignoring whitespace)

Files changed:

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_list_of_kitchen_sinks.rs

@@ -1,1 +32,55 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_list_of_kitchen_sinks<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<crate::types::KitchenSink>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          13  +
            /* JsonParserGenerator.kt:407 */
   11     14   
            let mut items = Vec::new();
          15  +
            /* JsonParserGenerator.kt:408 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:409 */
   13     18   
                match tokens.peek() {
          19  +
                    /* JsonParserGenerator.kt:410 */
   14     20   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          21  +
                        /* JsonParserGenerator.kt:411 */
   15     22   
                        tokens.next().transpose().unwrap();
   16     23   
                        break;
          24  +
                        /* JsonParserGenerator.kt:410 */
   17     25   
                    }
          26  +
                    /* JsonParserGenerator.kt:413 */
   18     27   
                    _ => {
   19         -
                        let value = crate::protocol_serde::shape_kitchen_sink::de_kitchen_sink(tokens)?;
          28  +
                        /* JsonParserGenerator.kt:419 */
          29  +
                        let value =
          30  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_kitchen_sink::de_kitchen_sink(tokens)?
          31  +
                        /* JsonParserGenerator.kt:419 */;
          32  +
                        /* JsonParserGenerator.kt:422 */
   20     33   
                        if let Some(value) = value {
   21     34   
                            items.push(value);
   22     35   
                        }
          36  +
                        /* JsonParserGenerator.kt:413 */
          37  +
                    } /* JsonParserGenerator.kt:409 */
   23     38   
                }
          39  +
                /* JsonParserGenerator.kt:408 */
   24     40   
            }
   25         -
            }
          41  +
            /* JsonParserGenerator.kt:446 */
   26     42   
            Ok(Some(items))
          43  +
            /* JsonParserGenerator.kt:713 */
   27     44   
        }
   28         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          45  +
        /* JsonParserGenerator.kt:722 */
          46  +
        _ => {
          47  +
            /* JsonParserGenerator.kt:723 */
          48  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   29     49   
                "expected start array or null",
   30         -
        )),
          50  +
            ))
          51  +
            /* JsonParserGenerator.kt:722 */
          52  +
        } /* JsonParserGenerator.kt:712 */
   31     53   
    }
          54  +
    /* JsonParserGenerator.kt:398 */
   32     55   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_list_of_list_of_strings.rs

@@ -1,1 +32,55 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_list_of_list_of_strings<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<::std::vec::Vec<::std::string::String>>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          13  +
            /* JsonParserGenerator.kt:407 */
   11     14   
            let mut items = Vec::new();
          15  +
            /* JsonParserGenerator.kt:408 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:409 */
   13     18   
                match tokens.peek() {
          19  +
                    /* JsonParserGenerator.kt:410 */
   14     20   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          21  +
                        /* JsonParserGenerator.kt:411 */
   15     22   
                        tokens.next().transpose().unwrap();
   16     23   
                        break;
          24  +
                        /* JsonParserGenerator.kt:410 */
   17     25   
                    }
          26  +
                    /* JsonParserGenerator.kt:413 */
   18     27   
                    _ => {
   19         -
                        let value = crate::protocol_serde::shape_list_of_strings::de_list_of_strings(tokens)?;
          28  +
                        /* JsonParserGenerator.kt:419 */
          29  +
                        let value =
          30  +
                            /* JsonParserGenerator.kt:451 */crate::protocol_serde::shape_list_of_strings::de_list_of_strings(tokens)?
          31  +
                        /* JsonParserGenerator.kt:419 */;
          32  +
                        /* JsonParserGenerator.kt:422 */
   20     33   
                        if let Some(value) = value {
   21     34   
                            items.push(value);
   22     35   
                        }
          36  +
                        /* JsonParserGenerator.kt:413 */
          37  +
                    } /* JsonParserGenerator.kt:409 */
   23     38   
                }
          39  +
                /* JsonParserGenerator.kt:408 */
   24     40   
            }
   25         -
            }
          41  +
            /* JsonParserGenerator.kt:446 */
   26     42   
            Ok(Some(items))
          43  +
            /* JsonParserGenerator.kt:713 */
   27     44   
        }
   28         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          45  +
        /* JsonParserGenerator.kt:722 */
          46  +
        _ => {
          47  +
            /* JsonParserGenerator.kt:723 */
          48  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   29     49   
                "expected start array or null",
   30         -
        )),
          50  +
            ))
          51  +
            /* JsonParserGenerator.kt:722 */
          52  +
        } /* JsonParserGenerator.kt:712 */
   31     53   
    }
          54  +
    /* JsonParserGenerator.kt:398 */
   32     55   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_list_of_maps_of_strings.rs

@@ -1,1 +35,58 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_list_of_maps_of_strings<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::vec::Vec<::std::collections::HashMap<::std::string::String, ::std::string::String>>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          16  +
            /* JsonParserGenerator.kt:407 */
   14     17   
            let mut items = Vec::new();
          18  +
            /* JsonParserGenerator.kt:408 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:409 */
   16     21   
                match tokens.peek() {
          22  +
                    /* JsonParserGenerator.kt:410 */
   17     23   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          24  +
                        /* JsonParserGenerator.kt:411 */
   18     25   
                        tokens.next().transpose().unwrap();
   19     26   
                        break;
          27  +
                        /* JsonParserGenerator.kt:410 */
   20     28   
                    }
          29  +
                    /* JsonParserGenerator.kt:413 */
   21     30   
                    _ => {
   22         -
                        let value = crate::protocol_serde::shape_map_of_strings::de_map_of_strings(tokens)?;
          31  +
                        /* JsonParserGenerator.kt:419 */
          32  +
                        let value =
          33  +
                            /* JsonParserGenerator.kt:509 */crate::protocol_serde::shape_map_of_strings::de_map_of_strings(tokens)?
          34  +
                        /* JsonParserGenerator.kt:419 */;
          35  +
                        /* JsonParserGenerator.kt:422 */
   23     36   
                        if let Some(value) = value {
   24     37   
                            items.push(value);
   25     38   
                        }
          39  +
                        /* JsonParserGenerator.kt:413 */
          40  +
                    } /* JsonParserGenerator.kt:409 */
   26     41   
                }
          42  +
                /* JsonParserGenerator.kt:408 */
   27     43   
            }
   28         -
            }
          44  +
            /* JsonParserGenerator.kt:446 */
   29     45   
            Ok(Some(items))
          46  +
            /* JsonParserGenerator.kt:713 */
   30     47   
        }
   31         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          48  +
        /* JsonParserGenerator.kt:722 */
          49  +
        _ => {
          50  +
            /* JsonParserGenerator.kt:723 */
          51  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   32     52   
                "expected start array or null",
   33         -
        )),
          53  +
            ))
          54  +
            /* JsonParserGenerator.kt:722 */
          55  +
        } /* JsonParserGenerator.kt:712 */
   34     56   
    }
          57  +
    /* JsonParserGenerator.kt:398 */
   35     58   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_list_of_strings.rs

@@ -1,1 +34,59 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_list_of_strings<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<::std::string::String>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          13  +
            /* JsonParserGenerator.kt:407 */
   11     14   
            let mut items = Vec::new();
          15  +
            /* JsonParserGenerator.kt:408 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:409 */
   13     18   
                match tokens.peek() {
          19  +
                    /* JsonParserGenerator.kt:410 */
   14     20   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          21  +
                        /* JsonParserGenerator.kt:411 */
   15     22   
                        tokens.next().transpose().unwrap();
   16     23   
                        break;
          24  +
                        /* JsonParserGenerator.kt:410 */
   17     25   
                    }
          26  +
                    /* JsonParserGenerator.kt:413 */
   18     27   
                    _ => {
   19         -
                        let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   20         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   21         -
                            .transpose()?;
          28  +
                        /* JsonParserGenerator.kt:419 */
          29  +
                        let value =
          30  +
                            /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          31  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          32  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          33  +
                                /* JsonParserGenerator.kt:339 */)
          34  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          35  +
                        /* JsonParserGenerator.kt:419 */;
          36  +
                        /* JsonParserGenerator.kt:422 */
   22     37   
                        if let Some(value) = value {
   23     38   
                            items.push(value);
   24     39   
                        }
          40  +
                        /* JsonParserGenerator.kt:413 */
          41  +
                    } /* JsonParserGenerator.kt:409 */
   25     42   
                }
          43  +
                /* JsonParserGenerator.kt:408 */
   26     44   
            }
   27         -
            }
          45  +
            /* JsonParserGenerator.kt:446 */
   28     46   
            Ok(Some(items))
          47  +
            /* JsonParserGenerator.kt:713 */
   29     48   
        }
   30         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          49  +
        /* JsonParserGenerator.kt:722 */
          50  +
        _ => {
          51  +
            /* JsonParserGenerator.kt:723 */
          52  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   31     53   
                "expected start array or null",
   32         -
        )),
          54  +
            ))
          55  +
            /* JsonParserGenerator.kt:722 */
          56  +
        } /* JsonParserGenerator.kt:712 */
   33     57   
    }
          58  +
    /* JsonParserGenerator.kt:398 */
   34     59   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_list_of_structs.rs

@@ -1,1 +32,55 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:398 */
    2      3   
pub(crate) fn de_list_of_structs<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<::std::vec::Vec<crate::types::SimpleStruct>>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:712 */
    8     10   
    match tokens.next().transpose()? {
    9         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          11  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   10     12   
        Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
          13  +
            /* JsonParserGenerator.kt:407 */
   11     14   
            let mut items = Vec::new();
          15  +
            /* JsonParserGenerator.kt:408 */
   12     16   
            loop {
          17  +
                /* JsonParserGenerator.kt:409 */
   13     18   
                match tokens.peek() {
          19  +
                    /* JsonParserGenerator.kt:410 */
   14     20   
                    Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
          21  +
                        /* JsonParserGenerator.kt:411 */
   15     22   
                        tokens.next().transpose().unwrap();
   16     23   
                        break;
          24  +
                        /* JsonParserGenerator.kt:410 */
   17     25   
                    }
          26  +
                    /* JsonParserGenerator.kt:413 */
   18     27   
                    _ => {
   19         -
                        let value = crate::protocol_serde::shape_simple_struct::de_simple_struct(tokens)?;
          28  +
                        /* JsonParserGenerator.kt:419 */
          29  +
                        let value =
          30  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_simple_struct::de_simple_struct(tokens)?
          31  +
                        /* JsonParserGenerator.kt:419 */;
          32  +
                        /* JsonParserGenerator.kt:422 */
   20     33   
                        if let Some(value) = value {
   21     34   
                            items.push(value);
   22     35   
                        }
          36  +
                        /* JsonParserGenerator.kt:413 */
          37  +
                    } /* JsonParserGenerator.kt:409 */
   23     38   
                }
          39  +
                /* JsonParserGenerator.kt:408 */
   24     40   
            }
   25         -
            }
          41  +
            /* JsonParserGenerator.kt:446 */
   26     42   
            Ok(Some(items))
          43  +
            /* JsonParserGenerator.kt:713 */
   27     44   
        }
   28         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          45  +
        /* JsonParserGenerator.kt:722 */
          46  +
        _ => {
          47  +
            /* JsonParserGenerator.kt:723 */
          48  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   29     49   
                "expected start array or null",
   30         -
        )),
          50  +
            ))
          51  +
            /* JsonParserGenerator.kt:722 */
          52  +
        } /* JsonParserGenerator.kt:712 */
   31     53   
    }
          54  +
    /* JsonParserGenerator.kt:398 */
   32     55   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_map_of_kitchen_sinks.rs

@@ -1,1 +39,64 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:460 */
    2      3   
pub(crate) fn de_map_of_kitchen_sinks<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::collections::HashMap<::std::string::String, crate::types::KitchenSink>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = crate::protocol_serde::shape_kitchen_sink::de_kitchen_sink(tokens)?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_kitchen_sink::de_kitchen_sink(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:491 */
   21     35   
                        if let Some(value) = value {
   22     36   
                            map.insert(key, value);
   23     37   
                        }
          38  +
                        /* JsonParserGenerator.kt:686 */
   24     39   
                    }
          40  +
                    /* JsonParserGenerator.kt:695 */
   25     41   
                    other => {
   26     42   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     43   
                            "expected object key or end object, found: {:?}",
   28     44   
                            other
   29     45   
                        )))
          46  +
                    } /* JsonParserGenerator.kt:685 */
   30     47   
                }
          48  +
                /* JsonParserGenerator.kt:684 */
   31     49   
            }
   32         -
            }
          50  +
            /* JsonParserGenerator.kt:504 */
   33     51   
            Ok(Some(map))
          52  +
            /* JsonParserGenerator.kt:713 */
   34     53   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          54  +
        /* JsonParserGenerator.kt:722 */
          55  +
        _ => {
          56  +
            /* JsonParserGenerator.kt:723 */
          57  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36     58   
                "expected start object or null",
   37         -
        )),
          59  +
            ))
          60  +
            /* JsonParserGenerator.kt:722 */
          61  +
        } /* JsonParserGenerator.kt:712 */
   38     62   
    }
          63  +
    /* JsonParserGenerator.kt:460 */
   39     64   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_map_of_lists_of_strings.rs

@@ -1,1 +39,64 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:460 */
    2      3   
pub(crate) fn de_map_of_lists_of_strings<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::collections::HashMap<::std::string::String, ::std::vec::Vec<::std::string::String>>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = crate::protocol_serde::shape_list_of_strings::de_list_of_strings(tokens)?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:451 */crate::protocol_serde::shape_list_of_strings::de_list_of_strings(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:491 */
   21     35   
                        if let Some(value) = value {
   22     36   
                            map.insert(key, value);
   23     37   
                        }
          38  +
                        /* JsonParserGenerator.kt:686 */
   24     39   
                    }
          40  +
                    /* JsonParserGenerator.kt:695 */
   25     41   
                    other => {
   26     42   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     43   
                            "expected object key or end object, found: {:?}",
   28     44   
                            other
   29     45   
                        )))
          46  +
                    } /* JsonParserGenerator.kt:685 */
   30     47   
                }
          48  +
                /* JsonParserGenerator.kt:684 */
   31     49   
            }
   32         -
            }
          50  +
            /* JsonParserGenerator.kt:504 */
   33     51   
            Ok(Some(map))
          52  +
            /* JsonParserGenerator.kt:713 */
   34     53   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          54  +
        /* JsonParserGenerator.kt:722 */
          55  +
        _ => {
          56  +
            /* JsonParserGenerator.kt:723 */
          57  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36     58   
                "expected start object or null",
   37         -
        )),
          59  +
            ))
          60  +
            /* JsonParserGenerator.kt:722 */
          61  +
        } /* JsonParserGenerator.kt:712 */
   38     62   
    }
          63  +
    /* JsonParserGenerator.kt:460 */
   39     64   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_map_of_map_of_strings.rs

@@ -1,1 +39,64 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:460 */
    2      3   
pub(crate) fn de_map_of_map_of_strings<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::collections::HashMap<::std::string::String, ::std::collections::HashMap<::std::string::String, ::std::string::String>>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = crate::protocol_serde::shape_map_of_strings::de_map_of_strings(tokens)?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:509 */crate::protocol_serde::shape_map_of_strings::de_map_of_strings(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:491 */
   21     35   
                        if let Some(value) = value {
   22     36   
                            map.insert(key, value);
   23     37   
                        }
          38  +
                        /* JsonParserGenerator.kt:686 */
   24     39   
                    }
          40  +
                    /* JsonParserGenerator.kt:695 */
   25     41   
                    other => {
   26     42   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     43   
                            "expected object key or end object, found: {:?}",
   28     44   
                            other
   29     45   
                        )))
          46  +
                    } /* JsonParserGenerator.kt:685 */
   30     47   
                }
          48  +
                /* JsonParserGenerator.kt:684 */
   31     49   
            }
   32         -
            }
          50  +
            /* JsonParserGenerator.kt:504 */
   33     51   
            Ok(Some(map))
          52  +
            /* JsonParserGenerator.kt:713 */
   34     53   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          54  +
        /* JsonParserGenerator.kt:722 */
          55  +
        _ => {
          56  +
            /* JsonParserGenerator.kt:723 */
          57  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36     58   
                "expected start object or null",
   37         -
        )),
          59  +
            ))
          60  +
            /* JsonParserGenerator.kt:722 */
          61  +
        } /* JsonParserGenerator.kt:712 */
   38     62   
    }
          63  +
    /* JsonParserGenerator.kt:460 */
   39     64   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_map_of_strings.rs

@@ -1,1 +41,68 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:460 */
    2      3   
pub(crate) fn de_map_of_strings<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::collections::HashMap<::std::string::String, ::std::string::String>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   21         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   22         -
                            .transpose()?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
          33  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          34  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          35  +
                                /* JsonParserGenerator.kt:339 */)
          36  +
                            /* JsonParserGenerator.kt:354 */).transpose()?
          37  +
                        /* JsonParserGenerator.kt:474 */;
          38  +
                        /* JsonParserGenerator.kt:491 */
   23     39   
                        if let Some(value) = value {
   24     40   
                            map.insert(key, value);
   25     41   
                        }
          42  +
                        /* JsonParserGenerator.kt:686 */
   26     43   
                    }
          44  +
                    /* JsonParserGenerator.kt:695 */
   27     45   
                    other => {
   28     46   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   29     47   
                            "expected object key or end object, found: {:?}",
   30     48   
                            other
   31     49   
                        )))
          50  +
                    } /* JsonParserGenerator.kt:685 */
   32     51   
                }
          52  +
                /* JsonParserGenerator.kt:684 */
   33     53   
            }
   34         -
            }
          54  +
            /* JsonParserGenerator.kt:504 */
   35     55   
            Ok(Some(map))
          56  +
            /* JsonParserGenerator.kt:713 */
   36     57   
        }
   37         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          58  +
        /* JsonParserGenerator.kt:722 */
          59  +
        _ => {
          60  +
            /* JsonParserGenerator.kt:723 */
          61  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   38     62   
                "expected start object or null",
   39         -
        )),
          63  +
            ))
          64  +
            /* JsonParserGenerator.kt:722 */
          65  +
        } /* JsonParserGenerator.kt:712 */
   40     66   
    }
          67  +
    /* JsonParserGenerator.kt:460 */
   41     68   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_map_of_structs.rs

@@ -1,1 +39,64 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:460 */
    2      3   
pub(crate) fn de_map_of_structs<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<
    5      6   
    Option<::std::collections::HashMap<::std::string::String, crate::types::SimpleStruct>>,
    6      7   
    ::aws_smithy_json::deserialize::error::DeserializeError,
    7      8   
>
    8      9   
where
    9     10   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
   10     11   
{
          12  +
    /* JsonParserGenerator.kt:712 */
   11     13   
    match tokens.next().transpose()? {
   12         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
          14  +
        /* JsonParserGenerator.kt:713 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
   13     15   
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          16  +
            /* JsonParserGenerator.kt:469 */
   14     17   
            let mut map = ::std::collections::HashMap::new();
          18  +
            /* JsonParserGenerator.kt:684 */
   15     19   
            loop {
          20  +
                /* JsonParserGenerator.kt:685 */
   16     21   
                match tokens.next().transpose()? {
   17         -
                    Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          22  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   18     23   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
   19         -
                        let key = key.to_unescaped().map(|u| u.into_owned())?;
   20         -
                        let value = crate::protocol_serde::shape_simple_struct::de_simple_struct(tokens)?;
          24  +
                        /* JsonParserGenerator.kt:471 */
          25  +
                        let key =
          26  +
                            /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
          27  +
                                /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                            /* JsonParserGenerator.kt:339 */)
          29  +
                        /* JsonParserGenerator.kt:471 */?;
          30  +
                        /* JsonParserGenerator.kt:474 */
          31  +
                        let value =
          32  +
                            /* JsonParserGenerator.kt:544 */crate::protocol_serde::shape_simple_struct::de_simple_struct(tokens)?
          33  +
                        /* JsonParserGenerator.kt:474 */;
          34  +
                        /* JsonParserGenerator.kt:491 */
   21     35   
                        if let Some(value) = value {
   22     36   
                            map.insert(key, value);
   23     37   
                        }
          38  +
                        /* JsonParserGenerator.kt:686 */
   24     39   
                    }
          40  +
                    /* JsonParserGenerator.kt:695 */
   25     41   
                    other => {
   26     42   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   27     43   
                            "expected object key or end object, found: {:?}",
   28     44   
                            other
   29     45   
                        )))
          46  +
                    } /* JsonParserGenerator.kt:685 */
   30     47   
                }
          48  +
                /* JsonParserGenerator.kt:684 */
   31     49   
            }
   32         -
            }
          50  +
            /* JsonParserGenerator.kt:504 */
   33     51   
            Ok(Some(map))
          52  +
            /* JsonParserGenerator.kt:713 */
   34     53   
        }
   35         -
        _ => Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
          54  +
        /* JsonParserGenerator.kt:722 */
          55  +
        _ => {
          56  +
            /* JsonParserGenerator.kt:723 */
          57  +
            Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   36     58   
                "expected start object or null",
   37         -
        )),
          59  +
            ))
          60  +
            /* JsonParserGenerator.kt:722 */
          61  +
        } /* JsonParserGenerator.kt:712 */
   38     62   
    }
          63  +
    /* JsonParserGenerator.kt:460 */
   39     64   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_my_union.rs

@@ -1,1 +174,353 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:551 */
    2      3   
pub(crate) fn de_my_union<'a, I>(
    3      4   
    tokens: &mut ::std::iter::Peekable<I>,
    4      5   
) -> ::std::result::Result<Option<crate::types::MyUnion>, ::aws_smithy_json::deserialize::error::DeserializeError>
    5      6   
where
    6      7   
    I: Iterator<Item = Result<::aws_smithy_json::deserialize::Token<'a>, ::aws_smithy_json::deserialize::error::DeserializeError>>,
    7      8   
{
           9  +
    /* JsonParserGenerator.kt:565 */
    8     10   
    let mut variant = None;
          11  +
    /* JsonParserGenerator.kt:567 */
    9     12   
    match tokens.next().transpose()? {
   10         -
        Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => return Ok(None),
   11         -
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => loop {
          13  +
        /* JsonParserGenerator.kt:568 */ Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => return Ok(None),
          14  +
        Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
          15  +
            /* JsonParserGenerator.kt:684 */
          16  +
            loop {
          17  +
                /* JsonParserGenerator.kt:685 */
   12     18   
                match tokens.next().transpose()? {
   13         -
                Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          19  +
                    /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   14     20   
                    Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          21  +
                        /* JsonParserGenerator.kt:576 */
   15     22   
                        if let ::std::option::Option::Some(::std::result::Result::Ok(::aws_smithy_json::deserialize::Token::ValueNull { .. })) =
   16     23   
                            tokens.peek()
   17     24   
                        {
   18     25   
                            let _ = tokens.next().expect("peek returned a token")?;
   19     26   
                            continue;
   20     27   
                        }
          28  +
                        /* JsonParserGenerator.kt:585 */
   21     29   
                        let key = key.to_unescaped()?;
   22     30   
                        if key == "__type" {
   23     31   
                            ::aws_smithy_json::deserialize::token::skip_value(tokens)?;
   24     32   
                            continue;
   25     33   
                        }
   26     34   
                        if variant.is_some() {
   27     35   
                            return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   28     36   
                                "encountered mixed variants in union",
   29     37   
                            ));
   30     38   
                        }
          39  +
                        /* JsonParserGenerator.kt:598 */
   31     40   
                        variant = match key.as_ref() {
   32         -
                        "stringValue" => Some(crate::types::MyUnion::StringValue(
          41  +
                            /* JsonParserGenerator.kt:601 */
          42  +
                            "stringValue" => {
          43  +
                                /* JsonParserGenerator.kt:611 */
          44  +
                                Some(crate::types::MyUnion::StringValue(
          45  +
                                    /* JsonParserGenerator.kt:354 */
   33     46   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   34         -
                                .map(|s| s.to_unescaped().map(|u| u.into_owned()))
          47  +
                                        .map(|s|
          48  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          49  +
                                            /* JsonParserGenerator.kt:348 */u.into_owned()
          50  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
   35     51   
                                        .transpose()?
          52  +
                                        /* JsonParserGenerator.kt:670 */
   36     53   
                                        .ok_or_else(|| {
   37     54   
                                            ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'stringValue' cannot be null")
   38         -
                                })?,
   39         -
                        )),
   40         -
                        "booleanValue" => Some(crate::types::MyUnion::BooleanValue(
   41         -
                            ::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?.ok_or_else(|| {
          55  +
                                        })?, /* JsonParserGenerator.kt:611 */
          56  +
                                ))
          57  +
                                /* JsonParserGenerator.kt:601 */
          58  +
                            }
          59  +
                            /* JsonParserGenerator.kt:601 */
          60  +
                            "booleanValue" => {
          61  +
                                /* JsonParserGenerator.kt:611 */
          62  +
                                Some(crate::types::MyUnion::BooleanValue(
          63  +
                                    /* JsonParserGenerator.kt:298 */
          64  +
                                    ::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?
          65  +
                                        /* JsonParserGenerator.kt:670 */
          66  +
                                        .ok_or_else(|| {
   42     67   
                                            ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'booleanValue' cannot be null")
   43         -
                            })?,
   44         -
                        )),
   45         -
                        "numberValue" => Some(crate::types::MyUnion::NumberValue(
          68  +
                                        })?, /* JsonParserGenerator.kt:611 */
          69  +
                                ))
          70  +
                                /* JsonParserGenerator.kt:601 */
          71  +
                            }
          72  +
                            /* JsonParserGenerator.kt:601 */
          73  +
                            "numberValue" => {
          74  +
                                /* JsonParserGenerator.kt:611 */
          75  +
                                Some(crate::types::MyUnion::NumberValue(
          76  +
                                    /* JsonParserGenerator.kt:365 */
   46     77   
                                    ::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
   47     78   
                                        .map(i32::try_from)
   48     79   
                                        .transpose()?
          80  +
                                        /* JsonParserGenerator.kt:670 */
   49     81   
                                        .ok_or_else(|| {
   50     82   
                                            ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'numberValue' cannot be null")
   51         -
                                })?,
   52         -
                        )),
   53         -
                        "blobValue" => Some(crate::types::MyUnion::BlobValue(
   54         -
                            ::aws_smithy_json::deserialize::token::expect_blob_or_null(tokens.next())?.ok_or_else(|| {
          83  +
                                        })?, /* JsonParserGenerator.kt:611 */
          84  +
                                ))
          85  +
                                /* JsonParserGenerator.kt:601 */
          86  +
                            }
          87  +
                            /* JsonParserGenerator.kt:601 */
          88  +
                            "blobValue" => {
          89  +
                                /* JsonParserGenerator.kt:611 */
          90  +
                                Some(crate::types::MyUnion::BlobValue(
          91  +
                                    /* JsonParserGenerator.kt:326 */
          92  +
                                    ::aws_smithy_json::deserialize::token::expect_blob_or_null(tokens.next())?
          93  +
                                        /* JsonParserGenerator.kt:670 */
          94  +
                                        .ok_or_else(|| {
   55     95   
                                            ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'blobValue' cannot be null")
   56         -
                            })?,
   57         -
                        )),
   58         -
                        "timestampValue" => Some(crate::types::MyUnion::TimestampValue(
          96  +
                                        })?, /* JsonParserGenerator.kt:611 */
          97  +
                                ))
          98  +
                                /* JsonParserGenerator.kt:601 */
          99  +
                            }
         100  +
                            /* JsonParserGenerator.kt:601 */
         101  +
                            "timestampValue" => {
         102  +
                                /* JsonParserGenerator.kt:611 */
         103  +
                                Some(crate::types::MyUnion::TimestampValue(
         104  +
                                    /* JsonParserGenerator.kt:384 */
   59    105   
                                    ::aws_smithy_json::deserialize::token::expect_timestamp_or_null(
   60    106   
                                        tokens.next(),
   61    107   
                                        ::aws_smithy_types::date_time::Format::EpochSeconds,
   62    108   
                                    )?
         109  +
                                    /* JsonParserGenerator.kt:670 */
   63    110   
                                    .ok_or_else(|| {
   64    111   
                                        ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'timestampValue' cannot be null")
   65         -
                            })?,
   66         -
                        )),
   67         -
                        "enumValue" => Some(crate::types::MyUnion::EnumValue(
         112  +
                                    })?, /* JsonParserGenerator.kt:611 */
         113  +
                                ))
         114  +
                                /* JsonParserGenerator.kt:601 */
         115  +
                            }
         116  +
                            /* JsonParserGenerator.kt:601 */
         117  +
                            "enumValue" => {
         118  +
                                /* JsonParserGenerator.kt:611 */
         119  +
                                Some(crate::types::MyUnion::EnumValue(
         120  +
                                    /* JsonParserGenerator.kt:354 */
   68    121   
                                    ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   69         -
                                .map(|s| s.to_unescaped().map(|u| crate::types::FooEnum::from(u.as_ref())))
         122  +
                                        .map(|s|
         123  +
                                        /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
         124  +
                                            /* JsonParserGenerator.kt:345 */crate::types::FooEnum::from(u.as_ref())
         125  +
                                        /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
   70    126   
                                        .transpose()?
         127  +
                                        /* JsonParserGenerator.kt:670 */
   71    128   
                                        .ok_or_else(|| {
   72    129   
                                            ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'enumValue' cannot be null")
   73         -
                                })?,
   74         -
                        )),
   75         -
                        "listValue" => Some(crate::types::MyUnion::ListValue(
   76         -
                            crate::protocol_serde::shape_string_list::de_string_list(tokens)?.ok_or_else(|| {
         130  +
                                        })?, /* JsonParserGenerator.kt:611 */
         131  +
                                ))
         132  +
                                /* JsonParserGenerator.kt:601 */
         133  +
                            }
         134  +
                            /* JsonParserGenerator.kt:601 */
         135  +
                            "listValue" => {
         136  +
                                /* JsonParserGenerator.kt:611 */
         137  +
                                Some(crate::types::MyUnion::ListValue(
         138  +
                                    /* JsonParserGenerator.kt:451 */
         139  +
                                    crate::protocol_serde::shape_string_list::de_string_list(tokens)?
         140  +
                                        /* JsonParserGenerator.kt:670 */
         141  +
                                        .ok_or_else(|| {
   77    142   
                                            ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'listValue' cannot be null")
   78         -
                            })?,
   79         -
                        )),
   80         -
                        "mapValue" => Some(crate::types::MyUnion::MapValue(
   81         -
                            crate::protocol_serde::shape_string_map::de_string_map(tokens)?.ok_or_else(|| {
         143  +
                                        })?, /* JsonParserGenerator.kt:611 */
         144  +
                                ))
         145  +
                                /* JsonParserGenerator.kt:601 */
         146  +
                            }
         147  +
                            /* JsonParserGenerator.kt:601 */
         148  +
                            "mapValue" => {
         149  +
                                /* JsonParserGenerator.kt:611 */
         150  +
                                Some(crate::types::MyUnion::MapValue(
         151  +
                                    /* JsonParserGenerator.kt:509 */
         152  +
                                    crate::protocol_serde::shape_string_map::de_string_map(tokens)?
         153  +
                                        /* JsonParserGenerator.kt:670 */
         154  +
                                        .ok_or_else(|| {
   82    155   
                                            ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'mapValue' cannot be null")
   83         -
                            })?,
   84         -
                        )),
   85         -
                        "structureValue" => Some(crate::types::MyUnion::StructureValue(
   86         -
                            crate::protocol_serde::shape_greeting_struct::de_greeting_struct(tokens)?.ok_or_else(|| {
   87         -
                                ::aws_smithy_json::deserialize::error::DeserializeError::custom("value for 'structureValue' cannot be null")
   88         -
                            })?,
   89         -
                        )),
         156  +
                                        })?, /* JsonParserGenerator.kt:611 */
         157  +
                                ))
         158  +
                                /* JsonParserGenerator.kt:601 */
         159  +
                            }
         160  +
                            /* JsonParserGenerator.kt:601 */
         161  +
                            "structureValue" => {
         162  +
                                /* JsonParserGenerator.kt:611 */
         163  +
                                Some(crate::types::MyUnion::StructureValue(
         164  +
                                    /* JsonParserGenerator.kt:544 */
         165  +
                                    crate::protocol_serde::shape_greeting_struct::de_greeting_struct(tokens)?
         166  +
                                        /* JsonParserGenerator.kt:670 */
         167  +
                                        .ok_or_else(|| {
         168  +
                                            ::aws_smithy_json::deserialize::error::DeserializeError::custom(
         169  +
                                                "value for 'structureValue' cannot be null",
         170  +
                                            )
         171  +
                                        })?, /* JsonParserGenerator.kt:611 */
         172  +
                                ))
         173  +
                                /* JsonParserGenerator.kt:601 */
         174  +
                            }
         175  +
                            /* JsonParserGenerator.kt:621 */
   90    176   
                            _ => {
   91    177   
                                ::aws_smithy_json::deserialize::token::skip_value(tokens)?;
   92    178   
                                Some(crate::types::MyUnion::Unknown)
   93         -
                        }
         179  +
                            } /* JsonParserGenerator.kt:598 */
   94    180   
                        };
         181  +
                        /* JsonParserGenerator.kt:686 */
   95    182   
                    }
         183  +
                    /* JsonParserGenerator.kt:695 */
   96    184   
                    other => {
   97    185   
                        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   98    186   
                            "expected object key or end object, found: {:?}",
   99    187   
                            other
  100    188   
                        )))
         189  +
                    } /* JsonParserGenerator.kt:685 */
         190  +
                }
         191  +
                /* JsonParserGenerator.kt:684 */
  101    192   
            }
         193  +
            /* JsonParserGenerator.kt:568 */
  102    194   
        }
  103         -
        },
         195  +
        /* JsonParserGenerator.kt:642 */
  104    196   
        _ => {
  105    197   
            return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
  106    198   
                "expected start object or null",
  107    199   
            ))
         200  +
        } /* JsonParserGenerator.kt:567 */
  108    201   
    }
  109         -
    }
         202  +
    /* JsonParserGenerator.kt:649 */
  110    203   
    if variant.is_none() {
  111    204   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
  112    205   
            "Union did not contain a valid variant.",
  113    206   
        ));
  114    207   
    }
         208  +
    /* JsonParserGenerator.kt:657 */
  115    209   
    Ok(variant)
         210  +
    /* JsonParserGenerator.kt:551 */
  116    211   
}
  117    212   
         213  +
/* JsonSerializerGenerator.kt:547 */
  118    214   
pub fn ser_my_union(
  119    215   
    object_2: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
  120    216   
    input: &crate::types::MyUnion,
  121    217   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
         218  +
    /* JsonSerializerGenerator.kt:556 */
  122    219   
    match input {
         220  +
        /* JsonSerializerGenerator.kt:564 */
  123    221   
        crate::types::MyUnion::StringValue(inner) => {
         222  +
            /* SerializerUtil.kt:42 */
         223  +
            {
         224  +
                /* JsonSerializerGenerator.kt:423 */
  124    225   
                object_2.key("stringValue").string(inner.as_str());
         226  +
                /* SerializerUtil.kt:42 */
         227  +
            }
         228  +
            /* JsonSerializerGenerator.kt:564 */
  125    229   
        }
         230  +
        /* JsonSerializerGenerator.kt:564 */
  126    231   
        crate::types::MyUnion::BooleanValue(inner) => {
         232  +
            /* SerializerUtil.kt:42 */
         233  +
            {
         234  +
                /* JsonSerializerGenerator.kt:424 */
  127    235   
                object_2.key("booleanValue").boolean(*inner);
         236  +
                /* SerializerUtil.kt:42 */
         237  +
            }
         238  +
            /* JsonSerializerGenerator.kt:564 */
  128    239   
        }
         240  +
        /* JsonSerializerGenerator.kt:564 */
  129    241   
        crate::types::MyUnion::NumberValue(inner) => {
         242  +
            /* SerializerUtil.kt:42 */
         243  +
            {
         244  +
                /* JsonSerializerGenerator.kt:432 */
  130    245   
                object_2.key("numberValue").number(
  131    246   
                    #[allow(clippy::useless_conversion)]
  132    247   
                    ::aws_smithy_types::Number::NegInt((*inner).into()),
  133    248   
                );
         249  +
                /* SerializerUtil.kt:42 */
  134    250   
            }
         251  +
            /* JsonSerializerGenerator.kt:564 */
         252  +
        }
         253  +
        /* JsonSerializerGenerator.kt:564 */
  135    254   
        crate::types::MyUnion::BlobValue(inner) => {
         255  +
            /* SerializerUtil.kt:42 */
         256  +
            {
         257  +
                /* JsonSerializerGenerator.kt:439 */
  136    258   
                object_2.key("blobValue").string_unchecked(&::aws_smithy_types::base64::encode(inner));
         259  +
                /* SerializerUtil.kt:42 */
  137    260   
            }
         261  +
            /* JsonSerializerGenerator.kt:564 */
         262  +
        }
         263  +
        /* JsonSerializerGenerator.kt:564 */
  138    264   
        crate::types::MyUnion::TimestampValue(inner) => {
         265  +
            /* SerializerUtil.kt:42 */
         266  +
            {
         267  +
                /* JsonSerializerGenerator.kt:448 */
  139    268   
                object_2
  140    269   
                    .key("timestampValue")
  141    270   
                    .date_time(inner, ::aws_smithy_types::date_time::Format::EpochSeconds)?;
         271  +
                /* SerializerUtil.kt:42 */
         272  +
            }
         273  +
            /* JsonSerializerGenerator.kt:564 */
  142    274   
        }
         275  +
        /* JsonSerializerGenerator.kt:564 */
  143    276   
        crate::types::MyUnion::EnumValue(inner) => {
         277  +
            /* SerializerUtil.kt:42 */
         278  +
            {
         279  +
                /* JsonSerializerGenerator.kt:423 */
  144    280   
                object_2.key("enumValue").string(inner.as_str());
         281  +
                /* SerializerUtil.kt:42 */
         282  +
            }
         283  +
            /* JsonSerializerGenerator.kt:564 */
  145    284   
        }
         285  +
        /* JsonSerializerGenerator.kt:564 */
  146    286   
        crate::types::MyUnion::ListValue(inner) => {
         287  +
            /* SerializerUtil.kt:42 */
         288  +
            {
         289  +
                /* JsonSerializerGenerator.kt:484 */
  147    290   
                let mut array_1 = object_2.key("listValue").start_array();
         291  +
                /* JsonSerializerGenerator.kt:524 */
  148    292   
                for item_2 in inner {
         293  +
                    /* SerializerUtil.kt:42 */
  149    294   
                    {
         295  +
                        /* JsonSerializerGenerator.kt:423 */
  150    296   
                        array_1.value().string(item_2.as_str());
         297  +
                        /* SerializerUtil.kt:42 */
  151    298   
                    }
         299  +
                    /* JsonSerializerGenerator.kt:524 */
  152    300   
                }
         301  +
                /* JsonSerializerGenerator.kt:486 */
  153    302   
                array_1.finish();
         303  +
                /* SerializerUtil.kt:42 */
  154    304   
            }
         305  +
            /* JsonSerializerGenerator.kt:564 */
         306  +
        }
         307  +
        /* JsonSerializerGenerator.kt:564 */
  155    308   
        crate::types::MyUnion::MapValue(inner) => {
         309  +
            /* SerializerUtil.kt:42 */
         310  +
            {
         311  +
                /* JsonSerializerGenerator.kt:495 */
  156    312   
                #[allow(unused_mut)]
         313  +
                /* JsonSerializerGenerator.kt:496 */
  157    314   
                let mut object_3 = object_2.key("mapValue").start_object();
         315  +
                /* JsonSerializerGenerator.kt:537 */
  158    316   
                for (key_4, value_5) in inner {
         317  +
                    /* SerializerUtil.kt:42 */
  159    318   
                    {
         319  +
                        /* JsonSerializerGenerator.kt:423 */
  160    320   
                        object_3.key(key_4.as_str()).string(value_5.as_str());
         321  +
                        /* SerializerUtil.kt:42 */
  161    322   
                    }
         323  +
                    /* JsonSerializerGenerator.kt:537 */
  162    324   
                }
         325  +
                /* JsonSerializerGenerator.kt:515 */
  163    326   
                object_3.finish();
         327  +
                /* SerializerUtil.kt:42 */
         328  +
            }
         329  +
            /* JsonSerializerGenerator.kt:564 */
  164    330   
        }
         331  +
        /* JsonSerializerGenerator.kt:564 */
  165    332   
        crate::types::MyUnion::StructureValue(inner) => {
         333  +
            /* SerializerUtil.kt:42 */
         334  +
            {
         335  +
                /* JsonSerializerGenerator.kt:495 */
  166    336   
                #[allow(unused_mut)]
         337  +
                /* JsonSerializerGenerator.kt:496 */
  167    338   
                let mut object_6 = object_2.key("structureValue").start_object();
         339  +
                /* JsonSerializerGenerator.kt:375 */
  168    340   
                crate::protocol_serde::shape_greeting_struct::ser_greeting_struct(&mut object_6, inner)?;
         341  +
                /* JsonSerializerGenerator.kt:515 */
  169    342   
                object_6.finish();
         343  +
                /* SerializerUtil.kt:42 */
         344  +
            }
         345  +
            /* JsonSerializerGenerator.kt:564 */
  170    346   
        }
  171         -
        crate::types::MyUnion::Unknown => return Err(::aws_smithy_types::error::operation::SerializationError::unknown_variant("MyUnion")),
         347  +
        /* JsonSerializerGenerator.kt:569 */
         348  +
        crate::types::MyUnion::Unknown => return Err(::aws_smithy_types::error::operation::SerializationError::unknown_variant("MyUnion")), /* JsonSerializerGenerator.kt:556 */
  172    349   
    }
         350  +
    /* JsonSerializerGenerator.kt:576 */
  173    351   
    Ok(())
         352  +
    /* JsonSerializerGenerator.kt:547 */
  174    353   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_null_operation.rs

@@ -1,1 +77,123 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_null_operation_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<crate::operation::null_operation::NullOperationOutput, crate::operation::null_operation::NullOperationError> {
          10  +
    /* RustType.kt:516 */
    8     11   
    #[allow(unused_mut)]
          12  +
    /* ProtocolParserGenerator.kt:106 */
    9     13   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   10     14   
        .map_err(crate::operation::null_operation::NullOperationError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::null_operation::NullOperationError::generic(generic))
          19  +
    /* ProtocolParserGenerator.kt:99 */
   13     20   
}
   14     21   
          22  +
/* RustType.kt:516 */
   15     23   
#[allow(clippy::unnecessary_wraps)]
          24  +
/* ProtocolParserGenerator.kt:71 */
   16     25   
pub fn de_null_operation_http_response(
   17     26   
    _response_status: u16,
   18     27   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   19     28   
    _response_body: &[u8],
   20     29   
) -> std::result::Result<crate::operation::null_operation::NullOperationOutput, crate::operation::null_operation::NullOperationError> {
          30  +
    /* ProtocolParserGenerator.kt:77 */
   21     31   
    Ok({
          32  +
        /* RustType.kt:516 */
   22     33   
        #[allow(unused_mut)]
          34  +
        /* ProtocolParserGenerator.kt:240 */
   23     35   
        let mut output = crate::operation::null_operation::builders::NullOperationOutputBuilder::default();
          36  +
        /* ProtocolParserGenerator.kt:247 */
   24     37   
        output = crate::protocol_serde::shape_null_operation::de_null_operation(_response_body, output)
   25     38   
            .map_err(crate::operation::null_operation::NullOperationError::unhandled)?;
          39  +
        /* ClientBuilderInstantiator.kt:56 */
   26     40   
        output.build()
          41  +
        /* ProtocolParserGenerator.kt:77 */
   27     42   
    })
          43  +
    /* ProtocolParserGenerator.kt:71 */
   28     44   
}
   29     45   
          46  +
/* JsonSerializerGenerator.kt:287 */
   30     47   
pub fn ser_null_operation_input(
   31     48   
    input: &crate::operation::null_operation::NullOperationInput,
   32     49   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          50  +
    /* JsonSerializerGenerator.kt:291 */
   33     51   
    let mut out = String::new();
          52  +
    /* JsonSerializerGenerator.kt:292 */
   34     53   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          54  +
    /* JsonSerializerGenerator.kt:375 */
   35     55   
    crate::protocol_serde::shape_null_operation_input::ser_null_operation_input_input(&mut object, input)?;
          56  +
    /* JsonSerializerGenerator.kt:295 */
   36     57   
    object.finish();
          58  +
    /* JsonSerializerGenerator.kt:296 */
   37     59   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          60  +
    /* JsonSerializerGenerator.kt:287 */
   38     61   
}
   39     62   
          63  +
/* JsonParserGenerator.kt:148 */
   40     64   
pub(crate) fn de_null_operation(
   41     65   
    value: &[u8],
   42     66   
    mut builder: crate::operation::null_operation::builders::NullOperationOutputBuilder,
   43     67   
) -> ::std::result::Result<
   44     68   
    crate::operation::null_operation::builders::NullOperationOutputBuilder,
   45     69   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   46     70   
> {
          71  +
    /* JsonParserGenerator.kt:153 */
   47     72   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   48     73   
    let tokens = &mut tokens_owned;
   49     74   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          75  +
    /* JsonParserGenerator.kt:684 */
   50     76   
    loop {
          77  +
        /* JsonParserGenerator.kt:685 */
   51     78   
        match tokens.next().transpose()? {
   52         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   53         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          79  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          80  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          81  +
                /* JsonParserGenerator.kt:260 */
          82  +
                match key.to_unescaped()?.as_ref() {
          83  +
                    /* JsonParserGenerator.kt:262 */
   54     84   
                    "string" => {
          85  +
                        /* JsonParserGenerator.kt:265 */
   55     86   
                        builder = builder.set_string(
          87  +
                            /* JsonParserGenerator.kt:354 */
   56     88   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   57         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   58         -
                            .transpose()?,
          89  +
                                .map(|s|
          90  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          91  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          92  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          93  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   59     94   
                        );
          95  +
                        /* JsonParserGenerator.kt:262 */
   60     96   
                    }
   61         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   62         -
            },
          97  +
                    /* JsonParserGenerator.kt:290 */
          98  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
          99  +
                }
         100  +
                /* JsonParserGenerator.kt:686 */
         101  +
            }
         102  +
            /* JsonParserGenerator.kt:695 */
   63    103   
            other => {
   64    104   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   65    105   
                    "expected object key or end object, found: {:?}",
   66    106   
                    other
   67    107   
                )))
         108  +
            } /* JsonParserGenerator.kt:685 */
   68    109   
        }
         110  +
        /* JsonParserGenerator.kt:684 */
   69    111   
    }
   70         -
    }
         112  +
    /* JsonParserGenerator.kt:250 */
   71    113   
    if tokens.next().is_some() {
         114  +
        /* JsonParserGenerator.kt:251 */
   72    115   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   73    116   
            "found more JSON tokens after completing parsing",
   74    117   
        ));
         118  +
        /* JsonParserGenerator.kt:250 */
   75    119   
    }
         120  +
    /* JsonParserGenerator.kt:163 */
   76    121   
    Ok(builder)
         122  +
    /* JsonParserGenerator.kt:148 */
   77    123   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_null_operation_input.rs

@@ -1,1 +10,16 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_null_operation_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::null_operation::NullOperationInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.string {
           9  +
        /* JsonSerializerGenerator.kt:423 */
    7     10   
        object.key("string").string(var_1.as_str());
          11  +
        /* JsonSerializerGenerator.kt:382 */
    8     12   
    }
          13  +
    /* JsonSerializerGenerator.kt:372 */
    9     14   
    Ok(())
          15  +
    /* JsonSerializerGenerator.kt:358 */
   10     16   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_operation_with_optional_input_output.rs

@@ -1,1 +86,132 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_operation_with_optional_input_output_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<
    8     10   
    crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputOutput,
    9     11   
    crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputError,
   10     12   
> {
          13  +
    /* RustType.kt:516 */
   11     14   
    #[allow(unused_mut)]
          15  +
    /* ProtocolParserGenerator.kt:106 */
   12     16   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   13     17   
        .map_err(crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputError::generic(generic))
          22  +
    /* ProtocolParserGenerator.kt:99 */
   16     23   
}
   17     24   
          25  +
/* RustType.kt:516 */
   18     26   
#[allow(clippy::unnecessary_wraps)]
          27  +
/* ProtocolParserGenerator.kt:71 */
   19     28   
pub fn de_operation_with_optional_input_output_http_response(
   20     29   
    _response_status: u16,
   21     30   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   22     31   
    _response_body: &[u8],
   23     32   
) -> std::result::Result<
   24     33   
    crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputOutput,
   25     34   
    crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputError,
   26     35   
> {
          36  +
    /* ProtocolParserGenerator.kt:77 */
   27     37   
    Ok({
          38  +
        /* RustType.kt:516 */
   28     39   
        #[allow(unused_mut)]
          40  +
        /* ProtocolParserGenerator.kt:240 */
   29     41   
        let mut output = crate::operation::operation_with_optional_input_output::builders::OperationWithOptionalInputOutputOutputBuilder::default();
          42  +
        /* ProtocolParserGenerator.kt:247 */
   30     43   
        output = crate::protocol_serde::shape_operation_with_optional_input_output::de_operation_with_optional_input_output(_response_body, output)
   31     44   
            .map_err(crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputError::unhandled)?;
          45  +
        /* ClientBuilderInstantiator.kt:56 */
   32     46   
        output.build()
          47  +
        /* ProtocolParserGenerator.kt:77 */
   33     48   
    })
          49  +
    /* ProtocolParserGenerator.kt:71 */
   34     50   
}
   35     51   
          52  +
/* JsonSerializerGenerator.kt:287 */
   36     53   
pub fn ser_operation_with_optional_input_output_input(
   37     54   
    input: &crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputInput,
   38     55   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          56  +
    /* JsonSerializerGenerator.kt:291 */
   39     57   
    let mut out = String::new();
          58  +
    /* JsonSerializerGenerator.kt:292 */
   40     59   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          60  +
    /* JsonSerializerGenerator.kt:375 */
   41     61   
    crate::protocol_serde::shape_operation_with_optional_input_output_input::ser_operation_with_optional_input_output_input_input(
   42     62   
        &mut object,
   43     63   
        input,
   44     64   
    )?;
          65  +
    /* JsonSerializerGenerator.kt:295 */
   45     66   
    object.finish();
          67  +
    /* JsonSerializerGenerator.kt:296 */
   46     68   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          69  +
    /* JsonSerializerGenerator.kt:287 */
   47     70   
}
   48     71   
          72  +
/* JsonParserGenerator.kt:148 */
   49     73   
pub(crate) fn de_operation_with_optional_input_output(
   50     74   
    value: &[u8],
   51     75   
    mut builder: crate::operation::operation_with_optional_input_output::builders::OperationWithOptionalInputOutputOutputBuilder,
   52     76   
) -> ::std::result::Result<
   53     77   
    crate::operation::operation_with_optional_input_output::builders::OperationWithOptionalInputOutputOutputBuilder,
   54     78   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   55     79   
> {
          80  +
    /* JsonParserGenerator.kt:153 */
   56     81   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   57     82   
    let tokens = &mut tokens_owned;
   58     83   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          84  +
    /* JsonParserGenerator.kt:684 */
   59     85   
    loop {
          86  +
        /* JsonParserGenerator.kt:685 */
   60     87   
        match tokens.next().transpose()? {
   61         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   62         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          88  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          89  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          90  +
                /* JsonParserGenerator.kt:260 */
          91  +
                match key.to_unescaped()?.as_ref() {
          92  +
                    /* JsonParserGenerator.kt:262 */
   63     93   
                    "Value" => {
          94  +
                        /* JsonParserGenerator.kt:265 */
   64     95   
                        builder = builder.set_value(
          96  +
                            /* JsonParserGenerator.kt:354 */
   65     97   
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   66         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   67         -
                            .transpose()?,
          98  +
                                .map(|s|
          99  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
         100  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
         101  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
         102  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
   68    103   
                        );
         104  +
                        /* JsonParserGenerator.kt:262 */
   69    105   
                    }
   70         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   71         -
            },
         106  +
                    /* JsonParserGenerator.kt:290 */
         107  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
         108  +
                }
         109  +
                /* JsonParserGenerator.kt:686 */
         110  +
            }
         111  +
            /* JsonParserGenerator.kt:695 */
   72    112   
            other => {
   73    113   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   74    114   
                    "expected object key or end object, found: {:?}",
   75    115   
                    other
   76    116   
                )))
         117  +
            } /* JsonParserGenerator.kt:685 */
   77    118   
        }
         119  +
        /* JsonParserGenerator.kt:684 */
   78    120   
    }
   79         -
    }
         121  +
    /* JsonParserGenerator.kt:250 */
   80    122   
    if tokens.next().is_some() {
         123  +
        /* JsonParserGenerator.kt:251 */
   81    124   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   82    125   
            "found more JSON tokens after completing parsing",
   83    126   
        ));
         127  +
        /* JsonParserGenerator.kt:250 */
   84    128   
    }
         129  +
    /* JsonParserGenerator.kt:163 */
   85    130   
    Ok(builder)
         131  +
    /* JsonParserGenerator.kt:148 */
   86    132   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_operation_with_optional_input_output_input.rs

@@ -1,1 +10,16 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_operation_with_optional_input_output_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::operation_with_optional_input_output::OperationWithOptionalInputOutputInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.value {
           9  +
        /* JsonSerializerGenerator.kt:423 */
    7     10   
        object.key("Value").string(var_1.as_str());
          11  +
        /* JsonSerializerGenerator.kt:382 */
    8     12   
    }
          13  +
    /* JsonSerializerGenerator.kt:372 */
    9     14   
    Ok(())
          15  +
    /* JsonSerializerGenerator.kt:358 */
   10     16   
}

tmp-codegen-diff/codegen-client-test/json_rpc11/rust-client-codegen/src/protocol_serde/shape_put_and_get_inline_documents.rs

@@ -1,1 +81,126 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* RustType.kt:516 */
    2      3   
#[allow(clippy::unnecessary_wraps)]
           4  +
/* ProtocolParserGenerator.kt:99 */
    3      5   
pub fn de_put_and_get_inline_documents_http_error(
    4      6   
    _response_status: u16,
    5      7   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
    6      8   
    _response_body: &[u8],
    7      9   
) -> std::result::Result<
    8     10   
    crate::operation::put_and_get_inline_documents::PutAndGetInlineDocumentsOutput,
    9     11   
    crate::operation::put_and_get_inline_documents::PutAndGetInlineDocumentsError,
   10     12   
> {
          13  +
    /* RustType.kt:516 */
   11     14   
    #[allow(unused_mut)]
          15  +
    /* ProtocolParserGenerator.kt:106 */
   12     16   
    let mut generic_builder = crate::protocol_serde::parse_http_error_metadata(_response_status, _response_headers, _response_body)
   13     17   
        .map_err(crate::operation::put_and_get_inline_documents::PutAndGetInlineDocumentsError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:185 */
   15     21   
    Err(crate::operation::put_and_get_inline_documents::PutAndGetInlineDocumentsError::generic(
   16     22   
        generic,
   17     23   
    ))
          24  +
    /* ProtocolParserGenerator.kt:99 */
   18     25   
}
   19     26   
          27  +
/* RustType.kt:516 */
   20     28   
#[allow(clippy::unnecessary_wraps)]
          29  +
/* ProtocolParserGenerator.kt:71 */
   21     30   
pub fn de_put_and_get_inline_documents_http_response(
   22     31   
    _response_status: u16,
   23     32   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   24     33   
    _response_body: &[u8],
   25     34   
) -> std::result::Result<
   26     35   
    crate::operation::put_and_get_inline_documents::PutAndGetInlineDocumentsOutput,
   27     36   
    crate::operation::put_and_get_inline_documents::PutAndGetInlineDocumentsError,
   28     37   
> {
          38  +
    /* ProtocolParserGenerator.kt:77 */
   29     39   
    Ok({
          40  +
        /* RustType.kt:516 */
   30     41   
        #[allow(unused_mut)]
          42  +
        /* ProtocolParserGenerator.kt:240 */
   31     43   
        let mut output = crate::operation::put_and_get_inline_documents::builders::PutAndGetInlineDocumentsOutputBuilder::default();
          44  +
        /* ProtocolParserGenerator.kt:247 */
   32     45   
        output = crate::protocol_serde::shape_put_and_get_inline_documents::de_put_and_get_inline_documents(_response_body, output)
   33     46   
            .map_err(crate::operation::put_and_get_inline_documents::PutAndGetInlineDocumentsError::unhandled)?;
          47  +
        /* ClientBuilderInstantiator.kt:56 */
   34     48   
        output.build()
          49  +
        /* ProtocolParserGenerator.kt:77 */
   35     50   
    })
          51  +
    /* ProtocolParserGenerator.kt:71 */
   36     52   
}
   37     53   
          54  +
/* JsonSerializerGenerator.kt:287 */
   38     55   
pub fn ser_put_and_get_inline_documents_input(
   39     56   
    input: &crate::operation::put_and_get_inline_documents::PutAndGetInlineDocumentsInput,
   40     57   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          58  +
    /* JsonSerializerGenerator.kt:291 */
   41     59   
    let mut out = String::new();
          60  +
    /* JsonSerializerGenerator.kt:292 */
   42     61   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          62  +
    /* JsonSerializerGenerator.kt:375 */
   43     63   
    crate::protocol_serde::shape_put_and_get_inline_documents_input::ser_put_and_get_inline_documents_input_input(&mut object, input)?;
          64  +
    /* JsonSerializerGenerator.kt:295 */
   44     65   
    object.finish();
          66  +
    /* JsonSerializerGenerator.kt:296 */
   45     67   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          68  +
    /* JsonSerializerGenerator.kt:287 */
   46     69   
}
   47     70   
          71  +
/* JsonParserGenerator.kt:148 */
   48     72   
pub(crate) fn de_put_and_get_inline_documents(
   49     73   
    value: &[u8],
   50     74   
    mut builder: crate::operation::put_and_get_inline_documents::builders::PutAndGetInlineDocumentsOutputBuilder,
   51     75   
) -> ::std::result::Result<
   52     76   
    crate::operation::put_and_get_inline_documents::builders::PutAndGetInlineDocumentsOutputBuilder,
   53     77   
    ::aws_smithy_json::deserialize::error::DeserializeError,
   54     78   
> {
          79  +
    /* JsonParserGenerator.kt:153 */
   55     80   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   56     81   
    let tokens = &mut tokens_owned;
   57     82   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          83  +
    /* JsonParserGenerator.kt:684 */
   58     84   
    loop {
          85  +
        /* JsonParserGenerator.kt:685 */
   59     86   
        match tokens.next().transpose()? {
   60         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   61         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
          87  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          88  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          89  +
                /* JsonParserGenerator.kt:260 */
          90  +
                match key.to_unescaped()?.as_ref() {
          91  +
                    /* JsonParserGenerator.kt:262 */
   62     92   
                    "inlineDocument" => {
   63         -
                    builder = builder.set_inline_document(Some(::aws_smithy_json::deserialize::token::expect_document(tokens)?));
          93  +
                        /* JsonParserGenerator.kt:265 */
          94  +
                        builder = builder.set_inline_document(
          95  +
                            /* JsonParserGenerator.kt:319 */
          96  +
                            Some(::aws_smithy_json::deserialize::token::expect_document(tokens)?), /* JsonParserGenerator.kt:265 */
          97  +
                        );
          98  +
                        /* JsonParserGenerator.kt:262 */
   64     99   
                    }
   65         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   66         -
            },
         100  +
                    /* JsonParserGenerator.kt:290 */
         101  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
         102  +
                }
         103  +
                /* JsonParserGenerator.kt:686 */
         104  +
            }
         105  +
            /* JsonParserGenerator.kt:695 */
   67    106   
            other => {
   68    107   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   69    108   
                    "expected object key or end object, found: {:?}",
   70    109   
                    other
   71    110   
                )))
         111  +
            } /* JsonParserGenerator.kt:685 */
   72    112   
        }
         113  +
        /* JsonParserGenerator.kt:684 */
   73    114   
    }
   74         -
    }
         115  +
    /* JsonParserGenerator.kt:250 */
   75    116   
    if tokens.next().is_some() {
         117  +
        /* JsonParserGenerator.kt:251 */
   76    118   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   77    119   
            "found more JSON tokens after completing parsing",
   78    120   
        ));
         121  +
        /* JsonParserGenerator.kt:250 */
   79    122   
    }
         123  +
    /* JsonParserGenerator.kt:163 */
   80    124   
    Ok(builder)
         125  +
    /* JsonParserGenerator.kt:148 */
   81    126   
}