Server Test

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

@@ -1,1 +58,83 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:460 */
 pub(crate) fn de_document_valued_map<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<::std::collections::HashMap<::std::string::String, ::aws_smithy_types::Document>>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-8
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-16
+{
     /* JsonParserGenerator.kt:712 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:713 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* JsonParserGenerator.kt:469 */
             let mut map = ::std::collections::HashMap::new();
             /* JsonParserGenerator.kt:684 */
             loop {
                 /* JsonParserGenerator.kt:685 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:686 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         let key = key.to_unescaped().map(|u| u.into_owned())?;
                         let value = Some(::aws_smithy_json::deserialize::token::expect_document(
                             tokens,
                         )?);
                         /* JsonParserGenerator.kt:471 */
                         let key =
                             /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
                                 /* JsonParserGenerator.kt:348 */u.into_owned()
                             /* JsonParserGenerator.kt:339 */)
                         /* JsonParserGenerator.kt:471 */?;
                         /* JsonParserGenerator.kt:474 */
                         let value =
                             /* JsonParserGenerator.kt:319 */Some(::aws_smithy_json::deserialize::token::expect_document(tokens)?)
                         /* JsonParserGenerator.kt:474 */;
                         /* JsonParserGenerator.kt:481 */
                         match value {
                             Some(value) => {
                                 map.insert(key, value);
-45
+                            }
                             None => {
                                 return Err(
                                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                         "dense map cannot contain null values",
                                     ),
-51
+                                )
-52
+                            }
-53
+                        }
                         /* JsonParserGenerator.kt:686 */
-55
+                    }
                     /* JsonParserGenerator.kt:695 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {:?}", other),
                             ),
-62
+                        )
                     } /* JsonParserGenerator.kt:685 */
-64
+                }
                 /* JsonParserGenerator.kt:684 */
-66
+            }
--
+            }
             /* JsonParserGenerator.kt:504 */
             Ok(Some(map))
             /* JsonParserGenerator.kt:713 */
-70
+        }
         _ => Err(
         /* JsonParserGenerator.kt:722 */
         _ => {
             /* JsonParserGenerator.kt:723 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
         ),
-+
+            )
             /* JsonParserGenerator.kt:722 */
         } /* JsonParserGenerator.kt:712 */
-81
+    }
     /* JsonParserGenerator.kt:460 */
-83
+}

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

@@ -1,1 +55,78 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:383 */
 pub async fn de_empty_input_and_empty_output_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::EmptyInputAndEmptyOutputInput,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
-10
+>
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-16
+{
     /* ServerHttpBoundProtocolGenerator.kt:399 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:723 */
         let mut input = crate::input::empty_input_and_empty_output_input::Builder::default();
         /* RustType.kt:516 */
         #[allow(unused_variables)]
         /* ServerHttpBoundProtocolGenerator.kt:728 */
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         /* ServerHttpBoundProtocolGenerator.kt:834 */
         input.build()
         /* ServerHttpBoundProtocolGenerator.kt:399 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:383 */
-34
+}
-35
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:421 */
 pub fn ser_empty_input_and_empty_output_http_response(
     #[allow(unused_variables)] output: crate::output::EmptyInputAndEmptyOutputOutput,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
 > {
     /* ServerHttpBoundProtocolGenerator.kt:433 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:523 */
         let mut builder = ::http::Response::builder();
         /* ServerHttpBoundProtocolGenerator.kt:597 */
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/json",
         );
         /* ServerHttpBoundProtocolGenerator.kt:682 */
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         /* ServerHttpBoundProtocolGenerator.kt:561 */
         let payload =
             crate::protocol_serde::shape_empty_input_and_empty_output_output::ser_empty_input_and_empty_output_output_output_output(&output)?
--
+        ;
             /* HttpBoundProtocolPayloadGenerator.kt:237 */crate::protocol_serde::shape_empty_input_and_empty_output_output::ser_empty_input_and_empty_output_output_output_output(&output)?
         /* ServerHttpBoundProtocolGenerator.kt:561 */;
         /* ServerHttpBoundProtocolGenerator.kt:663 */
         let content_length = payload.len();
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         /* ServerHttpBoundProtocolGenerator.kt:567 */
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         /* ServerHttpBoundProtocolGenerator.kt:575 */
         builder.body(body)?
         /* ServerHttpBoundProtocolGenerator.kt:433 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:421 */
-78
+}

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

@@ -1,1 +17,25 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonSerializerGenerator.kt:213 */
 pub fn ser_empty_input_and_empty_output_output_output_output(
     value: &crate::output::EmptyInputAndEmptyOutputOutput,
 ) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:218 */
     let mut out = ::std::string::String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     /* JsonSerializerGenerator.kt:375 */
     crate::protocol_serde::shape_empty_input_and_empty_output_output::ser_empty_input_and_empty_output_output_output(&mut object, value)?;
     /* JsonSerializerGenerator.kt:227 */
     object.finish();
     Ok(out)
     /* JsonSerializerGenerator.kt:213 */
-15
+}
-16
 /* JsonSerializerGenerator.kt:358 */
 pub fn ser_empty_input_and_empty_output_output_output(
     #[allow(unused_variables)] object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     #[allow(unused_variables)] input: &crate::output::EmptyInputAndEmptyOutputOutput,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:372 */
     Ok(())
     /* JsonSerializerGenerator.kt:358 */
-25
+}

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

@@ -1,1 +54,80 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:383 */
 pub async fn de_endpoint_operation_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::EndpointOperationInput,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
-10
+>
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-16
+{
     /* ServerHttpBoundProtocolGenerator.kt:399 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:723 */
         let mut input = crate::input::endpoint_operation_input::Builder::default();
         /* RustType.kt:516 */
         #[allow(unused_variables)]
         /* ServerHttpBoundProtocolGenerator.kt:728 */
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         /* ServerHttpBoundProtocolGenerator.kt:811 */
         ::aws_smithy_http_server::protocol::content_type_header_classifier_smithy(&headers, None)?;
         /* ServerHttpBoundProtocolGenerator.kt:834 */
         input.build()
         /* ServerHttpBoundProtocolGenerator.kt:399 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:383 */
-36
+}
-37
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:421 */
 pub fn ser_endpoint_operation_http_response(
     #[allow(unused_variables)] output: crate::output::EndpointOperationOutput,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
 > {
     /* ServerHttpBoundProtocolGenerator.kt:433 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:523 */
         let mut builder = ::http::Response::builder();
         /* ServerHttpBoundProtocolGenerator.kt:597 */
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/json",
         );
         /* ServerHttpBoundProtocolGenerator.kt:682 */
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         let payload = "";
         /* ServerHttpBoundProtocolGenerator.kt:561 */
         let payload =
             /* HttpBoundProtocolPayloadGenerator.kt:235 */""
         /* ServerHttpBoundProtocolGenerator.kt:561 */;
         /* ServerHttpBoundProtocolGenerator.kt:663 */
         let content_length = payload.len();
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         /* ServerHttpBoundProtocolGenerator.kt:567 */
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         /* ServerHttpBoundProtocolGenerator.kt:575 */
         builder.body(body)?
         /* ServerHttpBoundProtocolGenerator.kt:433 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:421 */
-80
+}

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

@@ -1,1 +149,216 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:383 */
 pub async fn de_endpoint_with_host_label_operation_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::EndpointWithHostLabelOperationInput,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
-10
+>
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-16
+{
     /* ServerHttpBoundProtocolGenerator.kt:399 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:723 */
         let mut input = crate::input::endpoint_with_host_label_operation_input::Builder::default();
         /* RustType.kt:516 */
         #[allow(unused_variables)]
         /* ServerHttpBoundProtocolGenerator.kt:728 */
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         /* ServerHttpBoundProtocolGenerator.kt:745 */
         let bytes = ::hyper::body::to_bytes(body).await?;
         /* ServerHttpBoundProtocolGenerator.kt:768 */
         if !bytes.is_empty() {
             /* ServerHttpBoundProtocolGenerator.kt:769 */
             ::aws_smithy_http_server::protocol::content_type_header_classifier_smithy(
                 &headers,
                 Some("application/json"),
             )?;
             input = crate::protocol_serde::shape_endpoint_with_host_label_operation::de_endpoint_with_host_label_operation(bytes.as_ref(), input)?;
             /* ServerHttpBoundProtocolGenerator.kt:768 */
-40
+        }
         /* ServerHttpBoundProtocolGenerator.kt:834 */
         input.build()?
         /* ServerHttpBoundProtocolGenerator.kt:399 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:383 */
-46
+}
-47
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:421 */
 pub fn ser_endpoint_with_host_label_operation_http_response(
     #[allow(unused_variables)] output: crate::output::EndpointWithHostLabelOperationOutput,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
 > {
     /* ServerHttpBoundProtocolGenerator.kt:433 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:523 */
         let mut builder = ::http::Response::builder();
         /* ServerHttpBoundProtocolGenerator.kt:597 */
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/json",
         );
         /* ServerHttpBoundProtocolGenerator.kt:682 */
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         let payload = "";
         /* ServerHttpBoundProtocolGenerator.kt:561 */
         let payload =
             /* HttpBoundProtocolPayloadGenerator.kt:235 */""
         /* ServerHttpBoundProtocolGenerator.kt:561 */;
         /* ServerHttpBoundProtocolGenerator.kt:663 */
         let content_length = payload.len();
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         /* ServerHttpBoundProtocolGenerator.kt:567 */
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         /* ServerHttpBoundProtocolGenerator.kt:575 */
         builder.body(body)?
         /* ServerHttpBoundProtocolGenerator.kt:433 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:421 */
-90
+}
-91
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:447 */
 pub fn ser_endpoint_with_host_label_operation_http_error(
     error: &crate::error::EndpointWithHostLabelOperationError,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
 > {
     /* ServerHttpBoundProtocolGenerator.kt:452 */
     Ok({
         /* ServerHttpBoundProtocolGenerator.kt:468 */
         match error {
             /* ServerHttpBoundProtocolGenerator.kt:476 */
             crate::error::EndpointWithHostLabelOperationError::ValidationException(output) => {
                 /* ServerHttpBoundProtocolGenerator.kt:477 */
                 let payload = crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(output)?;
                 /* RustType.kt:516 */
                 #[allow(unused_mut)]
                 /* ServerHttpBoundProtocolGenerator.kt:487 */
                 let mut builder = ::http::Response::builder();
                 /* ServerHttpBoundProtocolGenerator.kt:597 */
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_TYPE,
                     "application/json",
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:597 */
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::HeaderName::from_static("x-amzn-errortype"),
                     "ValidationException",
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:663 */
                 let content_length = payload.len();
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_LENGTH,
                     content_length,
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:504 */
                 builder
                     .status(400)
                     .body(::aws_smithy_http_server::body::to_boxed(payload))?
                 /* ServerHttpBoundProtocolGenerator.kt:476 */
             } /* ServerHttpBoundProtocolGenerator.kt:468 */
-138
+        }
--
+        }
         /* ServerHttpBoundProtocolGenerator.kt:452 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:447 */
-142
+}
-143
 /* JsonParserGenerator.kt:148 */
 pub(crate) fn de_endpoint_with_host_label_operation(
     value: &[u8],
     mut builder: crate::input::endpoint_with_host_label_operation_input::Builder,
 ) -> ::std::result::Result<
     crate::input::endpoint_with_host_label_operation_input::Builder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     /* JsonParserGenerator.kt:153 */
     let mut tokens_owned =
         ::aws_smithy_json::deserialize::json_token_iter(crate::protocol_serde::or_empty_doc(value))
             .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     /* JsonParserGenerator.kt:684 */
     loop {
         /* JsonParserGenerator.kt:685 */
         match tokens.next().transpose()? {
             /* JsonParserGenerator.kt:686 */
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 /* JsonParserGenerator.kt:260 */
                 match key.to_unescaped()?.as_ref() {
                     /* JsonParserGenerator.kt:262 */
                     "label" => {
                         /* JsonParserGenerator.kt:276 */
                         if let Some(v) =
                             /* JsonParserGenerator.kt:354 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                     tokens.next(),
                                 )?
                             .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                 .map(|s|
                             /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
                                 /* JsonParserGenerator.kt:348 */u.into_owned()
                             /* JsonParserGenerator.kt:339 */) /* JsonParserGenerator.kt:354 */)
                                 .transpose()?
                         /* JsonParserGenerator.kt:278 */
-181
+                        {
                             builder = builder.set_label(v);
-183
+                        }
                         /* JsonParserGenerator.kt:262 */
-185
+                    }
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
                     /* JsonParserGenerator.kt:290 */
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
-188
+                }
                 /* JsonParserGenerator.kt:686 */
-190
+            }
             /* JsonParserGenerator.kt:695 */
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {:?}",
                         other
                     )),
-198
+                )
             } /* JsonParserGenerator.kt:685 */
-200
+        }
         /* JsonParserGenerator.kt:684 */
-202
+    }
--
+    }
     /* JsonParserGenerator.kt:250 */
     if tokens.next().is_some() {
         /* JsonParserGenerator.kt:251 */
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
         /* JsonParserGenerator.kt:250 */
-212
+    }
     /* JsonParserGenerator.kt:163 */
     Ok(builder)
     /* JsonParserGenerator.kt:148 */
-216
+}

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

@@ -1,1 +67,97 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonSerializerGenerator.kt:358 */
 pub fn ser_farewell(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::model::Farewell,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     /* SerializerUtil.kt:46 */
-8
+    {
         /* JsonSerializerGenerator.kt:423 */
         object.key("phrase").string(input.phrase.as_str());
         /* SerializerUtil.kt:46 */
-12
+    }
     /* JsonSerializerGenerator.kt:372 */
     Ok(())
     /* JsonSerializerGenerator.kt:358 */
-16
+}
-17
 /* JsonParserGenerator.kt:516 */
 pub(crate) fn de_farewell<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<crate::model::Farewell>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-24
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-32
+{
     /* JsonParserGenerator.kt:712 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:713 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* RustType.kt:516 */
             #[allow(unused_mut)]
             /* JsonParserGenerator.kt:526 */
             let mut builder = crate::model::farewell::Builder::default();
             /* JsonParserGenerator.kt:684 */
             loop {
                 /* JsonParserGenerator.kt:685 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:686 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         /* JsonParserGenerator.kt:260 */
                         match key.to_unescaped()?.as_ref() {
                             /* JsonParserGenerator.kt:262 */
                             "phrase" => {
                                 /* JsonParserGenerator.kt:276 */
                                 if let Some(v) =
                                     ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?
--
+                                {
                                 /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                     /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
                                         /* JsonParserGenerator.kt:348 */u.into_owned()
                                     /* JsonParserGenerator.kt:339 */)
                                 /* JsonParserGenerator.kt:354 */).transpose()?
                                 /* JsonParserGenerator.kt:278 */{
                                                                             builder = builder.set_phrase(v);
-62
+                                                                        }
                                 /* JsonParserGenerator.kt:262 */
-64
+                            }
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
                             /* JsonParserGenerator.kt:290 */
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
-67
+                        }
                         /* JsonParserGenerator.kt:686 */
-69
+                    }
                     /* JsonParserGenerator.kt:695 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {:?}", other),
                             ),
-76
+                        )
                     } /* JsonParserGenerator.kt:685 */
-78
+                }
                 /* JsonParserGenerator.kt:684 */
-80
+            }
--
+            }
             /* JsonParserGenerator.kt:540 */
             Ok(Some(builder.build()))
             /* JsonParserGenerator.kt:713 */
-84
+        }
         _ => Err(
         /* JsonParserGenerator.kt:722 */
         _ => {
             /* JsonParserGenerator.kt:723 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
         ),
-+
+            )
             /* JsonParserGenerator.kt:722 */
         } /* JsonParserGenerator.kt:712 */
-95
+    }
     /* JsonParserGenerator.kt:516 */
-97
+}

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

@@ -1,1 +54,80 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:398 */
 pub(crate) fn de_foo_enum_list<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<crate::unconstrained::foo_enum_list_unconstrained::FooEnumListUnconstrained>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-8
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-16
+{
     /* JsonParserGenerator.kt:712 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:713 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             /* JsonParserGenerator.kt:407 */
             let mut items = Vec::new();
             /* JsonParserGenerator.kt:408 */
             loop {
                 /* JsonParserGenerator.kt:409 */
                 match tokens.peek() {
                     /* JsonParserGenerator.kt:410 */
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         /* JsonParserGenerator.kt:411 */
                         tokens.next().transpose().unwrap();
                         break;
                         /* JsonParserGenerator.kt:410 */
-34
+                    }
                     /* JsonParserGenerator.kt:413 */
                     _ => {
                         let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(
                             tokens.next(),
                         )?
                         .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                         .transpose()?;
                         /* JsonParserGenerator.kt:419 */
                         let value =
                             /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                 /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:343 */u.into_owned()
                                 /* JsonParserGenerator.kt:339 */)
                             /* JsonParserGenerator.kt:354 */).transpose()?
                         /* JsonParserGenerator.kt:419 */;
                         /* JsonParserGenerator.kt:422 */
                         if let Some(value) = value {
                             items.push(value);
                         } else {
-+
+                        }
                         /* JsonParserGenerator.kt:430 */
                         else {
                             return Err(
                                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense list cannot contain null values",
                                 ),
                             );
-56
+                        }
                         /* JsonParserGenerator.kt:413 */
                     } /* JsonParserGenerator.kt:409 */
-59
+                }
                 /* JsonParserGenerator.kt:408 */
-61
+            }
--
+            }
             /* JsonParserGenerator.kt:444 */
             Ok(Some(
                 crate::unconstrained::foo_enum_list_unconstrained::FooEnumListUnconstrained(items),
             ))
             /* JsonParserGenerator.kt:713 */
-67
+        }
         _ => Err(
         /* JsonParserGenerator.kt:722 */
         _ => {
             /* JsonParserGenerator.kt:723 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start array or null",
                 ),
         ),
-+
+            )
             /* JsonParserGenerator.kt:722 */
         } /* JsonParserGenerator.kt:712 */
-78
+    }
     /* JsonParserGenerator.kt:398 */
-80
+}

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

@@ -1,1 +62,89 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:460 */
 pub(crate) fn de_foo_enum_map<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<crate::unconstrained::foo_enum_map_unconstrained::FooEnumMapUnconstrained>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-8
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-16
+{
     /* JsonParserGenerator.kt:712 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:713 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* JsonParserGenerator.kt:469 */
             let mut map = ::std::collections::HashMap::new();
             /* JsonParserGenerator.kt:684 */
             loop {
                 /* JsonParserGenerator.kt:685 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:686 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         let key = key.to_unescaped().map(|u| u.into_owned())?;
                         let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(
                             tokens.next(),
                         )?
                         .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                         .transpose()?;
                         /* JsonParserGenerator.kt:471 */
                         let key =
                             /* JsonParserGenerator.kt:339 */key.to_unescaped().map(|u|
                                 /* JsonParserGenerator.kt:348 */u.into_owned()
                             /* JsonParserGenerator.kt:339 */)
                         /* JsonParserGenerator.kt:471 */?;
                         /* JsonParserGenerator.kt:474 */
                         let value =
                             /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                 /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:343 */u.into_owned()
                                 /* JsonParserGenerator.kt:339 */)
                             /* JsonParserGenerator.kt:354 */).transpose()?
                         /* JsonParserGenerator.kt:474 */;
                         /* JsonParserGenerator.kt:481 */
                         match value {
                             Some(value) => {
                                 map.insert(key, value);
-49
+                            }
                             None => {
                                 return Err(
                                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                         "dense map cannot contain null values",
                                     ),
-55
+                                )
-56
+                            }
-57
+                        }
                         /* JsonParserGenerator.kt:686 */
-59
+                    }
                     /* JsonParserGenerator.kt:695 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {:?}", other),
                             ),
-66
+                        )
                     } /* JsonParserGenerator.kt:685 */
-68
+                }
                 /* JsonParserGenerator.kt:684 */
-70
+            }
--
+            }
             /* JsonParserGenerator.kt:502 */
             Ok(Some(
                 crate::unconstrained::foo_enum_map_unconstrained::FooEnumMapUnconstrained(map),
             ))
             /* JsonParserGenerator.kt:713 */
-76
+        }
         _ => Err(
         /* JsonParserGenerator.kt:722 */
         _ => {
             /* JsonParserGenerator.kt:723 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
         ),
-+
+            )
             /* JsonParserGenerator.kt:722 */
         } /* JsonParserGenerator.kt:712 */
-87
+    }
     /* JsonParserGenerator.kt:460 */
-89
+}

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

@@ -1,1 +54,80 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:398 */
 pub(crate) fn de_foo_enum_set<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<crate::unconstrained::foo_enum_set_unconstrained::FooEnumSetUnconstrained>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-8
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-16
+{
     /* JsonParserGenerator.kt:712 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:713 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             /* JsonParserGenerator.kt:407 */
             let mut items = Vec::new();
             /* JsonParserGenerator.kt:408 */
             loop {
                 /* JsonParserGenerator.kt:409 */
                 match tokens.peek() {
                     /* JsonParserGenerator.kt:410 */
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         /* JsonParserGenerator.kt:411 */
                         tokens.next().transpose().unwrap();
                         break;
                         /* JsonParserGenerator.kt:410 */
-34
+                    }
                     /* JsonParserGenerator.kt:413 */
                     _ => {
                         let value = ::aws_smithy_json::deserialize::token::expect_string_or_null(
                             tokens.next(),
                         )?
                         .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                         .transpose()?;
                         /* JsonParserGenerator.kt:419 */
                         let value =
                             /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                 /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:343 */u.into_owned()
                                 /* JsonParserGenerator.kt:339 */)
                             /* JsonParserGenerator.kt:354 */).transpose()?
                         /* JsonParserGenerator.kt:419 */;
                         /* JsonParserGenerator.kt:422 */
                         if let Some(value) = value {
                             items.push(value);
                         } else {
-+
+                        }
                         /* JsonParserGenerator.kt:430 */
                         else {
                             return Err(
                                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense list cannot contain null values",
                                 ),
                             );
-56
+                        }
                         /* JsonParserGenerator.kt:413 */
                     } /* JsonParserGenerator.kt:409 */
-59
+                }
                 /* JsonParserGenerator.kt:408 */
-61
+            }
--
+            }
             /* JsonParserGenerator.kt:444 */
             Ok(Some(
                 crate::unconstrained::foo_enum_set_unconstrained::FooEnumSetUnconstrained(items),
             ))
             /* JsonParserGenerator.kt:713 */
-67
+        }
         _ => Err(
         /* JsonParserGenerator.kt:722 */
         _ => {
             /* JsonParserGenerator.kt:723 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start array or null",
                 ),
         ),
-+
+            )
             /* JsonParserGenerator.kt:722 */
         } /* JsonParserGenerator.kt:712 */
-78
+    }
     /* JsonParserGenerator.kt:398 */
-80
+}

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

@@ -1,1 +17,25 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonSerializerGenerator.kt:213 */
 pub fn ser_foo_error_error(
     value: &crate::error::FooError,
 ) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:218 */
     let mut out = ::std::string::String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     /* JsonSerializerGenerator.kt:375 */
     crate::protocol_serde::shape_foo_error::ser_foo_error(&mut object, value)?;
     /* JsonSerializerGenerator.kt:227 */
     object.finish();
     Ok(out)
     /* JsonSerializerGenerator.kt:213 */
-15
+}
-16
 /* JsonSerializerGenerator.kt:358 */
 pub fn ser_foo_error(
     #[allow(unused_variables)] object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     #[allow(unused_variables)] input: &crate::error::FooError,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:372 */
     Ok(())
     /* JsonSerializerGenerator.kt:358 */
-25
+}

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

@@ -1,1 +56,80 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:383 */
 pub async fn de_fractional_seconds_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::FractionalSecondsInput,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
-10
+>
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-16
+{
     /* ServerHttpBoundProtocolGenerator.kt:399 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:723 */
         let mut input = crate::input::fractional_seconds_input::Builder::default();
         /* RustType.kt:516 */
         #[allow(unused_variables)]
         /* ServerHttpBoundProtocolGenerator.kt:728 */
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         /* ServerHttpBoundProtocolGenerator.kt:811 */
         ::aws_smithy_http_server::protocol::content_type_header_classifier_smithy(&headers, None)?;
         /* ServerHttpBoundProtocolGenerator.kt:834 */
         input.build()
         /* ServerHttpBoundProtocolGenerator.kt:399 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:383 */
-36
+}
-37
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:421 */
 pub fn ser_fractional_seconds_http_response(
     #[allow(unused_variables)] output: crate::output::FractionalSecondsOutput,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
 > {
     /* ServerHttpBoundProtocolGenerator.kt:433 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:523 */
         let mut builder = ::http::Response::builder();
         /* ServerHttpBoundProtocolGenerator.kt:597 */
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/json",
         );
         /* ServerHttpBoundProtocolGenerator.kt:682 */
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         /* ServerHttpBoundProtocolGenerator.kt:561 */
         let payload =
             crate::protocol_serde::shape_fractional_seconds_output::ser_fractional_seconds_output_output_output(&output)?
--
+        ;
             /* HttpBoundProtocolPayloadGenerator.kt:237 */crate::protocol_serde::shape_fractional_seconds_output::ser_fractional_seconds_output_output_output(&output)?
         /* ServerHttpBoundProtocolGenerator.kt:561 */;
         /* ServerHttpBoundProtocolGenerator.kt:663 */
         let content_length = payload.len();
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         /* ServerHttpBoundProtocolGenerator.kt:567 */
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         /* ServerHttpBoundProtocolGenerator.kt:575 */
         builder.body(body)?
         /* ServerHttpBoundProtocolGenerator.kt:433 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:421 */
-80
+}

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

@@ -1,1 +25,36 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonSerializerGenerator.kt:213 */
 pub fn ser_fractional_seconds_output_output_output(
     value: &crate::output::FractionalSecondsOutput,
 ) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:218 */
     let mut out = ::std::string::String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     /* JsonSerializerGenerator.kt:375 */
     crate::protocol_serde::shape_fractional_seconds_output::ser_fractional_seconds_output_output(
         &mut object,
         value,
     )?;
     /* JsonSerializerGenerator.kt:227 */
     object.finish();
     Ok(out)
     /* JsonSerializerGenerator.kt:213 */
-18
+}
-19
 /* JsonSerializerGenerator.kt:358 */
 pub fn ser_fractional_seconds_output_output(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::output::FractionalSecondsOutput,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:382 */
     if let Some(var_1) = &input.datetime {
         /* JsonSerializerGenerator.kt:448 */
         object
             .key("datetime")
             .date_time(var_1, ::aws_smithy_types::date_time::Format::DateTime)?;
         /* JsonSerializerGenerator.kt:382 */
-32
+    }
     /* JsonSerializerGenerator.kt:372 */
     Ok(())
     /* JsonSerializerGenerator.kt:358 */
-36
+}

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

@@ -1,1 +65,95 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:516 */
 pub(crate) fn de_greeting_struct<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
 ) -> ::std::result::Result<
     Option<crate::model::GreetingStruct>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-8
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-16
+{
     /* JsonParserGenerator.kt:712 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:713 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* RustType.kt:516 */
             #[allow(unused_mut)]
             /* JsonParserGenerator.kt:526 */
             let mut builder = crate::model::greeting_struct::Builder::default();
             /* JsonParserGenerator.kt:684 */
             loop {
                 /* JsonParserGenerator.kt:685 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:686 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         /* JsonParserGenerator.kt:260 */
                         match key.to_unescaped()?.as_ref() {
                             /* JsonParserGenerator.kt:262 */
                             "hi" => {
                                 /* JsonParserGenerator.kt:272 */
                                 builder = builder.set_hi(
                                     ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                         tokens.next(),
                                     )?
                                     .map(|s| s.to_unescaped().map(|u| u.into_owned()))
                                     .transpose()?,
                                 );
                                     /* JsonParserGenerator.kt:354 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                         /* JsonParserGenerator.kt:339 */s.to_unescaped().map(|u|
                                             /* JsonParserGenerator.kt:348 */u.into_owned()
                                         /* JsonParserGenerator.kt:339 */)
                                     /* JsonParserGenerator.kt:354 */).transpose()?
                                 /* JsonParserGenerator.kt:272 */);
                                 /* JsonParserGenerator.kt:262 */
-46
+                            }
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?,
                             /* JsonParserGenerator.kt:290 */
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:260 */
-49
+                        }
                         /* JsonParserGenerator.kt:686 */
-51
+                    }
                     /* JsonParserGenerator.kt:695 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {:?}", other),
                             ),
-58
+                        )
                     } /* JsonParserGenerator.kt:685 */
-60
+                }
                 /* JsonParserGenerator.kt:684 */
-62
+            }
--
+            }
             /* JsonParserGenerator.kt:540 */
             Ok(Some(builder.build()))
             /* JsonParserGenerator.kt:713 */
-66
+        }
         _ => Err(
         /* JsonParserGenerator.kt:722 */
         _ => {
             /* JsonParserGenerator.kt:723 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
         ),
-+
+            )
             /* JsonParserGenerator.kt:722 */
         } /* JsonParserGenerator.kt:712 */
-77
+    }
     /* JsonParserGenerator.kt:516 */
-79
+}
-80
 /* JsonSerializerGenerator.kt:358 */
 pub fn ser_greeting_struct(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::model::GreetingStruct,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:382 */
     if let Some(var_1) = &input.hi {
         /* JsonSerializerGenerator.kt:423 */
         object.key("hi").string(var_1.as_str());
         /* JsonSerializerGenerator.kt:382 */
-91
+    }
     /* JsonSerializerGenerator.kt:372 */
     Ok(())
     /* JsonSerializerGenerator.kt:358 */
-95
+}

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

@@ -1,1 +176,244 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:383 */
 pub async fn de_greeting_with_errors_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::GreetingWithErrorsInput,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
-10
+>
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-16
+{
     /* ServerHttpBoundProtocolGenerator.kt:399 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:723 */
         let mut input = crate::input::greeting_with_errors_input::Builder::default();
         /* RustType.kt:516 */
         #[allow(unused_variables)]
         /* ServerHttpBoundProtocolGenerator.kt:728 */
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         /* ServerHttpBoundProtocolGenerator.kt:811 */
         ::aws_smithy_http_server::protocol::content_type_header_classifier_smithy(&headers, None)?;
         /* ServerHttpBoundProtocolGenerator.kt:834 */
         input.build()
         /* ServerHttpBoundProtocolGenerator.kt:399 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:383 */
-36
+}
-37
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:421 */
 pub fn ser_greeting_with_errors_http_response(
     #[allow(unused_variables)] output: crate::output::GreetingWithErrorsOutput,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
 > {
     /* ServerHttpBoundProtocolGenerator.kt:433 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:523 */
         let mut builder = ::http::Response::builder();
         /* ServerHttpBoundProtocolGenerator.kt:629 */
         builder =
             crate::protocol_serde::shape_greeting_with_errors::ser_greeting_with_errors_headers(
                 &output, builder,
             )?;
         /* ServerHttpBoundProtocolGenerator.kt:597 */
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/json",
         );
         /* ServerHttpBoundProtocolGenerator.kt:682 */
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         /* ServerHttpBoundProtocolGenerator.kt:561 */
         let payload =
             crate::protocol_serde::shape_greeting_with_errors_output::ser_greeting_with_errors_output_output_output(&output)?
--
+        ;
             /* HttpBoundProtocolPayloadGenerator.kt:237 */crate::protocol_serde::shape_greeting_with_errors_output::ser_greeting_with_errors_output_output_output(&output)?
         /* ServerHttpBoundProtocolGenerator.kt:561 */;
         /* ServerHttpBoundProtocolGenerator.kt:663 */
         let content_length = payload.len();
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         /* ServerHttpBoundProtocolGenerator.kt:567 */
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         /* ServerHttpBoundProtocolGenerator.kt:575 */
         builder.body(body)?
         /* ServerHttpBoundProtocolGenerator.kt:433 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:421 */
-85
+}
-86
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:447 */
 pub fn ser_greeting_with_errors_http_error(
     error: &crate::error::GreetingWithErrorsError,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
 > {
     /* ServerHttpBoundProtocolGenerator.kt:452 */
     Ok({
         /* ServerHttpBoundProtocolGenerator.kt:468 */
         match error {
             /* ServerHttpBoundProtocolGenerator.kt:476 */
             crate::error::GreetingWithErrorsError::InvalidGreeting(output) => {
                 /* ServerHttpBoundProtocolGenerator.kt:477 */
                 let payload =
                     crate::protocol_serde::shape_invalid_greeting::ser_invalid_greeting_error(
                         output,
                     )?;
                 /* RustType.kt:516 */
                 #[allow(unused_mut)]
                 /* ServerHttpBoundProtocolGenerator.kt:487 */
                 let mut builder = ::http::Response::builder();
                 /* ServerHttpBoundProtocolGenerator.kt:597 */
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_TYPE,
                     "application/json",
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:597 */
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::HeaderName::from_static("x-amzn-errortype"),
                     "InvalidGreeting",
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:663 */
                 let content_length = payload.len();
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_LENGTH,
                     content_length,
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:504 */
                 builder
                     .status(400)
                     .body(::aws_smithy_http_server::body::to_boxed(payload))?
                 /* ServerHttpBoundProtocolGenerator.kt:476 */
-135
+            }
             /* ServerHttpBoundProtocolGenerator.kt:476 */
             crate::error::GreetingWithErrorsError::ComplexError(output) => {
                 /* ServerHttpBoundProtocolGenerator.kt:477 */
                 let payload =
                     crate::protocol_serde::shape_complex_error::ser_complex_error_error(output)?;
                 /* RustType.kt:516 */
                 #[allow(unused_mut)]
                 /* ServerHttpBoundProtocolGenerator.kt:487 */
                 let mut builder = ::http::Response::builder();
                 /* ServerHttpBoundProtocolGenerator.kt:629 */
                 builder = crate::protocol_serde::shape_complex_error::ser_complex_error_headers(
                     output, builder,
                 )?;
                 /* ServerHttpBoundProtocolGenerator.kt:597 */
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_TYPE,
                     "application/json",
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:597 */
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::HeaderName::from_static("x-amzn-errortype"),
                     "ComplexError",
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:663 */
                 let content_length = payload.len();
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_LENGTH,
                     content_length,
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:504 */
                 builder
                     .status(403)
                     .body(::aws_smithy_http_server::body::to_boxed(payload))?
                 /* ServerHttpBoundProtocolGenerator.kt:476 */
-173
+            }
             /* ServerHttpBoundProtocolGenerator.kt:476 */
             crate::error::GreetingWithErrorsError::FooError(output) => {
                 /* ServerHttpBoundProtocolGenerator.kt:477 */
                 let payload = crate::protocol_serde::shape_foo_error::ser_foo_error_error(output)?;
                 /* RustType.kt:516 */
                 #[allow(unused_mut)]
                 /* ServerHttpBoundProtocolGenerator.kt:487 */
                 let mut builder = ::http::Response::builder();
                 /* ServerHttpBoundProtocolGenerator.kt:597 */
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_TYPE,
                     "application/json",
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:597 */
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::HeaderName::from_static("x-amzn-errortype"),
                     "FooError",
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:663 */
                 let content_length = payload.len();
                 builder = ::aws_smithy_http::header::set_response_header_if_absent(
                     builder,
                     ::http::header::CONTENT_LENGTH,
                     content_length,
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:504 */
                 builder
                     .status(500)
                     .body(::aws_smithy_http_server::body::to_boxed(payload))?
                 /* ServerHttpBoundProtocolGenerator.kt:476 */
             } /* ServerHttpBoundProtocolGenerator.kt:468 */
-207
+        }
--
+        }
         /* ServerHttpBoundProtocolGenerator.kt:452 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:447 */
-211
+}
-212
 /* HttpBindingGenerator.kt:542 */
 pub fn ser_greeting_with_errors_headers(
     input: &crate::output::GreetingWithErrorsOutput,
     mut builder: ::http::response::Builder,
 ) -> std::result::Result<::http::response::Builder, ::aws_smithy_types::error::operation::BuildError>
-218
+{
     /* HttpBindingGenerator.kt:592 */
     if let ::std::option::Option::Some(inner_1) = &input.greeting {
         /* HttpBindingGenerator.kt:704 */
         let formatted_2 = inner_1.as_str();
         /* HttpBindingGenerator.kt:705 */
         if !formatted_2.is_empty() {
             /* HttpBindingGenerator.kt:706 */
             let header_value = formatted_2;
             let header_value: ::http::HeaderValue = header_value.parse().map_err(|err| {
                 ::aws_smithy_types::error::operation::BuildError::invalid_field(
                     "greeting",
                     format!(
                         "`{}` cannot be used as a header value: {}",
                         &header_value, err
                     ),
-234
+                )
             })?;
             builder = builder.header("X-Greeting", header_value);
             /* HttpBindingGenerator.kt:705 */
-238
+        }
         /* HttpBindingGenerator.kt:592 */
-240
+    }
     /* HttpBindingGenerator.kt:555 */
     Ok(builder)
     /* HttpBindingGenerator.kt:542 */
-244
+}

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

@@ -1,1 +17,25 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonSerializerGenerator.kt:213 */
 pub fn ser_greeting_with_errors_output_output_output(
     value: &crate::output::GreetingWithErrorsOutput,
 ) -> ::std::result::Result<String, ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:218 */
     let mut out = ::std::string::String::new();
     let mut object = ::aws_smithy_json::serialize::JsonObjectWriter::new(&mut out);
     /* JsonSerializerGenerator.kt:375 */
     crate::protocol_serde::shape_greeting_with_errors_output::ser_greeting_with_errors_output_output(&mut object, value)?;
     /* JsonSerializerGenerator.kt:227 */
     object.finish();
     Ok(out)
     /* JsonSerializerGenerator.kt:213 */
-15
+}
-16
 /* JsonSerializerGenerator.kt:358 */
 pub fn ser_greeting_with_errors_output_output(
     #[allow(unused_variables)] object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     #[allow(unused_variables)] input: &crate::output::GreetingWithErrorsOutput,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:372 */
     Ok(())
     /* JsonSerializerGenerator.kt:358 */
-25
+}

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

@@ -1,1 +54,80 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:383 */
 pub async fn de_host_with_path_operation_http_request<B>(
     #[allow(unused_variables)] request: ::http::Request<B>,
 ) -> std::result::Result<
     crate::input::HostWithPathOperationInput,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection,
-10
+>
 where
     B: ::aws_smithy_http_server::body::HttpBody + Send,
     B::Data: Send,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::RequestRejection:
         From<<B as ::aws_smithy_http_server::body::HttpBody>::Error>,
-16
+{
     /* ServerHttpBoundProtocolGenerator.kt:399 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:723 */
         let mut input = crate::input::host_with_path_operation_input::Builder::default();
         /* RustType.kt:516 */
         #[allow(unused_variables)]
         /* ServerHttpBoundProtocolGenerator.kt:728 */
         let ::aws_smithy_runtime_api::http::RequestParts {
             uri, headers, body, ..
         } = ::aws_smithy_runtime_api::http::Request::try_from(request)?.into_parts();
         /* ServerHttpBoundProtocolGenerator.kt:811 */
         ::aws_smithy_http_server::protocol::content_type_header_classifier_smithy(&headers, None)?;
         /* ServerHttpBoundProtocolGenerator.kt:834 */
         input.build()
         /* ServerHttpBoundProtocolGenerator.kt:399 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:383 */
-36
+}
-37
 /* RustType.kt:516 */
 #[allow(clippy::unnecessary_wraps)]
 /* ServerHttpBoundProtocolGenerator.kt:421 */
 pub fn ser_host_with_path_operation_http_response(
     #[allow(unused_variables)] output: crate::output::HostWithPathOperationOutput,
 ) -> std::result::Result<
     ::aws_smithy_http_server::response::Response,
     ::aws_smithy_http_server::protocol::rest_json_1::rejection::ResponseRejection,
 > {
     /* ServerHttpBoundProtocolGenerator.kt:433 */
     Ok({
         /* RustType.kt:516 */
         #[allow(unused_mut)]
         /* ServerHttpBoundProtocolGenerator.kt:523 */
         let mut builder = ::http::Response::builder();
         /* ServerHttpBoundProtocolGenerator.kt:597 */
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_TYPE,
             "application/json",
         );
         /* ServerHttpBoundProtocolGenerator.kt:682 */
         let http_status: u16 = 200;
         builder = builder.status(http_status);
         let payload = "";
         /* ServerHttpBoundProtocolGenerator.kt:561 */
         let payload =
             /* HttpBoundProtocolPayloadGenerator.kt:235 */""
         /* ServerHttpBoundProtocolGenerator.kt:561 */;
         /* ServerHttpBoundProtocolGenerator.kt:663 */
         let content_length = payload.len();
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http::header::CONTENT_LENGTH,
             content_length,
         );
         /* ServerHttpBoundProtocolGenerator.kt:567 */
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         /* ServerHttpBoundProtocolGenerator.kt:575 */
         builder.body(body)?
         /* ServerHttpBoundProtocolGenerator.kt:433 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:421 */
-80
+}

Server Test

Files changed: