Server Test

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

@@ -1,1 +84,84 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:497 */
 /* JsonParserGenerator.kt:490 */
 pub(crate) fn de_document_valued_map<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<::std::collections::HashMap<::std::string::String, ::aws_smithy_types::Document>>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* JsonParserGenerator.kt:506 */
             /* JsonParserGenerator.kt:499 */
             let mut map = ::std::collections::HashMap::new();
             /* JsonParserGenerator.kt:721 */
             /* JsonParserGenerator.kt:703 */
             loop {
                 /* JsonParserGenerator.kt:722 */
                 /* JsonParserGenerator.kt:704 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:723 */
                     /* JsonParserGenerator.kt:705 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         /* JsonParserGenerator.kt:508 */
                         /* JsonParserGenerator.kt:501 */
                         let key =
                             /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
                                 /* JsonParserGenerator.kt:355 */u.into_owned()
                             /* JsonParserGenerator.kt:346 */)
                         /* JsonParserGenerator.kt:508 */?;
                         /* JsonParserGenerator.kt:511 */
                         /* JsonParserGenerator.kt:501 */?;
                         /* JsonParserGenerator.kt:504 */
                         let value =
                             /* JsonParserGenerator.kt:326 */Some(::aws_smithy_json::deserialize::token::expect_document(tokens)?)
                         /* JsonParserGenerator.kt:511 */;
                         /* JsonParserGenerator.kt:518 */
                         /* JsonParserGenerator.kt:504 */;
                         /* JsonParserGenerator.kt:510 */
                         match value {
                             Some(value) => {
                                 map.insert(key, value);
-46
+                            }
                             None => {
                                 return Err(
                                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                         "dense map cannot contain null values",
                                     ),
-52
+                                )
-53
+                            }
-54
+                        }
                         /* JsonParserGenerator.kt:723 */
                         /* JsonParserGenerator.kt:705 */
-56
+                    }
                     /* JsonParserGenerator.kt:732 */
                     /* JsonParserGenerator.kt:714 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-63
+                        )
                     } /* JsonParserGenerator.kt:722 */
                     } /* JsonParserGenerator.kt:704 */
-65
+                }
                 /* JsonParserGenerator.kt:721 */
                 /* JsonParserGenerator.kt:703 */
-67
+            }
             /* JsonParserGenerator.kt:541 */
             /* JsonParserGenerator.kt:523 */
             Ok(Some(map))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-71
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
-79
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-82
+    }
     /* JsonParserGenerator.kt:497 */
     /* JsonParserGenerator.kt:490 */
-84
+}

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

@@ -132,132 +219,219 @@

↥ Expand context

                     ::http_1x::header::CONTENT_LENGTH,
                     content_length,
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:532 */
                 builder
                     .status(400)
                     .body(::aws_smithy_http_server::body::to_boxed(payload))?
                 /* ServerHttpBoundProtocolGenerator.kt:504 */
             } /* ServerHttpBoundProtocolGenerator.kt:496 */
-141
+        }
         /* ServerHttpBoundProtocolGenerator.kt:480 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:475 */
-145
+}
-146
 /* JsonParserGenerator.kt:151 */
 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:158 */
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
         crate::protocol_serde::or_empty_doc(_value),
-158
+    )
     .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     /* JsonParserGenerator.kt:721 */
     /* JsonParserGenerator.kt:703 */
     loop {
         /* JsonParserGenerator.kt:722 */
         /* JsonParserGenerator.kt:704 */
         match tokens.next().transpose()? {
             /* JsonParserGenerator.kt:723 */
             /* JsonParserGenerator.kt:705 */
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 /* JsonParserGenerator.kt:265 */
                 match key.to_unescaped()?.as_ref() {
                     /* JsonParserGenerator.kt:267 */
                     "label" => {
                         /* JsonParserGenerator.kt:281 */
                         if let Some(v) =
                             /* JsonParserGenerator.kt:361 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                     tokens.next(),
                                 )?
                                 .map(|s|
                             /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                 /* JsonParserGenerator.kt:355 */u.into_owned()
                             /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
                                 .transpose()?
                         /* JsonParserGenerator.kt:283 */
-185
+                        {
                             builder = builder.set_label(v);
-187
+                        }
                         /* JsonParserGenerator.kt:267 */
-189
+                    }
                     /* JsonParserGenerator.kt:295 */
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
-192
+                }
                 /* JsonParserGenerator.kt:723 */
                 /* JsonParserGenerator.kt:705 */
-194
+            }
             /* JsonParserGenerator.kt:732 */
             /* JsonParserGenerator.kt:714 */
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )),
-201
+                )
             } /* JsonParserGenerator.kt:722 */
             } /* JsonParserGenerator.kt:704 */
-203
+        }
         /* JsonParserGenerator.kt:721 */
         /* JsonParserGenerator.kt:703 */
-205
+    }
     /* JsonParserGenerator.kt:255 */
     if tokens.next().is_some() {
         /* JsonParserGenerator.kt:256 */
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
         /* JsonParserGenerator.kt:255 */

↧ Expand context

-215
+    }
     /* JsonParserGenerator.kt:168 */
     Ok(builder)
     /* JsonParserGenerator.kt:151 */
-219
+}

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

@@ -18,18 +102,102 @@

↥ Expand context

 pub fn ser_error_event(
     object: &mut ::aws_smithy_json::serialize::JsonObjectWriter,
     input: &crate::error::ErrorEvent,
 ) -> ::std::result::Result<(), ::aws_smithy_types::error::operation::SerializationError> {
     /* JsonSerializerGenerator.kt:384 */
     if let Some(var_1) = &input.message {
         /* JsonSerializerGenerator.kt:425 */
         object.key("message").string(var_1.as_str());
         /* JsonSerializerGenerator.kt:384 */
-27
+    }
     /* JsonSerializerGenerator.kt:374 */
     Ok(())
     /* JsonSerializerGenerator.kt:360 */
-31
+}
-32
 /* JsonParserGenerator.kt:151 */
 pub(crate) fn de_error_event_json_err(
     _value: &[u8],
     mut builder: crate::error::error_event::Builder,
 ) -> ::std::result::Result<

     crate::error::error_event::Builder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     /* JsonParserGenerator.kt:158 */
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
         crate::protocol_serde::or_empty_doc(_value),
-44
+    )
     .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     /* JsonParserGenerator.kt:721 */
     /* JsonParserGenerator.kt:703 */
     loop {
         /* JsonParserGenerator.kt:722 */
         /* JsonParserGenerator.kt:704 */
         match tokens.next().transpose()? {
             /* JsonParserGenerator.kt:723 */
             /* JsonParserGenerator.kt:705 */
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 /* JsonParserGenerator.kt:265 */
                 match key.to_unescaped()?.as_ref() {
                     /* JsonParserGenerator.kt:267 */
                     "message" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_message(
                             /* JsonParserGenerator.kt:361 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                 tokens.next(),
                             )?
                             .map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:355 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
                             .transpose()?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-72
+                    }
                     /* JsonParserGenerator.kt:295 */
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
-75
+                }
                 /* JsonParserGenerator.kt:723 */
                 /* JsonParserGenerator.kt:705 */
-77
+            }
             /* JsonParserGenerator.kt:732 */
             /* JsonParserGenerator.kt:714 */
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )),
-84
+                )
             } /* JsonParserGenerator.kt:722 */
             } /* JsonParserGenerator.kt:704 */
-86
+        }
         /* JsonParserGenerator.kt:721 */
         /* JsonParserGenerator.kt:703 */
-88
+    }
     /* JsonParserGenerator.kt:255 */
     if tokens.next().is_some() {
         /* JsonParserGenerator.kt:256 */
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
         /* JsonParserGenerator.kt:255 */

↧ Expand context

-98
+    }
     /* JsonParserGenerator.kt:168 */
     Ok(builder)
     /* JsonParserGenerator.kt:151 */
-102
+}

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

@@ -1,1 +98,98 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonSerializerGenerator.kt:360 */
 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:425 */
         object.key("phrase").string(input.phrase.as_str());
         /* SerializerUtil.kt:46 */
-12
+    }
     /* JsonSerializerGenerator.kt:374 */
     Ok(())
     /* JsonSerializerGenerator.kt:360 */
-16
+}
-17
 /* JsonParserGenerator.kt:553 */
 /* JsonParserGenerator.kt:535 */
 pub(crate) fn de_farewell<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<crate::model::Farewell>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-25
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-33
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* RustType.kt:534 */
             #[allow(unused_mut)]
             /* JsonParserGenerator.kt:563 */
             /* JsonParserGenerator.kt:545 */
             let mut builder = crate::model::farewell::Builder::default();
             /* JsonParserGenerator.kt:721 */
             /* JsonParserGenerator.kt:703 */
             loop {
                 /* JsonParserGenerator.kt:722 */
                 /* JsonParserGenerator.kt:704 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:723 */
                     /* JsonParserGenerator.kt:705 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         /* JsonParserGenerator.kt:265 */
                         match key.to_unescaped()?.as_ref() {
                             /* JsonParserGenerator.kt:267 */
                             "phrase" => {
                                 /* JsonParserGenerator.kt:281 */
                                 if let Some(v) =
                                 /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                     /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                         /* JsonParserGenerator.kt:355 */u.into_owned()
                                     /* JsonParserGenerator.kt:346 */)
                                 /* JsonParserGenerator.kt:361 */).transpose()?
                                 /* JsonParserGenerator.kt:283 */{
                                                                             builder = builder.set_phrase(v);
-63
+                                                                        }
                                 /* JsonParserGenerator.kt:267 */
-65
+                            }
                             /* JsonParserGenerator.kt:295 */
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
-68
+                        }
                         /* JsonParserGenerator.kt:723 */
                         /* JsonParserGenerator.kt:705 */
-70
+                    }
                     /* JsonParserGenerator.kt:732 */
                     /* JsonParserGenerator.kt:714 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-77
+                        )
                     } /* JsonParserGenerator.kt:722 */
                     } /* JsonParserGenerator.kt:704 */
-79
+                }
                 /* JsonParserGenerator.kt:721 */
                 /* JsonParserGenerator.kt:703 */
-81
+            }
             /* JsonParserGenerator.kt:577 */
             /* JsonParserGenerator.kt:559 */
             Ok(Some(builder.build()))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-85
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
-93
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-96
+    }
     /* JsonParserGenerator.kt:553 */
     /* JsonParserGenerator.kt:535 */
-98
+}

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

@@ -1,1 +81,79 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:435 */
 pub(crate) fn de_foo_enum_list<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<crate::unconstrained::foo_enum_list_unconstrained::FooEnumListUnconstrained>,

     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             /* JsonParserGenerator.kt:444 */
             let mut items = Vec::new();
             /* JsonParserGenerator.kt:445 */
             loop {
                 /* JsonParserGenerator.kt:446 */
                 match tokens.peek() {
                     /* JsonParserGenerator.kt:447 */
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         /* JsonParserGenerator.kt:448 */
                         tokens.next().transpose().unwrap();
                         break;
                         /* JsonParserGenerator.kt:447 */
-35
+                    }
                     /* JsonParserGenerator.kt:450 */
                     _ => {
                         /* JsonParserGenerator.kt:456 */
                         let value =
                             /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:350 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */)
                             /* JsonParserGenerator.kt:361 */).transpose()?
                         /* JsonParserGenerator.kt:456 */;
                         /* JsonParserGenerator.kt:459 */
                         if let Some(value) = value {
                             items.push(value);
--
+                        }
                         /* JsonParserGenerator.kt:467 */
                         else {
                         } else {
                             return Err(
                                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense list cannot contain null values",
                                 ),
                             );
-55
+                        }
                         /* JsonParserGenerator.kt:450 */
                     } /* JsonParserGenerator.kt:446 */
-58
+                }
                 /* JsonParserGenerator.kt:445 */
-60
+            }
             /* JsonParserGenerator.kt:481 */
             /* JsonParserGenerator.kt:474 */
             Ok(Some(
                 crate::unconstrained::foo_enum_list_unconstrained::FooEnumListUnconstrained(items),
             ))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-66
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start array or null",
                 ),
-74
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-77
+    }
     /* JsonParserGenerator.kt:435 */
-79
+}

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

@@ -1,1 +90,90 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:497 */
 /* JsonParserGenerator.kt:490 */
 pub(crate) fn de_foo_enum_map<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<crate::unconstrained::foo_enum_map_unconstrained::FooEnumMapUnconstrained>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* JsonParserGenerator.kt:506 */
             /* JsonParserGenerator.kt:499 */
             let mut map = ::std::collections::HashMap::new();
             /* JsonParserGenerator.kt:721 */
             /* JsonParserGenerator.kt:703 */
             loop {
                 /* JsonParserGenerator.kt:722 */
                 /* JsonParserGenerator.kt:704 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:723 */
                     /* JsonParserGenerator.kt:705 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         /* JsonParserGenerator.kt:508 */
                         /* JsonParserGenerator.kt:501 */
                         let key =
                             /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
                                 /* JsonParserGenerator.kt:355 */u.into_owned()
                             /* JsonParserGenerator.kt:346 */)
                         /* JsonParserGenerator.kt:508 */?;
                         /* JsonParserGenerator.kt:511 */
                         /* JsonParserGenerator.kt:501 */?;
                         /* JsonParserGenerator.kt:504 */
                         let value =
                             /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:350 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */)
                             /* JsonParserGenerator.kt:361 */).transpose()?
                         /* JsonParserGenerator.kt:511 */;
                         /* JsonParserGenerator.kt:518 */
                         /* JsonParserGenerator.kt:504 */;
                         /* JsonParserGenerator.kt:510 */
                         match value {
                             Some(value) => {
                                 map.insert(key, value);
-50
+                            }
                             None => {
                                 return Err(
                                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                         "dense map cannot contain null values",
                                     ),
-56
+                                )
-57
+                            }
-58
+                        }
                         /* JsonParserGenerator.kt:723 */
                         /* JsonParserGenerator.kt:705 */
-60
+                    }
                     /* JsonParserGenerator.kt:732 */
                     /* JsonParserGenerator.kt:714 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-67
+                        )
                     } /* JsonParserGenerator.kt:722 */
                     } /* JsonParserGenerator.kt:704 */
-69
+                }
                 /* JsonParserGenerator.kt:721 */
                 /* JsonParserGenerator.kt:703 */
-71
+            }
             /* JsonParserGenerator.kt:539 */
             /* JsonParserGenerator.kt:521 */
             Ok(Some(
                 crate::unconstrained::foo_enum_map_unconstrained::FooEnumMapUnconstrained(map),
             ))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-77
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
-85
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-88
+    }
     /* JsonParserGenerator.kt:497 */
     /* JsonParserGenerator.kt:490 */
-90
+}

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

@@ -1,1 +81,79 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:435 */
 pub(crate) fn de_foo_enum_set<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<crate::unconstrained::foo_enum_set_unconstrained::FooEnumSetUnconstrained>,

     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             /* JsonParserGenerator.kt:444 */
             let mut items = Vec::new();
             /* JsonParserGenerator.kt:445 */
             loop {
                 /* JsonParserGenerator.kt:446 */
                 match tokens.peek() {
                     /* JsonParserGenerator.kt:447 */
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         /* JsonParserGenerator.kt:448 */
                         tokens.next().transpose().unwrap();
                         break;
                         /* JsonParserGenerator.kt:447 */
-35
+                    }
                     /* JsonParserGenerator.kt:450 */
                     _ => {
                         /* JsonParserGenerator.kt:456 */
                         let value =
                             /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:350 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */)
                             /* JsonParserGenerator.kt:361 */).transpose()?
                         /* JsonParserGenerator.kt:456 */;
                         /* JsonParserGenerator.kt:459 */
                         if let Some(value) = value {
                             items.push(value);
--
+                        }
                         /* JsonParserGenerator.kt:467 */
                         else {
                         } else {
                             return Err(
                                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense list cannot contain null values",
                                 ),
                             );
-55
+                        }
                         /* JsonParserGenerator.kt:450 */
                     } /* JsonParserGenerator.kt:446 */
-58
+                }
                 /* JsonParserGenerator.kt:445 */
-60
+            }
             /* JsonParserGenerator.kt:481 */
             /* JsonParserGenerator.kt:474 */
             Ok(Some(
                 crate::unconstrained::foo_enum_set_unconstrained::FooEnumSetUnconstrained(items),
             ))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-66
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start array or null",
                 ),
-74
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-77
+    }
     /* JsonParserGenerator.kt:435 */
-79
+}

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

@@ -1,1 +96,96 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:553 */
 /* JsonParserGenerator.kt:535 */
 pub(crate) fn de_greeting_struct<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<crate::model::GreetingStruct>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* RustType.kt:534 */
             #[allow(unused_mut)]
             /* JsonParserGenerator.kt:563 */
             /* JsonParserGenerator.kt:545 */
             let mut builder = crate::model::greeting_struct::Builder::default();
             /* JsonParserGenerator.kt:721 */
             /* JsonParserGenerator.kt:703 */
             loop {
                 /* JsonParserGenerator.kt:722 */
                 /* JsonParserGenerator.kt:704 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:723 */
                     /* JsonParserGenerator.kt:705 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         /* JsonParserGenerator.kt:265 */
                         match key.to_unescaped()?.as_ref() {
                             /* JsonParserGenerator.kt:267 */
                             "hi" => {
                                 /* JsonParserGenerator.kt:277 */
                                 builder = builder.set_hi(
                                     /* JsonParserGenerator.kt:361 */::aws_smithy_json::deserialize::token::expect_string_or_null(tokens.next())?.map(|s|
                                         /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                             /* JsonParserGenerator.kt:355 */u.into_owned()
                                         /* JsonParserGenerator.kt:346 */)
                                     /* JsonParserGenerator.kt:361 */).transpose()?
                                 /* JsonParserGenerator.kt:277 */);
                                 /* JsonParserGenerator.kt:267 */
-47
+                            }
                             /* JsonParserGenerator.kt:295 */
                             _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
-50
+                        }
                         /* JsonParserGenerator.kt:723 */
                         /* JsonParserGenerator.kt:705 */
-52
+                    }
                     /* JsonParserGenerator.kt:732 */
                     /* JsonParserGenerator.kt:714 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-59
+                        )
                     } /* JsonParserGenerator.kt:722 */
                     } /* JsonParserGenerator.kt:704 */
-61
+                }
                 /* JsonParserGenerator.kt:721 */
                 /* JsonParserGenerator.kt:703 */
-63
+            }
             /* JsonParserGenerator.kt:577 */
             /* JsonParserGenerator.kt:559 */
             Ok(Some(builder.build()))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-67
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
-75
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-78
+    }
     /* JsonParserGenerator.kt:553 */
     /* JsonParserGenerator.kt:535 */
-80
+}
-81
 /* JsonSerializerGenerator.kt:360 */
 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:384 */
     if let Some(var_1) = &input.hi {
         /* JsonSerializerGenerator.kt:425 */

↧ Expand context

         object.key("hi").string(var_1.as_str());
         /* JsonSerializerGenerator.kt:384 */
-92
+    }
     /* JsonSerializerGenerator.kt:374 */
     Ok(())
     /* JsonSerializerGenerator.kt:360 */
-96
+}

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

@@ -1,1 +87,87 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:151 */
 pub(crate) fn de_headers_and_implicit_payload_event_json_err(
     _value: &[u8],
     mut builder: crate::model::headers_and_implicit_payload_event::Builder,
 ) -> ::std::result::Result<

     crate::model::headers_and_implicit_payload_event::Builder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     /* JsonParserGenerator.kt:158 */
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
         crate::protocol_serde::or_empty_doc(_value),
-13
+    )
     .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     /* JsonParserGenerator.kt:721 */
     /* JsonParserGenerator.kt:703 */
     loop {
         /* JsonParserGenerator.kt:722 */
         /* JsonParserGenerator.kt:704 */
         match tokens.next().transpose()? {
             /* JsonParserGenerator.kt:723 */
             /* JsonParserGenerator.kt:705 */
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 /* JsonParserGenerator.kt:265 */
                 match key.to_unescaped()?.as_ref() {
                     /* JsonParserGenerator.kt:267 */
                     "header" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_header(
                             /* JsonParserGenerator.kt:361 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                 tokens.next(),
                             )?
                             .map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:355 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
                             .transpose()?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-41
+                    }
                     /* JsonParserGenerator.kt:267 */
                     "payload" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_payload(
                             /* JsonParserGenerator.kt:361 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                 tokens.next(),
                             )?
                             .map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:355 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
                             .transpose()?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-57
+                    }
                     /* JsonParserGenerator.kt:295 */
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
-60
+                }
                 /* JsonParserGenerator.kt:723 */
                 /* JsonParserGenerator.kt:705 */
-62
+            }
             /* JsonParserGenerator.kt:732 */
             /* JsonParserGenerator.kt:714 */
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )),
-69
+                )
             } /* JsonParserGenerator.kt:722 */
             } /* JsonParserGenerator.kt:704 */
-71
+        }
         /* JsonParserGenerator.kt:721 */
         /* JsonParserGenerator.kt:703 */
-73
+    }
     /* JsonParserGenerator.kt:255 */
     if tokens.next().is_some() {
         /* JsonParserGenerator.kt:256 */
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
         /* JsonParserGenerator.kt:255 */

↧ Expand context

-83
+    }
     /* JsonParserGenerator.kt:168 */
     Ok(builder)
     /* JsonParserGenerator.kt:151 */
-87
+}

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

@@ -83,83 +167,167 @@

↥ Expand context

         let content_length = payload.len();
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http_1x::header::CONTENT_LENGTH,
             content_length,
         );
         /* ServerHttpBoundProtocolGenerator.kt:617 */
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         /* ServerHttpBoundProtocolGenerator.kt:625 */
         builder.body(body)?
         /* ServerHttpBoundProtocolGenerator.kt:461 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:449 */
-96
+}
-97
 /* JsonParserGenerator.kt:151 */
 pub(crate) fn de_http_checksum_required(
     _value: &[u8],
     mut builder: crate::input::http_checksum_required_input::Builder,
 ) -> ::std::result::Result<

     crate::input::http_checksum_required_input::Builder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     /* JsonParserGenerator.kt:158 */
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
         crate::protocol_serde::or_empty_doc(_value),
-109
+    )
     .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     /* JsonParserGenerator.kt:721 */
     /* JsonParserGenerator.kt:703 */
     loop {
         /* JsonParserGenerator.kt:722 */
         /* JsonParserGenerator.kt:704 */
         match tokens.next().transpose()? {
             /* JsonParserGenerator.kt:723 */
             /* JsonParserGenerator.kt:705 */
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 /* JsonParserGenerator.kt:265 */
                 match key.to_unescaped()?.as_ref() {
                     /* JsonParserGenerator.kt:267 */
                     "foo" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_foo(
                             /* JsonParserGenerator.kt:361 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                 tokens.next(),
                             )?
                             .map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:355 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
                             .transpose()?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-137
+                    }
                     /* JsonParserGenerator.kt:295 */
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
-140
+                }
                 /* JsonParserGenerator.kt:723 */
                 /* JsonParserGenerator.kt:705 */
-142
+            }
             /* JsonParserGenerator.kt:732 */
             /* JsonParserGenerator.kt:714 */
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )),
-149
+                )
             } /* JsonParserGenerator.kt:722 */
             } /* JsonParserGenerator.kt:704 */
-151
+        }
         /* JsonParserGenerator.kt:721 */
         /* JsonParserGenerator.kt:703 */
-153
+    }
     /* JsonParserGenerator.kt:255 */
     if tokens.next().is_some() {
         /* JsonParserGenerator.kt:256 */
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
         /* JsonParserGenerator.kt:255 */

↧ Expand context

-163
+    }
     /* JsonParserGenerator.kt:168 */
     Ok(builder)
     /* JsonParserGenerator.kt:151 */
-167
+}

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

@@ -1,1 +77,75 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:435 */
 pub(crate) fn de_integer_enum_list<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<::std::vec::Vec<i32>>,

     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             /* JsonParserGenerator.kt:444 */
             let mut items = Vec::new();
             /* JsonParserGenerator.kt:445 */
             loop {
                 /* JsonParserGenerator.kt:446 */
                 match tokens.peek() {
                     /* JsonParserGenerator.kt:447 */
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         /* JsonParserGenerator.kt:448 */
                         tokens.next().transpose().unwrap();
                         break;
                         /* JsonParserGenerator.kt:447 */
-35
+                    }
                     /* JsonParserGenerator.kt:450 */
                     _ => {
                         /* JsonParserGenerator.kt:456 */
                         let value =
                             /* JsonParserGenerator.kt:372 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
                                                 .map(i32::try_from)
                                                 .transpose()?
                         /* JsonParserGenerator.kt:456 */;
                         /* JsonParserGenerator.kt:459 */
                         if let Some(value) = value {
                             items.push(value);
--
+                        }
                         /* JsonParserGenerator.kt:467 */
                         else {
                         } else {
                             return Err(
                                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense list cannot contain null values",
                                 ),
                             );
-53
+                        }
                         /* JsonParserGenerator.kt:450 */
                     } /* JsonParserGenerator.kt:446 */
-56
+                }
                 /* JsonParserGenerator.kt:445 */
-58
+            }
             /* JsonParserGenerator.kt:483 */
             /* JsonParserGenerator.kt:476 */
             Ok(Some(items))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-62
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start array or null",
                 ),
-70
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-73
+    }
     /* JsonParserGenerator.kt:435 */
-75
+}

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

@@ -1,1 +86,86 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:497 */
 /* JsonParserGenerator.kt:490 */
 pub(crate) fn de_integer_enum_map<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<::std::collections::HashMap<::std::string::String, i32>>,
     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartObject { .. }) => {
             /* JsonParserGenerator.kt:506 */
             /* JsonParserGenerator.kt:499 */
             let mut map = ::std::collections::HashMap::new();
             /* JsonParserGenerator.kt:721 */
             /* JsonParserGenerator.kt:703 */
             loop {
                 /* JsonParserGenerator.kt:722 */
                 /* JsonParserGenerator.kt:704 */
                 match tokens.next().transpose()? {
                     /* JsonParserGenerator.kt:723 */
                     /* JsonParserGenerator.kt:705 */
                     Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
                     Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                         /* JsonParserGenerator.kt:508 */
                         /* JsonParserGenerator.kt:501 */
                         let key =
                             /* JsonParserGenerator.kt:346 */key.to_unescaped().map(|u|
                                 /* JsonParserGenerator.kt:355 */u.into_owned()
                             /* JsonParserGenerator.kt:346 */)
                         /* JsonParserGenerator.kt:508 */?;
                         /* JsonParserGenerator.kt:511 */
                         /* JsonParserGenerator.kt:501 */?;
                         /* JsonParserGenerator.kt:504 */
                         let value =
                             /* JsonParserGenerator.kt:372 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
                                                 .map(i32::try_from)
                                                 .transpose()?
                         /* JsonParserGenerator.kt:511 */;
                         /* JsonParserGenerator.kt:518 */
                         /* JsonParserGenerator.kt:504 */;
                         /* JsonParserGenerator.kt:510 */
                         match value {
                             Some(value) => {
                                 map.insert(key, value);
-48
+                            }
                             None => {
                                 return Err(
                                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                         "dense map cannot contain null values",
                                     ),
-54
+                                )
-55
+                            }
-56
+                        }
                         /* JsonParserGenerator.kt:723 */
                         /* JsonParserGenerator.kt:705 */
-58
+                    }
                     /* JsonParserGenerator.kt:732 */
                     /* JsonParserGenerator.kt:714 */
                     other => {
                         return Err(
                             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                 format!("expected object key or end object, found: {other:?}"),
                             ),
-65
+                        )
                     } /* JsonParserGenerator.kt:722 */
                     } /* JsonParserGenerator.kt:704 */
-67
+                }
                 /* JsonParserGenerator.kt:721 */
                 /* JsonParserGenerator.kt:703 */
-69
+            }
             /* JsonParserGenerator.kt:541 */
             /* JsonParserGenerator.kt:523 */
             Ok(Some(map))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-73
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start object or null",
                 ),
-81
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-84
+    }
     /* JsonParserGenerator.kt:497 */
     /* JsonParserGenerator.kt:490 */
-86
+}

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

@@ -1,1 +81,79 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:435 */
 pub(crate) fn de_integer_enum_set<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<crate::unconstrained::integer_enum_set_unconstrained::IntegerEnumSetUnconstrained>,

     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             /* JsonParserGenerator.kt:444 */
             let mut items = Vec::new();
             /* JsonParserGenerator.kt:445 */
             loop {
                 /* JsonParserGenerator.kt:446 */
                 match tokens.peek() {
                     /* JsonParserGenerator.kt:447 */
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         /* JsonParserGenerator.kt:448 */
                         tokens.next().transpose().unwrap();
                         break;
                         /* JsonParserGenerator.kt:447 */
-35
+                    }
                     /* JsonParserGenerator.kt:450 */
                     _ => {
                         /* JsonParserGenerator.kt:456 */
                         let value =
                             /* JsonParserGenerator.kt:372 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
                                                 .map(i32::try_from)
                                                 .transpose()?
                         /* JsonParserGenerator.kt:456 */;
                         /* JsonParserGenerator.kt:459 */
                         if let Some(value) = value {
                             items.push(value);
--
+                        }
                         /* JsonParserGenerator.kt:467 */
                         else {
                         } else {
                             return Err(
                                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense list cannot contain null values",
                                 ),
                             );
-53
+                        }
                         /* JsonParserGenerator.kt:450 */
                     } /* JsonParserGenerator.kt:446 */
-56
+                }
                 /* JsonParserGenerator.kt:445 */
-58
+            }
             /* JsonParserGenerator.kt:481 */
             /* JsonParserGenerator.kt:474 */
             Ok(Some(
                 crate::unconstrained::integer_enum_set_unconstrained::IntegerEnumSetUnconstrained(
                     items,
                 ),
             ))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-66
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start array or null",
                 ),
-74
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-77
+    }
     /* JsonParserGenerator.kt:435 */
-79
+}

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

@@ -1,1 +77,75 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /* JsonParserGenerator.kt:435 */
 pub(crate) fn de_integer_list<'a, I>(
     tokens: &mut ::std::iter::Peekable<I>,
     _value: &'a [u8],
 ) -> ::std::result::Result<
     Option<::std::vec::Vec<i32>>,

     ::aws_smithy_json::deserialize::error::DeserializeError,
-9
+>
 where
     I: Iterator<
         Item = Result<
             ::aws_smithy_json::deserialize::Token<'a>,
             ::aws_smithy_json::deserialize::error::DeserializeError,
         >,
     >,
-17
+{
     /* JsonParserGenerator.kt:749 */
     /* JsonParserGenerator.kt:731 */
     match tokens.next().transpose()? {
         /* JsonParserGenerator.kt:750 */
         /* JsonParserGenerator.kt:732 */
         Some(::aws_smithy_json::deserialize::Token::ValueNull { .. }) => Ok(None),
         Some(::aws_smithy_json::deserialize::Token::StartArray { .. }) => {
             /* JsonParserGenerator.kt:444 */
             let mut items = Vec::new();
             /* JsonParserGenerator.kt:445 */
             loop {
                 /* JsonParserGenerator.kt:446 */
                 match tokens.peek() {
                     /* JsonParserGenerator.kt:447 */
                     Some(Ok(::aws_smithy_json::deserialize::Token::EndArray { .. })) => {
                         /* JsonParserGenerator.kt:448 */
                         tokens.next().transpose().unwrap();
                         break;
                         /* JsonParserGenerator.kt:447 */
-35
+                    }
                     /* JsonParserGenerator.kt:450 */
                     _ => {
                         /* JsonParserGenerator.kt:456 */
                         let value =
                             /* JsonParserGenerator.kt:372 */::aws_smithy_json::deserialize::token::expect_number_or_null(tokens.next())?
                                                 .map(i32::try_from)
                                                 .transpose()?
                         /* JsonParserGenerator.kt:456 */;
                         /* JsonParserGenerator.kt:459 */
                         if let Some(value) = value {
                             items.push(value);
--
+                        }
                         /* JsonParserGenerator.kt:467 */
                         else {
                         } else {
                             return Err(
                                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                                     "dense list cannot contain null values",
                                 ),
                             );
-53
+                        }
                         /* JsonParserGenerator.kt:450 */
                     } /* JsonParserGenerator.kt:446 */
-56
+                }
                 /* JsonParserGenerator.kt:445 */
-58
+            }
             /* JsonParserGenerator.kt:483 */
             /* JsonParserGenerator.kt:476 */
             Ok(Some(items))
             /* JsonParserGenerator.kt:750 */
             /* JsonParserGenerator.kt:732 */
-62
+        }
         /* JsonParserGenerator.kt:759 */
         /* JsonParserGenerator.kt:741 */
         _ => {
             /* JsonParserGenerator.kt:760 */
             /* JsonParserGenerator.kt:742 */
             Err(
                 ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                     "expected start array or null",
                 ),
-70
+            )
             /* JsonParserGenerator.kt:759 */
         } /* JsonParserGenerator.kt:749 */
             /* JsonParserGenerator.kt:741 */
         } /* JsonParserGenerator.kt:731 */
-73
+    }
     /* JsonParserGenerator.kt:435 */
-75
+}

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

@@ -80,80 +159,159 @@

↥ Expand context

         let content_length = payload.len();
         builder = ::aws_smithy_http::header::set_response_header_if_absent(
             builder,
             ::http_1x::header::CONTENT_LENGTH,
             content_length,
         );
         /* ServerHttpBoundProtocolGenerator.kt:617 */
         let body = ::aws_smithy_http_server::body::to_boxed(payload);
         /* ServerHttpBoundProtocolGenerator.kt:625 */
         builder.body(body)?
         /* ServerHttpBoundProtocolGenerator.kt:461 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:449 */
-93
+}
-94
 /* JsonParserGenerator.kt:151 */
 pub(crate) fn de_json_blobs(
     _value: &[u8],
     mut builder: crate::input::json_blobs_input::Builder,
 ) -> ::std::result::Result<

     crate::input::json_blobs_input::Builder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     /* JsonParserGenerator.kt:158 */
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
         crate::protocol_serde::or_empty_doc(_value),
-106
+    )
     .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     /* JsonParserGenerator.kt:721 */
     /* JsonParserGenerator.kt:703 */
     loop {
         /* JsonParserGenerator.kt:722 */
         /* JsonParserGenerator.kt:704 */
         match tokens.next().transpose()? {
             /* JsonParserGenerator.kt:723 */
             /* JsonParserGenerator.kt:705 */
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 /* JsonParserGenerator.kt:265 */
                 match key.to_unescaped()?.as_ref() {
                     /* JsonParserGenerator.kt:267 */
                     "data" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_data(
                             /* JsonParserGenerator.kt:333 */
                             ::aws_smithy_json::deserialize::token::expect_blob_or_null(
                                 tokens.next(),
                             )?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-129
+                    }
                     /* JsonParserGenerator.kt:295 */
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
-132
+                }
                 /* JsonParserGenerator.kt:723 */
                 /* JsonParserGenerator.kt:705 */
-134
+            }
             /* JsonParserGenerator.kt:732 */
             /* JsonParserGenerator.kt:714 */
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )),
-141
+                )
             } /* JsonParserGenerator.kt:722 */
             } /* JsonParserGenerator.kt:704 */
-143
+        }
         /* JsonParserGenerator.kt:721 */
         /* JsonParserGenerator.kt:703 */
-145
+    }
     /* JsonParserGenerator.kt:255 */
     if tokens.next().is_some() {
         /* JsonParserGenerator.kt:256 */
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
         /* JsonParserGenerator.kt:255 */

↧ Expand context

-155
+    }
     /* JsonParserGenerator.kt:168 */
     Ok(builder)
     /* JsonParserGenerator.kt:151 */
-159
+}

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

@@ -132,132 +281,281 @@

↥ Expand context

                     ::http_1x::header::CONTENT_LENGTH,
                     content_length,
                 );
                 /* ServerHttpBoundProtocolGenerator.kt:532 */
                 builder
                     .status(400)
                     .body(::aws_smithy_http_server::body::to_boxed(payload))?
                 /* ServerHttpBoundProtocolGenerator.kt:504 */
             } /* ServerHttpBoundProtocolGenerator.kt:496 */
-141
+        }
         /* ServerHttpBoundProtocolGenerator.kt:480 */
     })
     /* ServerHttpBoundProtocolGenerator.kt:475 */
-145
+}
-146
 /* JsonParserGenerator.kt:151 */
 pub(crate) fn de_json_enums(
     _value: &[u8],
     mut builder: crate::input::json_enums_input::Builder,
 ) -> ::std::result::Result<

     crate::input::json_enums_input::Builder,
     ::aws_smithy_json::deserialize::error::DeserializeError,
 > {
     /* JsonParserGenerator.kt:158 */
     let mut tokens_owned = ::aws_smithy_json::deserialize::json_token_iter(
         crate::protocol_serde::or_empty_doc(_value),
-158
+    )
     .peekable();
     let tokens = &mut tokens_owned;
     ::aws_smithy_json::deserialize::token::expect_start_object(tokens.next())?;
     /* JsonParserGenerator.kt:721 */
     /* JsonParserGenerator.kt:703 */
     loop {
         /* JsonParserGenerator.kt:722 */
         /* JsonParserGenerator.kt:704 */
         match tokens.next().transpose()? {
             /* JsonParserGenerator.kt:723 */
             /* JsonParserGenerator.kt:705 */
             Some(::aws_smithy_json::deserialize::Token::EndObject { .. }) => break,
             Some(::aws_smithy_json::deserialize::Token::ObjectKey { key, .. }) => {
                 /* JsonParserGenerator.kt:265 */
                 match key.to_unescaped()?.as_ref() {
                     /* JsonParserGenerator.kt:267 */
                     "fooEnum1" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_foo_enum1(
                             /* JsonParserGenerator.kt:361 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                 tokens.next(),
                             )?
                             .map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:350 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
                             .transpose()?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-186
+                    }
                     /* JsonParserGenerator.kt:267 */
                     "fooEnum2" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_foo_enum2(
                             /* JsonParserGenerator.kt:361 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                 tokens.next(),
                             )?
                             .map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:350 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
                             .transpose()?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-202
+                    }
                     /* JsonParserGenerator.kt:267 */
                     "fooEnum3" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_foo_enum3(
                             /* JsonParserGenerator.kt:361 */
                             ::aws_smithy_json::deserialize::token::expect_string_or_null(
                                 tokens.next(),
                             )?
                             .map(|s|
                                 /* JsonParserGenerator.kt:346 */s.to_unescaped().map(|u|
                                     /* JsonParserGenerator.kt:350 */u.into_owned()
                                 /* JsonParserGenerator.kt:346 */) /* JsonParserGenerator.kt:361 */)
                             .transpose()?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-218
+                    }
                     /* JsonParserGenerator.kt:267 */
                     "fooEnumList" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_foo_enum_list(
                             /* JsonParserGenerator.kt:488 */
                             /* JsonParserGenerator.kt:481 */
                             crate::protocol_serde::shape_foo_enum_list::de_foo_enum_list(
                                 tokens, _value,
                             )?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-229
+                    }
                     /* JsonParserGenerator.kt:267 */
                     "fooEnumMap" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_foo_enum_map(
                             /* JsonParserGenerator.kt:546 */
                             /* JsonParserGenerator.kt:528 */
                             crate::protocol_serde::shape_foo_enum_map::de_foo_enum_map(
                                 tokens, _value,
                             )?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-240
+                    }
                     /* JsonParserGenerator.kt:267 */
                     "fooEnumSet" => {
                         /* JsonParserGenerator.kt:277 */
                         builder = builder.set_foo_enum_set(
                             /* JsonParserGenerator.kt:488 */
                             /* JsonParserGenerator.kt:481 */
                             crate::protocol_serde::shape_foo_enum_set::de_foo_enum_set(
                                 tokens, _value,
                             )?, /* JsonParserGenerator.kt:277 */
                         );
                         /* JsonParserGenerator.kt:267 */
-251
+                    }
                     /* JsonParserGenerator.kt:295 */
                     _ => ::aws_smithy_json::deserialize::token::skip_value(tokens)?, /* JsonParserGenerator.kt:265 */
-254
+                }
                 /* JsonParserGenerator.kt:723 */
                 /* JsonParserGenerator.kt:705 */
-256
+            }
             /* JsonParserGenerator.kt:732 */
             /* JsonParserGenerator.kt:714 */
             other => {
                 return Err(
                     ::aws_smithy_json::deserialize::error::DeserializeError::custom(format!(
                         "expected object key or end object, found: {other:?}"
                     )),
-263
+                )
             } /* JsonParserGenerator.kt:722 */
             } /* JsonParserGenerator.kt:704 */
-265
+        }
         /* JsonParserGenerator.kt:721 */
         /* JsonParserGenerator.kt:703 */
-267
+    }
     /* JsonParserGenerator.kt:255 */
     if tokens.next().is_some() {
         /* JsonParserGenerator.kt:256 */
         return Err(
             ::aws_smithy_json::deserialize::error::DeserializeError::custom(
                 "found more JSON tokens after completing parsing",
             ),
         );
         /* JsonParserGenerator.kt:255 */

↧ Expand context

-277
+    }
     /* JsonParserGenerator.kt:168 */
     Ok(builder)
     /* JsonParserGenerator.kt:151 */
-281
+}

Server Test

Files changed: