Client Test

Client Test

rev. dfb5149b65b7bcc09edd15b8e071ad43b5ac5943

Files changed:

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/primitives.rs

@@ -1,1 +9,10 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* SmithyTypesPubUseExtra.kt:66 */
    2      3   
pub use ::aws_smithy_types::date_time::Format as DateTimeFormat;
    3      4   
pub use ::aws_smithy_types::Blob;
    4         -
pub use ::aws_smithy_types::DateTime;
           5  +
/* SmithyTypesPubUseExtra.kt:69 */ pub use ::aws_smithy_types::DateTime;
    5      6   
    6         -
/// Event stream related primitives such as `Message` or `Header`.
           7  +
/// /* ClientRustModule.kt:121 */Event stream related primitives such as `Message` or `Header`.
    7      8   
pub mod event_stream;
    8      9   
    9     10   
pub(crate) mod sealed_enum_unknown;

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/primitives/sealed_enum_unknown.rs

@@ -1,1 +21,29 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
    2         -
    3         -
/// Opaque struct used as inner data for the `Unknown` variant defined in enums in
           2  +
/* ClientEnumGenerator.kt:189 */
           3  +
/// /* ClientEnumGenerator.kt:189 */Opaque struct used as inner data for the `Unknown` variant defined in enums in
    4      4   
/// the crate.
    5      5   
///
    6      6   
/// This is not intended to be used directly.
           7  +
/* RustType.kt:516 */
    7      8   
#[non_exhaustive]
           9  +
/* RustType.kt:516 */
    8     10   
#[derive(
    9     11   
    ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::Ord, ::std::cmp::PartialEq, ::std::cmp::PartialOrd, ::std::fmt::Debug, ::std::hash::Hash,
   10     12   
)]
   11         -
pub struct UnknownVariantValue(pub(crate) ::std::string::String);
          13  +
pub /* ClientEnumGenerator.kt:203 */ struct UnknownVariantValue(pub(crate) ::std::string::String);
          14  +
/* ClientEnumGenerator.kt:204 */
   12     15   
impl UnknownVariantValue {
          16  +
    /* ClientEnumGenerator.kt:206 */
   13     17   
    pub(crate) fn as_str(&self) -> &str {
          18  +
        /* ClientEnumGenerator.kt:207 */
   14     19   
        &self.0
          20  +
        /* ClientEnumGenerator.kt:206 */
   15     21   
    }
          22  +
    /* ClientEnumGenerator.kt:204 */
   16     23   
}
          24  +
/* ClientEnumGenerator.kt:210 */
   17     25   
impl ::std::fmt::Display for UnknownVariantValue {
   18     26   
    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
   19     27   
        write!(f, "{}", self.0)
   20     28   
    }
   21     29   
}

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

@@ -1,1 +69,72 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* ResponseDeserializerGenerator.kt:170 */
    2      3   
pub(crate) fn type_erase_result<O, E>(
    3      4   
    result: ::std::result::Result<O, E>,
    4      5   
) -> ::std::result::Result<
    5      6   
    ::aws_smithy_runtime_api::client::interceptors::context::Output,
    6      7   
    ::aws_smithy_runtime_api::client::orchestrator::OrchestratorError<::aws_smithy_runtime_api::client::interceptors::context::Error>,
    7      8   
>
    8      9   
where
    9     10   
    O: ::std::fmt::Debug + ::std::marker::Send + ::std::marker::Sync + 'static,
   10     11   
    E: ::std::error::Error + std::fmt::Debug + ::std::marker::Send + ::std::marker::Sync + 'static,
   11     12   
{
   12     13   
    result
   13     14   
        .map(|output| ::aws_smithy_runtime_api::client::interceptors::context::Output::erase(output))
   14     15   
        .map_err(|error| ::aws_smithy_runtime_api::client::interceptors::context::Error::erase(error))
   15     16   
        .map_err(::std::convert::Into::into)
   16     17   
}
   17     18   
          19  +
/* AwsJson.kt:203 */
   18     20   
pub fn parse_http_error_metadata(
   19     21   
    _response_status: u16,
   20     22   
    response_headers: &::aws_smithy_runtime_api::http::Headers,
   21     23   
    response_body: &[u8],
   22     24   
) -> ::std::result::Result<::aws_smithy_types::error::metadata::Builder, ::aws_smithy_json::deserialize::error::DeserializeError> {
   23     25   
    crate::json_errors::parse_error_metadata(response_body, response_headers)
   24     26   
}
   25     27   
   26     28   
pub(crate) mod shape_err_collisions;
   27     29   
   28     30   
pub(crate) mod shape_match;
   29     31   
   30     32   
pub(crate) mod shape_option;
   31     33   
   32     34   
pub(crate) mod shape_reserved_words_as_members;
   33     35   
   34     36   
pub(crate) mod shape_result;
   35     37   
   36     38   
pub(crate) mod shape_rpc_echo;
   37     39   
   38     40   
pub(crate) mod shape_structure_name_punning;
   39     41   
          42  +
/* JsonParserGenerator.kt:227 */
   40     43   
pub(crate) fn or_empty_doc(data: &[u8]) -> &[u8] {
   41     44   
    if data.is_empty() {
   42     45   
        b"{}"
   43     46   
    } else {
   44     47   
        data
   45     48   
    }
   46     49   
}
   47     50   
   48     51   
pub(crate) mod shape_colliding_error;
   49     52   

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_colliding_error.rs

@@ -1,1 +36,59 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:148 */
    2      3   
pub(crate) fn de_colliding_error_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::CollidingErrorBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::CollidingErrorBuilder, ::aws_smithy_json::deserialize::error::DeserializeError> {
           7  +
    /* JsonParserGenerator.kt:153 */
    6      8   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
    7      9   
    let tokens = &mut tokens_owned;
    8     10   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          11  +
    /* JsonParserGenerator.kt:684 */
    9     12   
    loop {
          13  +
        /* JsonParserGenerator.kt:685 */
   10     14   
        match tokens.next().transpose()? {
   11         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   12         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
   13         -
                "Message" => {
   14         -
                    builder = builder.set_message(
   15         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   16         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   17         -
                            .transpose()?,
   18         -
                    );
          15  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          16  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          17  +
                /* JsonParserGenerator.kt:260 */
          18  +
                match key.to_unescaped()?.as_ref() {
          19  +
                    /* JsonParserGenerator.kt:262 */
          20  +
                    "Message" => {
          21  +
                        /* JsonParserGenerator.kt:265 */
          22  +
                        builder = builder.set_message(
          23  +
                            /* JsonParserGenerator.kt:354 */
          24  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          25  +
                                .map(|s|
          26  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          27  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          29  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
          30  +
                        );
          31  +
                        /* JsonParserGenerator.kt:262 */
          32  +
                    }
          33  +
                    /* JsonParserGenerator.kt:290 */
          34  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   19     35   
                }
   20         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   21         -
            },
          36  +
                /* JsonParserGenerator.kt:686 */
          37  +
            }
          38  +
            /* JsonParserGenerator.kt:695 */
   22     39   
            other => {
   23     40   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   24     41   
                    "expected object key or end object, found: {:?}",
   25     42   
                    other
   26     43   
                )))
   27         -
            }
          44  +
            } /* JsonParserGenerator.kt:685 */
   28     45   
        }
          46  +
        /* JsonParserGenerator.kt:684 */
   29     47   
    }
          48  +
    /* JsonParserGenerator.kt:250 */
   30     49   
    if tokens.next().is_some() {
          50  +
        /* JsonParserGenerator.kt:251 */
   31     51   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   32     52   
            "found more JSON tokens after completing parsing",
   33     53   
        ));
          54  +
        /* JsonParserGenerator.kt:250 */
   34     55   
    }
          56  +
    /* JsonParserGenerator.kt:163 */
   35     57   
    Ok(builder)
          58  +
    /* JsonParserGenerator.kt:148 */
   36     59   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_colliding_exception.rs

@@ -1,1 +36,59 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonParserGenerator.kt:148 */
    2      3   
pub(crate) fn de_colliding_exception_json_err(
    3      4   
    value: &[u8],
    4      5   
    mut builder: crate::types::error::builders::CollidingExceptionBuilder,
    5      6   
) -> ::std::result::Result<crate::types::error::builders::CollidingExceptionBuilder, ::aws_smithy_json::deserialize::error::DeserializeError> {
           7  +
    /* JsonParserGenerator.kt:153 */
    6      8   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
    7      9   
    let tokens = &mut tokens_owned;
    8     10   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          11  +
    /* JsonParserGenerator.kt:684 */
    9     12   
    loop {
          13  +
        /* JsonParserGenerator.kt:685 */
   10     14   
        match tokens.next().transpose()? {
   11         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   12         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
   13         -
                "Message" => {
   14         -
                    builder = builder.set_message(
   15         -
                        ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
   16         -
                            .map(|s| s.to_unescaped().map(|u| u.into_owned()))
   17         -
                            .transpose()?,
   18         -
                    );
          15  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          16  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          17  +
                /* JsonParserGenerator.kt:260 */
          18  +
                match key.to_unescaped()?.as_ref() {
          19  +
                    /* JsonParserGenerator.kt:262 */
          20  +
                    "Message" => {
          21  +
                        /* JsonParserGenerator.kt:265 */
          22  +
                        builder = builder.set_message(
          23  +
                            /* JsonParserGenerator.kt:354 */
          24  +
                            ::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?
          25  +
                                .map(|s|
          26  +
                                /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
          27  +
                                    /* JsonParserGenerator.kt:348 */u.into_owned()
          28  +
                                /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
          29  +
                                .transpose()?, /* JsonParserGenerator.kt:265 */
          30  +
                        );
          31  +
                        /* JsonParserGenerator.kt:262 */
          32  +
                    }
          33  +
                    /* JsonParserGenerator.kt:290 */
          34  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   19     35   
                }
   20         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   21         -
            },
          36  +
                /* JsonParserGenerator.kt:686 */
          37  +
            }
          38  +
            /* JsonParserGenerator.kt:695 */
   22     39   
            other => {
   23     40   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   24     41   
                    "expected object key or end object, found: {:?}",
   25     42   
                    other
   26     43   
                )))
   27         -
            }
          44  +
            } /* JsonParserGenerator.kt:685 */
   28     45   
        }
          46  +
        /* JsonParserGenerator.kt:684 */
   29     47   
    }
          48  +
    /* JsonParserGenerator.kt:250 */
   30     49   
    if tokens.next().is_some() {
          50  +
        /* JsonParserGenerator.kt:251 */
   31     51   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   32     52   
            "found more JSON tokens after completing parsing",
   33     53   
        ));
          54  +
        /* JsonParserGenerator.kt:250 */
   34     55   
    }
          56  +
    /* JsonParserGenerator.kt:163 */
   35     57   
    Ok(builder)
          58  +
    /* JsonParserGenerator.kt:148 */
   36     59   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_err_collisions.rs

@@ -1,1 +70,102 @@
    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_err_collisions_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::err_collisions::ErrCollisionsOutput, crate::operation::err_collisions::ErrCollisionsError> {
          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::err_collisions::ErrCollisionsError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:122 */
   12     18   
    let error_code = match generic.code() {
   13     19   
        Some(code) => code,
   14     20   
        None => return Err(crate::operation::err_collisions::ErrCollisionsError::unhandled(generic)),
   15     21   
    };
   16     22   
   17     23   
    let _error_message = generic.message().map(|msg| msg.to_owned());
          24  +
    /* ProtocolParserGenerator.kt:133 */
   18     25   
    Err(match error_code {
          26  +
        /* ProtocolParserGenerator.kt:139 */
   19     27   
        "CollidingError" => crate::operation::err_collisions::ErrCollisionsError::CollidingError({
          28  +
            /* RustType.kt:516 */
   20     29   
            #[allow(unused_mut)]
   21         -
            let mut tmp = {
   22         -
                #[allow(unused_mut)]
   23         -
                let mut output = crate::types::error::builders::CollidingErrorBuilder::default();
   24         -
                output = crate::protocol_serde::shape_colliding_error::de_colliding_error_json_err(_response_body, output)
   25         -
                    .map_err(crate::operation::err_collisions::ErrCollisionsError::unhandled)?;
   26         -
                let output = output.meta(generic);
   27         -
                output.build()
   28         -
            };
          30  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          31  +
                /* ProtocolParserGenerator.kt:146 */ {
          32  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          33  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::CollidingErrorBuilder::default();
          34  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_colliding_error::de_colliding_error_json_err(_response_body, output).map_err(crate::operation::err_collisions::ErrCollisionsError::unhandled)?;
          35  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          36  +
                    /* ClientBuilderInstantiator.kt:56 */output.build()
          37  +
                /* ProtocolParserGenerator.kt:146 */}
          38  +
            /* ProtocolParserGenerator.kt:145 */;
          39  +
            /* ProtocolParserGenerator.kt:170 */
   29     40   
            if tmp.message.is_none() {
   30     41   
                tmp.message = _error_message;
   31     42   
            }
          43  +
            /* ProtocolParserGenerator.kt:179 */
   32     44   
            tmp
          45  +
            /* ProtocolParserGenerator.kt:139 */
   33     46   
        }),
          47  +
        /* ProtocolParserGenerator.kt:139 */
   34     48   
        "CollidingException" => crate::operation::err_collisions::ErrCollisionsError::CollidingException({
          49  +
            /* RustType.kt:516 */
   35     50   
            #[allow(unused_mut)]
   36         -
            let mut tmp = {
   37         -
                #[allow(unused_mut)]
   38         -
                let mut output = crate::types::error::builders::CollidingExceptionBuilder::default();
   39         -
                output = crate::protocol_serde::shape_colliding_exception::de_colliding_exception_json_err(_response_body, output)
   40         -
                    .map_err(crate::operation::err_collisions::ErrCollisionsError::unhandled)?;
   41         -
                let output = output.meta(generic);
   42         -
                output.build()
   43         -
            };
          51  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          52  +
                /* ProtocolParserGenerator.kt:146 */ {
          53  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          54  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::CollidingExceptionBuilder::default();
          55  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_colliding_exception::de_colliding_exception_json_err(_response_body, output).map_err(crate::operation::err_collisions::ErrCollisionsError::unhandled)?;
          56  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          57  +
                    /* ClientBuilderInstantiator.kt:56 */output.build()
          58  +
                /* ProtocolParserGenerator.kt:146 */}
          59  +
            /* ProtocolParserGenerator.kt:145 */;
          60  +
            /* ProtocolParserGenerator.kt:170 */
   44     61   
            if tmp.message.is_none() {
   45     62   
                tmp.message = _error_message;
   46     63   
            }
          64  +
            /* ProtocolParserGenerator.kt:179 */
   47     65   
            tmp
          66  +
            /* ProtocolParserGenerator.kt:139 */
   48     67   
        }),
   49         -
        _ => crate::operation::err_collisions::ErrCollisionsError::generic(generic),
          68  +
        /* ProtocolParserGenerator.kt:182 */
          69  +
        _ => crate::operation::err_collisions::ErrCollisionsError::generic(generic), /* ProtocolParserGenerator.kt:133 */
   50     70   
    })
          71  +
    /* ProtocolParserGenerator.kt:99 */
   51     72   
}
   52     73   
          74  +
/* RustType.kt:516 */
   53     75   
#[allow(clippy::unnecessary_wraps)]
          76  +
/* ProtocolParserGenerator.kt:71 */
   54     77   
pub fn de_err_collisions_http_response(
   55     78   
    _response_status: u16,
   56     79   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   57     80   
    _response_body: &[u8],
   58     81   
) -> std::result::Result<crate::operation::err_collisions::ErrCollisionsOutput, crate::operation::err_collisions::ErrCollisionsError> {
          82  +
    /* ProtocolParserGenerator.kt:77 */
   59     83   
    Ok({
          84  +
        /* RustType.kt:516 */
   60     85   
        #[allow(unused_mut)]
          86  +
        /* ProtocolParserGenerator.kt:240 */
   61     87   
        let mut output = crate::operation::err_collisions::builders::ErrCollisionsOutputBuilder::default();
          88  +
        /* ClientBuilderInstantiator.kt:56 */
   62     89   
        output.build()
          90  +
        /* ProtocolParserGenerator.kt:77 */
   63     91   
    })
          92  +
    /* ProtocolParserGenerator.kt:71 */
   64     93   
}
   65     94   
          95  +
/* AwsJson.kt:152 */
   66     96   
pub fn ser_err_collisions_input(
   67     97   
    _input: &crate::operation::err_collisions::ErrCollisionsInput,
   68     98   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          99  +
    /* AwsJson.kt:156 */
   69    100   
    Ok(::aws_smithy_types::body::SdkBody::from("{}"))
         101  +
    /* AwsJson.kt:152 */
   70    102   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_match.rs

@@ -1,1 +58,85 @@
    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_match_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::match_::MatchOutput, crate::operation::match_::MatchError> {
          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::match_::MatchError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:122 */
   12     18   
    let error_code = match generic.code() {
   13     19   
        Some(code) => code,
   14     20   
        None => return Err(crate::operation::match_::MatchError::unhandled(generic)),
   15     21   
    };
   16     22   
   17     23   
    let _error_message = generic.message().map(|msg| msg.to_owned());
          24  +
    /* ProtocolParserGenerator.kt:133 */
   18     25   
    Err(match error_code {
          26  +
        /* ProtocolParserGenerator.kt:139 */
   19     27   
        "ValidationException" => crate::operation::match_::MatchError::ValidationException({
          28  +
            /* RustType.kt:516 */
   20     29   
            #[allow(unused_mut)]
   21         -
            let mut tmp = {
   22         -
                #[allow(unused_mut)]
   23         -
                let mut output = crate::types::error::builders::ValidationExceptionBuilder::default();
   24         -
                output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
   25         -
                    .map_err(crate::operation::match_::MatchError::unhandled)?;
   26         -
                let output = output.meta(generic);
   27         -
                crate::serde_util::validation_exception_correct_errors(output)
   28         -
                    .build()
   29         -
                    .map_err(crate::operation::match_::MatchError::unhandled)?
   30         -
            };
          30  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          31  +
                /* ProtocolParserGenerator.kt:146 */ {
          32  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          33  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::ValidationExceptionBuilder::default();
          34  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output).map_err(crate::operation::match_::MatchError::unhandled)?;
          35  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          36  +
                    /* ClientBuilderInstantiator.kt:46 */crate::serde_util::validation_exception_correct_errors(output).build().map_err(crate::operation::match_::MatchError::unhandled)?
          37  +
                /* ProtocolParserGenerator.kt:146 */}
          38  +
            /* ProtocolParserGenerator.kt:145 */;
          39  +
            /* ProtocolParserGenerator.kt:179 */
   31     40   
            tmp
          41  +
            /* ProtocolParserGenerator.kt:139 */
   32     42   
        }),
   33         -
        _ => crate::operation::match_::MatchError::generic(generic),
          43  +
        /* ProtocolParserGenerator.kt:182 */
          44  +
        _ => crate::operation::match_::MatchError::generic(generic), /* ProtocolParserGenerator.kt:133 */
   34     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:99 */
   35     47   
}
   36     48   
          49  +
/* RustType.kt:516 */
   37     50   
#[allow(clippy::unnecessary_wraps)]
          51  +
/* ProtocolParserGenerator.kt:71 */
   38     52   
pub fn de_match_http_response(
   39     53   
    _response_status: u16,
   40     54   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   41     55   
    _response_body: &[u8],
   42     56   
) -> std::result::Result<crate::operation::match_::MatchOutput, crate::operation::match_::MatchError> {
          57  +
    /* ProtocolParserGenerator.kt:77 */
   43     58   
    Ok({
          59  +
        /* RustType.kt:516 */
   44     60   
        #[allow(unused_mut)]
          61  +
        /* ProtocolParserGenerator.kt:240 */
   45     62   
        let mut output = crate::operation::match_::builders::MatchOutputBuilder::default();
          63  +
        /* ClientBuilderInstantiator.kt:56 */
   46     64   
        output.build()
          65  +
        /* ProtocolParserGenerator.kt:77 */
   47     66   
    })
          67  +
    /* ProtocolParserGenerator.kt:71 */
   48     68   
}
   49     69   
          70  +
/* JsonSerializerGenerator.kt:287 */
   50     71   
pub fn ser_match_input(
   51     72   
    input: &crate::operation::match_::MatchInput,
   52     73   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          74  +
    /* JsonSerializerGenerator.kt:291 */
   53     75   
    let mut out = String::new();
          76  +
    /* JsonSerializerGenerator.kt:292 */
   54     77   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          78  +
    /* JsonSerializerGenerator.kt:375 */
   55     79   
    crate::protocol_serde::shape_match_input::ser_match_input_input(&mut object, input)?;
          80  +
    /* JsonSerializerGenerator.kt:295 */
   56     81   
    object.finish();
          82  +
    /* JsonSerializerGenerator.kt:296 */
   57     83   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          84  +
    /* JsonSerializerGenerator.kt:287 */
   58     85   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_match_input.rs

@@ -1,1 +37,67 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_match_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::match_::MatchInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.r#as {
           9  +
        /* JsonSerializerGenerator.kt:432 */
    7     10   
        object.key("as").number(
    8     11   
            #[allow(clippy::useless_conversion)]
    9     12   
            ::aws_smithy_types::Number::NegInt((*var_1).into()),
   10     13   
        );
          14  +
        /* JsonSerializerGenerator.kt:382 */
   11     15   
    }
          16  +
    /* JsonSerializerGenerator.kt:382 */
   12     17   
    if let Some(var_2) = &input.r#async {
          18  +
        /* JsonSerializerGenerator.kt:424 */
   13     19   
        object.key("async").boolean(*var_2);
          20  +
        /* JsonSerializerGenerator.kt:382 */
   14     21   
    }
          22  +
    /* JsonSerializerGenerator.kt:382 */
   15     23   
    if let Some(var_3) = &input.r#enum {
          24  +
        /* JsonSerializerGenerator.kt:423 */
   16     25   
        object.key("enum").string(var_3.as_str());
          26  +
        /* JsonSerializerGenerator.kt:382 */
   17     27   
    }
          28  +
    /* JsonSerializerGenerator.kt:382 */
   18     29   
    if let Some(var_4) = &input.self_ {
          30  +
        /* JsonSerializerGenerator.kt:424 */
   19     31   
        object.key("self").boolean(*var_4);
          32  +
        /* JsonSerializerGenerator.kt:382 */
   20     33   
    }
          34  +
    /* JsonSerializerGenerator.kt:382 */
   21     35   
    if let Some(var_5) = &input.crate_ {
          36  +
        /* JsonSerializerGenerator.kt:424 */
   22     37   
        object.key("crate").boolean(*var_5);
          38  +
        /* JsonSerializerGenerator.kt:382 */
   23     39   
    }
          40  +
    /* JsonSerializerGenerator.kt:382 */
   24     41   
    if let Some(var_6) = &input.super_ {
          42  +
        /* JsonSerializerGenerator.kt:424 */
   25     43   
        object.key("super").boolean(*var_6);
          44  +
        /* JsonSerializerGenerator.kt:382 */
   26     45   
    }
          46  +
    /* JsonSerializerGenerator.kt:382 */
   27     47   
    if let Some(var_7) = &input.build_value {
          48  +
        /* JsonSerializerGenerator.kt:423 */
   28     49   
        object.key("build").string(var_7.as_str());
          50  +
        /* JsonSerializerGenerator.kt:382 */
   29     51   
    }
          52  +
    /* JsonSerializerGenerator.kt:382 */
   30     53   
    if let Some(var_8) = &input.default_value {
          54  +
        /* JsonSerializerGenerator.kt:423 */
   31     55   
        object.key("default").string(var_8.as_str());
          56  +
        /* JsonSerializerGenerator.kt:382 */
   32     57   
    }
          58  +
    /* JsonSerializerGenerator.kt:382 */
   33     59   
    if let Some(var_9) = &input.send_value {
          60  +
        /* JsonSerializerGenerator.kt:423 */
   34     61   
        object.key("send").string(var_9.as_str());
          62  +
        /* JsonSerializerGenerator.kt:382 */
   35     63   
    }
          64  +
    /* JsonSerializerGenerator.kt:372 */
   36     65   
    Ok(())
          66  +
    /* JsonSerializerGenerator.kt:358 */
   37     67   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_option.rs

@@ -1,1 +36,58 @@
    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_option_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::option::OptionOutput, crate::operation::option::OptionError> {
          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::option::OptionError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::option::OptionError::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_option_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::option::OptionOutput, crate::operation::option::OptionError> {
          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::option::builders::OptionOutputBuilder::default();
          36  +
        /* ClientBuilderInstantiator.kt:56 */
   24     37   
        output.build()
          38  +
        /* ProtocolParserGenerator.kt:77 */
   25     39   
    })
          40  +
    /* ProtocolParserGenerator.kt:71 */
   26     41   
}
   27     42   
          43  +
/* JsonSerializerGenerator.kt:287 */
   28     44   
pub fn ser_option_input(
   29     45   
    input: &crate::operation::option::OptionInput,
   30     46   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          47  +
    /* JsonSerializerGenerator.kt:291 */
   31     48   
    let mut out = String::new();
          49  +
    /* JsonSerializerGenerator.kt:292 */
   32     50   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          51  +
    /* JsonSerializerGenerator.kt:375 */
   33     52   
    crate::protocol_serde::shape_option_input::ser_option_input_input(&mut object, input)?;
          53  +
    /* JsonSerializerGenerator.kt:295 */
   34     54   
    object.finish();
          55  +
    /* JsonSerializerGenerator.kt:296 */
   35     56   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          57  +
    /* JsonSerializerGenerator.kt:287 */
   36     58   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_option_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_option_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::option::OptionInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.pv_member {
           9  +
        /* JsonSerializerGenerator.kt:424 */
    7     10   
        object.key("pv_member").boolean(*var_1);
          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/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_reserved_words_as_members.rs

@@ -1,1 +68,95 @@
    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_reserved_words_as_members_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::reserved_words_as_members::ReservedWordsAsMembersOutput,
    9     11   
    crate::operation::reserved_words_as_members::ReservedWordsAsMembersError,
   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::reserved_words_as_members::ReservedWordsAsMembersError::unhandled)?;
          18  +
    /* ProtocolParserGenerator.kt:120 */
   14     19   
    let generic = generic_builder.build();
          20  +
    /* ProtocolParserGenerator.kt:122 */
   15     21   
    let error_code = match generic.code() {
   16     22   
        Some(code) => code,
   17     23   
        None => {
   18     24   
            return Err(crate::operation::reserved_words_as_members::ReservedWordsAsMembersError::unhandled(
   19     25   
                generic,
   20     26   
            ))
   21     27   
        }
   22     28   
    };
   23     29   
   24     30   
    let _error_message = generic.message().map(|msg| msg.to_owned());
          31  +
    /* ProtocolParserGenerator.kt:133 */
   25     32   
    Err(match error_code {
          33  +
        /* ProtocolParserGenerator.kt:139 */
   26     34   
        "ValidationException" => crate::operation::reserved_words_as_members::ReservedWordsAsMembersError::ValidationException({
          35  +
            /* RustType.kt:516 */
   27     36   
            #[allow(unused_mut)]
   28         -
            let mut tmp = {
   29         -
                #[allow(unused_mut)]
   30         -
                let mut output = crate::types::error::builders::ValidationExceptionBuilder::default();
   31         -
                output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
   32         -
                    .map_err(crate::operation::reserved_words_as_members::ReservedWordsAsMembersError::unhandled)?;
   33         -
                let output = output.meta(generic);
   34         -
                crate::serde_util::validation_exception_correct_errors(output)
   35         -
                    .build()
   36         -
                    .map_err(crate::operation::reserved_words_as_members::ReservedWordsAsMembersError::unhandled)?
   37         -
            };
          37  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          38  +
                /* ProtocolParserGenerator.kt:146 */ {
          39  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          40  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::ValidationExceptionBuilder::default();
          41  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output).map_err(crate::operation::reserved_words_as_members::ReservedWordsAsMembersError::unhandled)?;
          42  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          43  +
                    /* ClientBuilderInstantiator.kt:46 */crate::serde_util::validation_exception_correct_errors(output).build().map_err(crate::operation::reserved_words_as_members::ReservedWordsAsMembersError::unhandled)?
          44  +
                /* ProtocolParserGenerator.kt:146 */}
          45  +
            /* ProtocolParserGenerator.kt:145 */;
          46  +
            /* ProtocolParserGenerator.kt:179 */
   38     47   
            tmp
          48  +
            /* ProtocolParserGenerator.kt:139 */
   39     49   
        }),
   40         -
        _ => crate::operation::reserved_words_as_members::ReservedWordsAsMembersError::generic(generic),
          50  +
        /* ProtocolParserGenerator.kt:182 */
          51  +
        _ => crate::operation::reserved_words_as_members::ReservedWordsAsMembersError::generic(generic), /* ProtocolParserGenerator.kt:133 */
   41     52   
    })
          53  +
    /* ProtocolParserGenerator.kt:99 */
   42     54   
}
   43     55   
          56  +
/* RustType.kt:516 */
   44     57   
#[allow(clippy::unnecessary_wraps)]
          58  +
/* ProtocolParserGenerator.kt:71 */
   45     59   
pub fn de_reserved_words_as_members_http_response(
   46     60   
    _response_status: u16,
   47     61   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   48     62   
    _response_body: &[u8],
   49     63   
) -> std::result::Result<
   50     64   
    crate::operation::reserved_words_as_members::ReservedWordsAsMembersOutput,
   51     65   
    crate::operation::reserved_words_as_members::ReservedWordsAsMembersError,
   52     66   
> {
          67  +
    /* ProtocolParserGenerator.kt:77 */
   53     68   
    Ok({
          69  +
        /* RustType.kt:516 */
   54     70   
        #[allow(unused_mut)]
          71  +
        /* ProtocolParserGenerator.kt:240 */
   55     72   
        let mut output = crate::operation::reserved_words_as_members::builders::ReservedWordsAsMembersOutputBuilder::default();
          73  +
        /* ClientBuilderInstantiator.kt:56 */
   56     74   
        output.build()
          75  +
        /* ProtocolParserGenerator.kt:77 */
   57     76   
    })
          77  +
    /* ProtocolParserGenerator.kt:71 */
   58     78   
}
   59     79   
          80  +
/* JsonSerializerGenerator.kt:287 */
   60     81   
pub fn ser_reserved_words_as_members_input(
   61     82   
    input: &crate::operation::reserved_words_as_members::ReservedWordsAsMembersInput,
   62     83   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          84  +
    /* JsonSerializerGenerator.kt:291 */
   63     85   
    let mut out = String::new();
          86  +
    /* JsonSerializerGenerator.kt:292 */
   64     87   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          88  +
    /* JsonSerializerGenerator.kt:375 */
   65     89   
    crate::protocol_serde::shape_reserved_words_as_members_input::ser_reserved_words_as_members_input_input(&mut object, input)?;
          90  +
    /* JsonSerializerGenerator.kt:295 */
   66     91   
    object.finish();
          92  +
    /* JsonSerializerGenerator.kt:296 */
   67     93   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          94  +
    /* JsonSerializerGenerator.kt:287 */
   68     95   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_reserved_words_as_members_input.rs

@@ -1,1 +37,67 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_reserved_words_as_members_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::reserved_words_as_members::ReservedWordsAsMembersInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.r#as {
           9  +
        /* JsonSerializerGenerator.kt:432 */
    7     10   
        object.key("as").number(
    8     11   
            #[allow(clippy::useless_conversion)]
    9     12   
            ::aws_smithy_types::Number::NegInt((*var_1).into()),
   10     13   
        );
          14  +
        /* JsonSerializerGenerator.kt:382 */
   11     15   
    }
          16  +
    /* JsonSerializerGenerator.kt:382 */
   12     17   
    if let Some(var_2) = &input.r#async {
          18  +
        /* JsonSerializerGenerator.kt:424 */
   13     19   
        object.key("async").boolean(*var_2);
          20  +
        /* JsonSerializerGenerator.kt:382 */
   14     21   
    }
          22  +
    /* JsonSerializerGenerator.kt:382 */
   15     23   
    if let Some(var_3) = &input.r#enum {
          24  +
        /* JsonSerializerGenerator.kt:423 */
   16     25   
        object.key("enum").string(var_3.as_str());
          26  +
        /* JsonSerializerGenerator.kt:382 */
   17     27   
    }
          28  +
    /* JsonSerializerGenerator.kt:382 */
   18     29   
    if let Some(var_4) = &input.self_ {
          30  +
        /* JsonSerializerGenerator.kt:424 */
   19     31   
        object.key("self").boolean(*var_4);
          32  +
        /* JsonSerializerGenerator.kt:382 */
   20     33   
    }
          34  +
    /* JsonSerializerGenerator.kt:382 */
   21     35   
    if let Some(var_5) = &input.crate_ {
          36  +
        /* JsonSerializerGenerator.kt:424 */
   22     37   
        object.key("crate").boolean(*var_5);
          38  +
        /* JsonSerializerGenerator.kt:382 */
   23     39   
    }
          40  +
    /* JsonSerializerGenerator.kt:382 */
   24     41   
    if let Some(var_6) = &input.super_ {
          42  +
        /* JsonSerializerGenerator.kt:424 */
   25     43   
        object.key("super").boolean(*var_6);
          44  +
        /* JsonSerializerGenerator.kt:382 */
   26     45   
    }
          46  +
    /* JsonSerializerGenerator.kt:382 */
   27     47   
    if let Some(var_7) = &input.build_value {
          48  +
        /* JsonSerializerGenerator.kt:423 */
   28     49   
        object.key("build").string(var_7.as_str());
          50  +
        /* JsonSerializerGenerator.kt:382 */
   29     51   
    }
          52  +
    /* JsonSerializerGenerator.kt:382 */
   30     53   
    if let Some(var_8) = &input.default_value {
          54  +
        /* JsonSerializerGenerator.kt:423 */
   31     55   
        object.key("default").string(var_8.as_str());
          56  +
        /* JsonSerializerGenerator.kt:382 */
   32     57   
    }
          58  +
    /* JsonSerializerGenerator.kt:382 */
   33     59   
    if let Some(var_9) = &input.send_value {
          60  +
        /* JsonSerializerGenerator.kt:423 */
   34     61   
        object.key("send").string(var_9.as_str());
          62  +
        /* JsonSerializerGenerator.kt:382 */
   35     63   
    }
          64  +
    /* JsonSerializerGenerator.kt:372 */
   36     65   
    Ok(())
          66  +
    /* JsonSerializerGenerator.kt:358 */
   37     67   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_result.rs

@@ -1,1 +69,114 @@
    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_result_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::result::ResultOutput, crate::operation::result::ResultError> {
          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::result::ResultError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:185 */
   12     18   
    Err(crate::operation::result::ResultError::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_result_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::result::ResultOutput, crate::operation::result::ResultError> {
          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::result::builders::ResultOutputBuilder::default();
          36  +
        /* ProtocolParserGenerator.kt:247 */
   24     37   
        output = crate::protocol_serde::shape_result::de_result(_response_body, output).map_err(crate::operation::result::ResultError::unhandled)?;
          38  +
        /* ClientBuilderInstantiator.kt:56 */
   25     39   
        output.build()
          40  +
        /* ProtocolParserGenerator.kt:77 */
   26     41   
    })
          42  +
    /* ProtocolParserGenerator.kt:71 */
   27     43   
}
   28     44   
          45  +
/* JsonSerializerGenerator.kt:287 */
   29     46   
pub fn ser_result_input(
   30     47   
    input: &crate::operation::result::ResultInput,
   31     48   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          49  +
    /* JsonSerializerGenerator.kt:291 */
   32     50   
    let mut out = String::new();
          51  +
    /* JsonSerializerGenerator.kt:292 */
   33     52   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          53  +
    /* JsonSerializerGenerator.kt:375 */
   34     54   
    crate::protocol_serde::shape_result_input::ser_result_input_input(&mut object, input)?;
          55  +
    /* JsonSerializerGenerator.kt:295 */
   35     56   
    object.finish();
          57  +
    /* JsonSerializerGenerator.kt:296 */
   36     58   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          59  +
    /* JsonSerializerGenerator.kt:287 */
   37     60   
}
   38     61   
          62  +
/* JsonParserGenerator.kt:148 */
   39     63   
pub(crate) fn de_result(
   40     64   
    value: &[u8],
   41     65   
    mut builder: crate::operation::result::builders::ResultOutputBuilder,
   42     66   
) -> ::std::result::Result<crate::operation::result::builders::ResultOutputBuilder, ::aws_smithy_json::deserialize::error::DeserializeError> {
          67  +
    /* JsonParserGenerator.kt:153 */
   43     68   
    let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value)).peekable();
   44     69   
    let tokens = &mut tokens_owned;
   45     70   
    ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
          71  +
    /* JsonParserGenerator.kt:684 */
   46     72   
    loop {
          73  +
        /* JsonParserGenerator.kt:685 */
   47     74   
        match tokens.next().transpose()? {
   48         -
            Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
   49         -
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => match key.to_unescaped()?.as_ref() {
   50         -
                "pv_member" => {
   51         -
                    builder = builder.set_pv_member(::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?);
          75  +
            /* JsonParserGenerator.kt:686 */ Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
          76  +
            Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
          77  +
                /* JsonParserGenerator.kt:260 */
          78  +
                match key.to_unescaped()?.as_ref() {
          79  +
                    /* JsonParserGenerator.kt:262 */
          80  +
                    "pv_member" => {
          81  +
                        /* JsonParserGenerator.kt:265 */
          82  +
                        builder = builder.set_pv_member(
          83  +
                            /* JsonParserGenerator.kt:298 */
          84  +
                            ::aws_smithy_json::deserialize::token::expect_bool_or_null(tokens.next())?, /* JsonParserGenerator.kt:265 */
          85  +
                        );
          86  +
                        /* JsonParserGenerator.kt:262 */
          87  +
                    }
          88  +
                    /* JsonParserGenerator.kt:290 */
          89  +
                    _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
   52     90   
                }
   53         -
                _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
   54         -
            },
          91  +
                /* JsonParserGenerator.kt:686 */
          92  +
            }
          93  +
            /* JsonParserGenerator.kt:695 */
   55     94   
            other => {
   56     95   
                return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
   57     96   
                    "expected object key or end object, found: {:?}",
   58     97   
                    other
   59     98   
                )))
   60         -
            }
          99  +
            } /* JsonParserGenerator.kt:685 */
   61    100   
        }
         101  +
        /* JsonParserGenerator.kt:684 */
   62    102   
    }
         103  +
    /* JsonParserGenerator.kt:250 */
   63    104   
    if tokens.next().is_some() {
         105  +
        /* JsonParserGenerator.kt:251 */
   64    106   
        return Err(::aws_smithy_json::deserialize::error::DeserializeError::custom(
   65    107   
            "found more JSON tokens after completing parsing",
   66    108   
        ));
         109  +
        /* JsonParserGenerator.kt:250 */
   67    110   
    }
         111  +
    /* JsonParserGenerator.kt:163 */
   68    112   
    Ok(builder)
         113  +
    /* JsonParserGenerator.kt:148 */
   69    114   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_result_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_result_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::result::ResultInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.pv_member {
           9  +
        /* JsonSerializerGenerator.kt:424 */
    7     10   
        object.key("pv_member").boolean(*var_1);
          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/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_rpc_echo.rs

@@ -1,1 +58,85 @@
    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_rpc_echo_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::rpc_echo::RpcEchoOutput, crate::operation::rpc_echo::RPCEchoError> {
          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::rpc_echo::RPCEchoError::unhandled)?;
          15  +
    /* ProtocolParserGenerator.kt:120 */
   11     16   
    let generic = generic_builder.build();
          17  +
    /* ProtocolParserGenerator.kt:122 */
   12     18   
    let error_code = match generic.code() {
   13     19   
        Some(code) => code,
   14     20   
        None => return Err(crate::operation::rpc_echo::RPCEchoError::unhandled(generic)),
   15     21   
    };
   16     22   
   17     23   
    let _error_message = generic.message().map(|msg| msg.to_owned());
          24  +
    /* ProtocolParserGenerator.kt:133 */
   18     25   
    Err(match error_code {
          26  +
        /* ProtocolParserGenerator.kt:139 */
   19     27   
        "ValidationException" => crate::operation::rpc_echo::RPCEchoError::ValidationException({
          28  +
            /* RustType.kt:516 */
   20     29   
            #[allow(unused_mut)]
   21         -
            let mut tmp = {
   22         -
                #[allow(unused_mut)]
   23         -
                let mut output = crate::types::error::builders::ValidationExceptionBuilder::default();
   24         -
                output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output)
   25         -
                    .map_err(crate::operation::rpc_echo::RPCEchoError::unhandled)?;
   26         -
                let output = output.meta(generic);
   27         -
                crate::serde_util::validation_exception_correct_errors(output)
   28         -
                    .build()
   29         -
                    .map_err(crate::operation::rpc_echo::RPCEchoError::unhandled)?
   30         -
            };
          30  +
            /* ProtocolParserGenerator.kt:145 */let mut tmp =
          31  +
                /* ProtocolParserGenerator.kt:146 */ {
          32  +
                    /* RustType.kt:516 */#[allow(unused_mut)]
          33  +
                    /* ProtocolParserGenerator.kt:240 */let mut output = crate::types::error::builders::ValidationExceptionBuilder::default();
          34  +
                    /* ProtocolParserGenerator.kt:257 */output = crate::protocol_serde::shape_validation_exception::de_validation_exception_json_err(_response_body, output).map_err(crate::operation::rpc_echo::RPCEchoError::unhandled)?;
          35  +
                    /* ProtocolParserGenerator.kt:157 */let output = output.meta(generic);
          36  +
                    /* ClientBuilderInstantiator.kt:46 */crate::serde_util::validation_exception_correct_errors(output).build().map_err(crate::operation::rpc_echo::RPCEchoError::unhandled)?
          37  +
                /* ProtocolParserGenerator.kt:146 */}
          38  +
            /* ProtocolParserGenerator.kt:145 */;
          39  +
            /* ProtocolParserGenerator.kt:179 */
   31     40   
            tmp
          41  +
            /* ProtocolParserGenerator.kt:139 */
   32     42   
        }),
   33         -
        _ => crate::operation::rpc_echo::RPCEchoError::generic(generic),
          43  +
        /* ProtocolParserGenerator.kt:182 */
          44  +
        _ => crate::operation::rpc_echo::RPCEchoError::generic(generic), /* ProtocolParserGenerator.kt:133 */
   34     45   
    })
          46  +
    /* ProtocolParserGenerator.kt:99 */
   35     47   
}
   36     48   
          49  +
/* RustType.kt:516 */
   37     50   
#[allow(clippy::unnecessary_wraps)]
          51  +
/* ProtocolParserGenerator.kt:71 */
   38     52   
pub fn de_rpc_echo_http_response(
   39     53   
    _response_status: u16,
   40     54   
    _response_headers: &::aws_smithy_runtime_api::http::Headers,
   41     55   
    _response_body: &[u8],
   42     56   
) -> std::result::Result<crate::operation::rpc_echo::RpcEchoOutput, crate::operation::rpc_echo::RPCEchoError> {
          57  +
    /* ProtocolParserGenerator.kt:77 */
   43     58   
    Ok({
          59  +
        /* RustType.kt:516 */
   44     60   
        #[allow(unused_mut)]
          61  +
        /* ProtocolParserGenerator.kt:240 */
   45     62   
        let mut output = crate::operation::rpc_echo::builders::RpcEchoOutputBuilder::default();
          63  +
        /* ClientBuilderInstantiator.kt:56 */
   46     64   
        output.build()
          65  +
        /* ProtocolParserGenerator.kt:77 */
   47     66   
    })
          67  +
    /* ProtocolParserGenerator.kt:71 */
   48     68   
}
   49     69   
          70  +
/* JsonSerializerGenerator.kt:287 */
   50     71   
pub fn ser_rpc_echo_input(
   51     72   
    input: &crate::operation::rpc_echo::RpcEchoInput,
   52     73   
) -> ::std::result::Result<::aws_smithy_types::body::SdkBody, ::aws_smithy_types::error::operation::SerializationError> {
          74  +
    /* JsonSerializerGenerator.kt:291 */
   53     75   
    let mut out = String::new();
          76  +
    /* JsonSerializerGenerator.kt:292 */
   54     77   
    let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
          78  +
    /* JsonSerializerGenerator.kt:375 */
   55     79   
    crate::protocol_serde::shape_rpc_echo_input::ser_rpc_echo_input_input(&mut object, input)?;
          80  +
    /* JsonSerializerGenerator.kt:295 */
   56     81   
    object.finish();
          82  +
    /* JsonSerializerGenerator.kt:296 */
   57     83   
    Ok(::aws_smithy_types::body::SdkBody::from(out))
          84  +
    /* JsonSerializerGenerator.kt:287 */
   58     85   
}

tmp-codegen-diff/codegen-client-test/naming_test_ops/rust-client-codegen/src/protocol_serde/shape_rpc_echo_input.rs

@@ -1,1 +37,67 @@
    1      1   
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
           2  +
/* JsonSerializerGenerator.kt:358 */
    2      3   
pub fn ser_rpc_echo_input_input(
    3      4   
    object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
    4      5   
    input: &crate::operation::rpc_echo::RpcEchoInput,
    5      6   
) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
           7  +
    /* JsonSerializerGenerator.kt:382 */
    6      8   
    if let Some(var_1) = &input.r#as {
           9  +
        /* JsonSerializerGenerator.kt:432 */
    7     10   
        object.key("as").number(
    8     11   
            #[allow(clippy::useless_conversion)]
    9     12   
            ::aws_smithy_types::Number::NegInt((*var_1).into()),
   10     13   
        );
          14  +
        /* JsonSerializerGenerator.kt:382 */
   11     15   
    }
          16  +
    /* JsonSerializerGenerator.kt:382 */
   12     17   
    if let Some(var_2) = &input.r#async {
          18  +
        /* JsonSerializerGenerator.kt:424 */
   13     19   
        object.key("async").boolean(*var_2);
          20  +
        /* JsonSerializerGenerator.kt:382 */
   14     21   
    }
          22  +
    /* JsonSerializerGenerator.kt:382 */
   15     23   
    if let Some(var_3) = &input.r#enum {
          24  +
        /* JsonSerializerGenerator.kt:423 */
   16     25   
        object.key("enum").string(var_3.as_str());
          26  +
        /* JsonSerializerGenerator.kt:382 */
   17     27   
    }
          28  +
    /* JsonSerializerGenerator.kt:382 */
   18     29   
    if let Some(var_4) = &input.self_ {
          30  +
        /* JsonSerializerGenerator.kt:424 */
   19     31   
        object.key("self").boolean(*var_4);
          32  +
        /* JsonSerializerGenerator.kt:382 */
   20     33   
    }
          34  +
    /* JsonSerializerGenerator.kt:382 */
   21     35   
    if let Some(var_5) = &input.crate_ {
          36  +
        /* JsonSerializerGenerator.kt:424 */
   22     37   
        object.key("crate").boolean(*var_5);
          38  +
        /* JsonSerializerGenerator.kt:382 */
   23     39   
    }
          40  +
    /* JsonSerializerGenerator.kt:382 */
   24     41   
    if let Some(var_6) = &input.super_ {
          42  +
        /* JsonSerializerGenerator.kt:424 */
   25     43   
        object.key("super").boolean(*var_6);
          44  +
        /* JsonSerializerGenerator.kt:382 */
   26     45   
    }
          46  +
    /* JsonSerializerGenerator.kt:382 */
   27     47   
    if let Some(var_7) = &input.build_value {
          48  +
        /* JsonSerializerGenerator.kt:423 */
   28     49   
        object.key("build").string(var_7.as_str());
          50  +
        /* JsonSerializerGenerator.kt:382 */
   29     51   
    }
          52  +
    /* JsonSerializerGenerator.kt:382 */
   30     53   
    if let Some(var_8) = &input.default_value {
          54  +
        /* JsonSerializerGenerator.kt:423 */
   31     55   
        object.key("default").string(var_8.as_str());
          56  +
        /* JsonSerializerGenerator.kt:382 */
   32     57   
    }
          58  +
    /* JsonSerializerGenerator.kt:382 */
   33     59   
    if let Some(var_9) = &input.send_value {
          60  +
        /* JsonSerializerGenerator.kt:423 */
   34     61   
        object.key("send").string(var_9.as_str());
          62  +
        /* JsonSerializerGenerator.kt:382 */
   35     63   
    }
          64  +
    /* JsonSerializerGenerator.kt:372 */
   36     65   
    Ok(())
          66  +
    /* JsonSerializerGenerator.kt:358 */
   37     67   
}