Client Test

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_headers_and_implicit_payload_event.rs

@@ -46,46 +132,143 @@

 );
 static HEADERSANDIMPLICITPAYLOADEVENT_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     HEADERSANDIMPLICITPAYLOADEVENT_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[
         &HEADERSANDIMPLICITPAYLOADEVENT_MEMBER_HEADER,
         &HEADERSANDIMPLICITPAYLOADEVENT_MEMBER_PAYLOAD,
     ],
 );
 impl HeadersAndImplicitPayloadEvent {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &HEADERSANDIMPLICITPAYLOADEVENT_SCHEMA;
-58
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for HeadersAndImplicitPayloadEvent {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.header {

             ser.write_string(&HEADERSANDIMPLICITPAYLOADEVENT_MEMBER_HEADER, val)?;
-67
+        }
         if let Some(ref val) = self.payload {
             ser.write_string(&HEADERSANDIMPLICITPAYLOADEVENT_MEMBER_PAYLOAD, val)?;
-70
+        }
         Ok(())
-72
+    }
-73
+}
 impl HeadersAndImplicitPayloadEvent {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&HEADERSANDIMPLICITPAYLOADEVENT_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&HEADERSANDIMPLICITPAYLOADEVENT_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.header = Some(deser.read_string(member)?);
-92
+                }
                 Some(1) => {
                     builder.payload = Some(deser.read_string(member)?);
-95
+                }
                 _ => {}
-97
+            }
             Ok(())
         })?;
         Ok(builder.build())
-101
+    }
-102
+}
 impl HeadersAndImplicitPayloadEvent {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl HeadersAndImplicitPayloadEvent {
     /// Creates a new builder-style object to manufacture [`HeadersAndImplicitPayloadEvent`](crate::types::HeadersAndImplicitPayloadEvent).
     pub fn builder() -> crate::types::builders::HeadersAndImplicitPayloadEventBuilder {
         crate::types::builders::HeadersAndImplicitPayloadEventBuilder::default()
-118
+    }
-119
+}
-120
 /// A builder for [`HeadersAndImplicitPayloadEvent`](crate::types::HeadersAndImplicitPayloadEvent).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct HeadersAndImplicitPayloadEventBuilder {
     pub(crate) header: ::std::option::Option<::std::string::String>,
     pub(crate) payload: ::std::option::Option<::std::string::String>,
-127
+}
 impl HeadersAndImplicitPayloadEventBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn header(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.header = ::std::option::Option::Some(input.into());
         self
-133
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_header(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.header = input;
         self
-138
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_header(&self) -> &::std::option::Option<::std::string::String> {
         &self.header
-142
+    }
     #[allow(missing_docs)] // documentation missing in model

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_headers_event.rs

@@ -36,36 +274,286 @@

↥ Expand context

     #[allow(missing_docs)] // documentation missing in model
     pub fn int_header(&self) -> ::std::option::Option<i32> {
         self.int_header
-39
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn long_header(&self) -> ::std::option::Option<i64> {
         self.long_header
-43
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn blob_header(&self) -> ::std::option::Option<&::aws_smithy_types::Blob> {
         self.blob_header.as_ref()
-47
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn string_header(&self) -> ::std::option::Option<&str> {
         self.string_header.as_deref()
-51
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn timestamp_header(&self) -> ::std::option::Option<&::aws_smithy_types::DateTime> {
         self.timestamp_header.as_ref()
-55
+    }

-56
+}
 static HEADERSEVENT_SCHEMA_ID: ::aws_smithy_schema::ShapeId =
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#HeadersEvent", "aws.protocoltests.restjson", "HeadersEvent");
 static HEADERSEVENT_MEMBER_BOOLEAN_HEADER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#HeadersEvent$booleanHeader",
         "aws.protocoltests.restjson",
         "HeadersEvent",
     ),
     ::aws_smithy_schema::ShapeType::Boolean,
     "boolean_header",
     "booleanHeader",
 ,
-68
+)
 .with_event_header();
 static HEADERSEVENT_MEMBER_BYTE_HEADER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#HeadersEvent$byteHeader",
         "aws.protocoltests.restjson",
         "HeadersEvent",
     ),
     ::aws_smithy_schema::ShapeType::Byte,
     "byte_header",
     "byteHeader",
 ,
-79
+)
 .with_event_header();
 static HEADERSEVENT_MEMBER_SHORT_HEADER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#HeadersEvent$shortHeader",
         "aws.protocoltests.restjson",
         "HeadersEvent",
     ),
     ::aws_smithy_schema::ShapeType::Short,
     "short_header",
     "shortHeader",
 ,
-90
+)
 .with_event_header();
 static HEADERSEVENT_MEMBER_INT_HEADER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#HeadersEvent$intHeader",
         "aws.protocoltests.restjson",
         "HeadersEvent",
     ),
     ::aws_smithy_schema::ShapeType::Integer,
     "int_header",
     "intHeader",
 ,
-101
+)
 .with_event_header();
 static HEADERSEVENT_MEMBER_LONG_HEADER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#HeadersEvent$longHeader",
         "aws.protocoltests.restjson",
         "HeadersEvent",
     ),
     ::aws_smithy_schema::ShapeType::Long,
     "long_header",
     "longHeader",
 ,
-112
+)
 .with_event_header();
 static HEADERSEVENT_MEMBER_BLOB_HEADER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#HeadersEvent$blobHeader",
         "aws.protocoltests.restjson",
         "HeadersEvent",
     ),
     ::aws_smithy_schema::ShapeType::Blob,
     "blob_header",
     "blobHeader",
 ,
-123
+)
 .with_event_header();
 static HEADERSEVENT_MEMBER_STRING_HEADER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#HeadersEvent$stringHeader",
         "aws.protocoltests.restjson",
         "HeadersEvent",
     ),
     ::aws_smithy_schema::ShapeType::String,
     "string_header",
     "stringHeader",
 ,
-134
+)
 .with_event_header();
 static HEADERSEVENT_MEMBER_TIMESTAMP_HEADER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#HeadersEvent$timestampHeader",
         "aws.protocoltests.restjson",
         "HeadersEvent",
     ),
     ::aws_smithy_schema::ShapeType::Timestamp,
     "timestamp_header",
     "timestampHeader",
 ,
-145
+)
 .with_event_header();
 .with_event_header()
 .with_timestamp_format(aws_smithy_schema::traits::TimestampFormat::DateTime);
 static HEADERSEVENT_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     HEADERSEVENT_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[
         &HEADERSEVENT_MEMBER_BOOLEAN_HEADER,
         &HEADERSEVENT_MEMBER_BYTE_HEADER,
         &HEADERSEVENT_MEMBER_SHORT_HEADER,
         &HEADERSEVENT_MEMBER_INT_HEADER,
         &HEADERSEVENT_MEMBER_LONG_HEADER,
         &HEADERSEVENT_MEMBER_BLOB_HEADER,
         &HEADERSEVENT_MEMBER_STRING_HEADER,
         &HEADERSEVENT_MEMBER_TIMESTAMP_HEADER,
     ],
 );
 impl HeadersEvent {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &HEADERSEVENT_SCHEMA;
-165
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for HeadersEvent {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.boolean_header {
             ser.write_boolean(&HEADERSEVENT_MEMBER_BOOLEAN_HEADER, *val)?;
-174
+        }
         if let Some(ref val) = self.byte_header {
             ser.write_byte(&HEADERSEVENT_MEMBER_BYTE_HEADER, *val)?;
-177
+        }
         if let Some(ref val) = self.short_header {
             ser.write_short(&HEADERSEVENT_MEMBER_SHORT_HEADER, *val)?;
-180
+        }
         if let Some(ref val) = self.int_header {
             ser.write_integer(&HEADERSEVENT_MEMBER_INT_HEADER, *val)?;
-183
+        }
         if let Some(ref val) = self.long_header {
             ser.write_long(&HEADERSEVENT_MEMBER_LONG_HEADER, *val)?;
-186
+        }
         if let Some(ref val) = self.blob_header {
             ser.write_blob(&HEADERSEVENT_MEMBER_BLOB_HEADER, val)?;
-189
+        }
         if let Some(ref val) = self.string_header {
             ser.write_string(&HEADERSEVENT_MEMBER_STRING_HEADER, val)?;
-192
+        }
         if let Some(ref val) = self.timestamp_header {
             ser.write_timestamp(&HEADERSEVENT_MEMBER_TIMESTAMP_HEADER, val)?;
-195
+        }
         Ok(())
-197
+    }
-198
+}
 impl HeadersEvent {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&HEADERSEVENT_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&HEADERSEVENT_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.boolean_header = Some(deser.read_boolean(member)?);
-217
+                }
                 Some(1) => {
                     builder.byte_header = Some(deser.read_byte(member)?);
-220
+                }
                 Some(2) => {
                     builder.short_header = Some(deser.read_short(member)?);
-223
+                }
                 Some(3) => {
                     builder.int_header = Some(deser.read_integer(member)?);
-226
+                }
                 Some(4) => {
                     builder.long_header = Some(deser.read_long(member)?);
-229
+                }
                 Some(5) => {
                     builder.blob_header = Some(deser.read_blob(member)?);
-232
+                }
                 Some(6) => {
                     builder.string_header = Some(deser.read_string(member)?);
-235
+                }
                 Some(7) => {
                     builder.timestamp_header = Some(deser.read_timestamp(member)?);
-238
+                }
                 _ => {}
-240
+            }
             Ok(())
         })?;
         Ok(builder.build())
-244
+    }
-245
+}
 impl HeadersEvent {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl HeadersEvent {
     /// Creates a new builder-style object to manufacture [`HeadersEvent`](crate::types::HeadersEvent).
     pub fn builder() -> crate::types::builders::HeadersEventBuilder {
         crate::types::builders::HeadersEventBuilder::default()
-261
+    }
-262
+}
-263
 /// A builder for [`HeadersEvent`](crate::types::HeadersEvent).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct HeadersEventBuilder {
     pub(crate) boolean_header: ::std::option::Option<bool>,
     pub(crate) byte_header: ::std::option::Option<i8>,
     pub(crate) short_header: ::std::option::Option<i16>,
     pub(crate) int_header: ::std::option::Option<i32>,
     pub(crate) long_header: ::std::option::Option<i64>,
     pub(crate) blob_header: ::std::option::Option<::aws_smithy_types::Blob>,
     pub(crate) string_header: ::std::option::Option<::std::string::String>,
     pub(crate) timestamp_header: ::std::option::Option<::aws_smithy_types::DateTime>,
-276
+}
 impl HeadersEventBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn boolean_header(mut self, input: bool) -> Self {
         self.boolean_header = ::std::option::Option::Some(input);
         self
-282
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_boolean_header(mut self, input: ::std::option::Option<bool>) -> Self {
         self.boolean_header = input;
         self

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_my_union.rs

@@ -143,143 +0,334 @@

↥ Expand context

     /// Returns `Err(&Self)` if it can't be converted.
     pub fn as_structure_value(&self) -> ::std::result::Result<&crate::types::GreetingStruct, &Self> {
         if let MyUnion::StructureValue(val) = &self {
             ::std::result::Result::Ok(val)
         } else {
             ::std::result::Result::Err(self)
-149
+        }
-150
+    }
     /// Returns true if this is a [`StructureValue`](crate::types::MyUnion::StructureValue).
     pub fn is_structure_value(&self) -> bool {
         self.as_structure_value().is_ok()
-154
+    }
     /// Tries to convert the enum instance into [`TimestampValue`](crate::types::MyUnion::TimestampValue), extracting the inner [`DateTime`](::aws_smithy_types::DateTime).
     /// Returns `Err(&Self)` if it can't be converted.
     pub fn as_timestamp_value(&self) -> ::std::result::Result<&::aws_smithy_types::DateTime, &Self> {
         if let MyUnion::TimestampValue(val) = &self {
             ::std::result::Result::Ok(val)
         } else {
             ::std::result::Result::Err(self)
-162
+        }

-163
+    }
     /// Returns true if this is a [`TimestampValue`](crate::types::MyUnion::TimestampValue).
     pub fn is_timestamp_value(&self) -> bool {
         self.as_timestamp_value().is_ok()
-167
+    }
     /// Returns true if the enum instance is the `Unknown` variant.
     pub fn is_unknown(&self) -> bool {
         matches!(self, Self::Unknown)
-171
+    }
-172
+}
 static MYUNION_SCHEMA_ID: ::aws_smithy_schema::ShapeId =
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#MyUnion", "aws.protocoltests.restjson", "MyUnion");
 static MYUNION_MEMBER_STRINGVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#MyUnion$stringValue", "aws.protocoltests.restjson", "MyUnion"),
     ::aws_smithy_schema::ShapeType::String,
     "stringValue",
 ,
 );
 static MYUNION_MEMBER_BOOLEANVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#MyUnion$booleanValue", "aws.protocoltests.restjson", "MyUnion"),
     ::aws_smithy_schema::ShapeType::Boolean,
     "booleanValue",
 ,
 );
 static MYUNION_MEMBER_NUMBERVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#MyUnion$numberValue", "aws.protocoltests.restjson", "MyUnion"),
     ::aws_smithy_schema::ShapeType::Integer,
     "numberValue",
 ,
 );
 static MYUNION_MEMBER_BLOBVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#MyUnion$blobValue", "aws.protocoltests.restjson", "MyUnion"),
     ::aws_smithy_schema::ShapeType::Blob,
     "blobValue",
 ,
 );
 static MYUNION_MEMBER_TIMESTAMPVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#MyUnion$timestampValue",
         "aws.protocoltests.restjson",
         "MyUnion",
     ),
     ::aws_smithy_schema::ShapeType::Timestamp,
     "timestampValue",
 ,
 );
 static MYUNION_MEMBER_ENUMVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#MyUnion$enumValue", "aws.protocoltests.restjson", "MyUnion"),
     ::aws_smithy_schema::ShapeType::String,
     "enumValue",
 ,
 );
 static MYUNION_MEMBER_LISTVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#MyUnion$listValue", "aws.protocoltests.restjson", "MyUnion"),
     ::aws_smithy_schema::ShapeType::List,
     "listValue",
 ,
 );
 static MYUNION_MEMBER_MAPVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#MyUnion$mapValue", "aws.protocoltests.restjson", "MyUnion"),
     ::aws_smithy_schema::ShapeType::Map,
     "mapValue",
 ,
 );
 static MYUNION_MEMBER_STRUCTUREVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#MyUnion$structureValue",
         "aws.protocoltests.restjson",
         "MyUnion",
     ),
     ::aws_smithy_schema::ShapeType::Structure,
     "structureValue",
 ,
 );
 static MYUNION_MEMBER_RENAMEDSTRUCTUREVALUE: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#MyUnion$renamedStructureValue",
         "aws.protocoltests.restjson",
         "MyUnion",
     ),
     ::aws_smithy_schema::ShapeType::Structure,
     "renamedStructureValue",
 ,
 );
 static MYUNION_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     MYUNION_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Union,
     &[
         &MYUNION_MEMBER_STRINGVALUE,
         &MYUNION_MEMBER_BOOLEANVALUE,
         &MYUNION_MEMBER_NUMBERVALUE,
         &MYUNION_MEMBER_BLOBVALUE,
         &MYUNION_MEMBER_TIMESTAMPVALUE,
         &MYUNION_MEMBER_ENUMVALUE,
         &MYUNION_MEMBER_LISTVALUE,
         &MYUNION_MEMBER_MAPVALUE,
         &MYUNION_MEMBER_STRUCTUREVALUE,
         &MYUNION_MEMBER_RENAMEDSTRUCTUREVALUE,
     ],
 );
 impl MyUnion {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &MYUNION_SCHEMA;
-+
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for MyUnion {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         match self {
             Self::StringValue(val) => {
                 ser.write_string(&MYUNION_MEMBER_STRINGVALUE, val)?;
-+
+            }
             Self::BooleanValue(val) => {
                 ser.write_boolean(&MYUNION_MEMBER_BOOLEANVALUE, *val)?;
-+
+            }
             Self::NumberValue(val) => {
                 ser.write_integer(&MYUNION_MEMBER_NUMBERVALUE, *val)?;
-+
+            }
             Self::BlobValue(val) => {
                 ser.write_blob(&MYUNION_MEMBER_BLOBVALUE, val)?;
-+
+            }
             Self::TimestampValue(val) => {
                 ser.write_timestamp(&MYUNION_MEMBER_TIMESTAMPVALUE, val)?;
-+
+            }
             Self::EnumValue(val) => {
                 ser.write_string(&MYUNION_MEMBER_ENUMVALUE, val.as_str())?;
-+
+            }
             Self::ListValue(val) => {
                 ser.write_string_list(&MYUNION_MEMBER_LISTVALUE, val)?;
-+
+            }
             Self::MapValue(val) => {
                 ser.write_string_string_map(&MYUNION_MEMBER_MAPVALUE, val)?;
-+
+            }
             Self::StructureValue(val) => {
                 ser.write_struct(&MYUNION_MEMBER_STRUCTUREVALUE, val)?;
-+
+            }
             Self::RenamedStructureValue(val) => {
                 ser.write_struct(&MYUNION_MEMBER_RENAMEDSTRUCTUREVALUE, val)?;
-+
+            }
             Self::Unknown => return Err(::aws_smithy_schema::serde::SerdeError::custom("cannot serialize unknown union variant")),
-+
+        }
         Ok(())
-+
+    }
-+
+}
 impl MyUnion {
     /// Deserializes this union from a [`ShapeDeserializer`].
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         let mut result: ::std::option::Option<Self> = ::std::option::Option::None;
         #[allow(unused_variables, unreachable_code, clippy::single_match, clippy::match_single_binding)]
         deserializer.read_struct(&MYUNION_SCHEMA, &mut |member, deser| {
             result = ::std::option::Option::Some(match member.member_index() {
                 Some(0) => Self::StringValue(deser.read_string(member)?),
                 Some(1) => Self::BooleanValue(deser.read_boolean(member)?),
                 Some(2) => Self::NumberValue(deser.read_integer(member)?),
                 Some(3) => Self::BlobValue(deser.read_blob(member)?),
                 Some(4) => Self::TimestampValue(deser.read_timestamp(member)?),
                 Some(5) => Self::EnumValue(crate::types::FooEnum::from(deser.read_string(member)?.as_str())),
                 Some(6) => Self::ListValue(deser.read_string_list(member)?),
                 Some(7) => Self::MapValue(deser.read_string_string_map(member)?),
                 Some(8) => Self::StructureValue(crate::types::GreetingStruct::deserialize(deser)?),
                 Some(9) => Self::RenamedStructureValue(crate::types::RenamedGreeting::deserialize(deser)?),
                 _ => Self::Unknown,
             });
             Ok(())
         })?;
         result.ok_or_else(|| ::aws_smithy_schema::serde::SerdeError::custom("expected a union variant"))
-+
+    }
-+
+}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_nested_payload.rs

@@ -39,39 +125,136 @@

↥ Expand context

     ::aws_smithy_schema::ShapeType::String,
     "name",
 ,
 );
 static NESTEDPAYLOAD_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     NESTEDPAYLOAD_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[&NESTEDPAYLOAD_MEMBER_GREETING, &NESTEDPAYLOAD_MEMBER_NAME],
 );
 impl NestedPayload {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &NESTEDPAYLOAD_SCHEMA;
-51
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for NestedPayload {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.greeting {

             ser.write_string(&NESTEDPAYLOAD_MEMBER_GREETING, val)?;
-60
+        }
         if let Some(ref val) = self.name {
             ser.write_string(&NESTEDPAYLOAD_MEMBER_NAME, val)?;
-63
+        }
         Ok(())
-65
+    }
-66
+}
 impl NestedPayload {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&NESTEDPAYLOAD_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&NESTEDPAYLOAD_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.greeting = Some(deser.read_string(member)?);
-85
+                }
                 Some(1) => {
                     builder.name = Some(deser.read_string(member)?);
-88
+                }
                 _ => {}
-90
+            }
             Ok(())
         })?;
         Ok(builder.build())
-94
+    }
-95
+}
 impl NestedPayload {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl NestedPayload {
     /// Creates a new builder-style object to manufacture [`NestedPayload`](crate::types::NestedPayload).
     pub fn builder() -> crate::types::builders::NestedPayloadBuilder {
         crate::types::builders::NestedPayloadBuilder::default()
-111
+    }
-112
+}
-113
 /// A builder for [`NestedPayload`](crate::types::NestedPayload).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct NestedPayloadBuilder {
     pub(crate) greeting: ::std::option::Option<::std::string::String>,
     pub(crate) name: ::std::option::Option<::std::string::String>,
-120
+}
 impl NestedPayloadBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn greeting(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.greeting = ::std::option::Option::Some(input.into());
         self
-126
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_greeting(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.greeting = input;
         self
-131
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_greeting(&self) -> &::std::option::Option<::std::string::String> {
         &self.greeting
-135
+    }
     #[allow(missing_docs)] // documentation missing in model

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_payload_config.rs

@@ -20,20 +103,114 @@

↥ Expand context

         "aws.protocoltests.restjson",
         "PayloadConfig",
     ),
     ::aws_smithy_schema::ShapeType::Integer,
     "data",
 ,
 );
 static PAYLOADCONFIG_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     PAYLOADCONFIG_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[&PAYLOADCONFIG_MEMBER_DATA],
 );
 impl PayloadConfig {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &PAYLOADCONFIG_SCHEMA;
-35
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for PayloadConfig {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,

         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.data {
             ser.write_integer(&PAYLOADCONFIG_MEMBER_DATA, *val)?;
-44
+        }
         Ok(())
-46
+    }
-47
+}
 impl PayloadConfig {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&PAYLOADCONFIG_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&PAYLOADCONFIG_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.data = Some(deser.read_integer(member)?);
-66
+                }
                 _ => {}
-68
+            }
             Ok(())
         })?;
         Ok(builder.build())
-72
+    }
-73
+}
 impl PayloadConfig {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl PayloadConfig {
     /// Creates a new builder-style object to manufacture [`PayloadConfig`](crate::types::PayloadConfig).
     pub fn builder() -> crate::types::builders::PayloadConfigBuilder {
         crate::types::builders::PayloadConfigBuilder::default()
-89
+    }
-90
+}
-91
 /// A builder for [`PayloadConfig`](crate::types::PayloadConfig).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct PayloadConfigBuilder {
     pub(crate) data: ::std::option::Option<i32>,
-97
+}
 impl PayloadConfigBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn data(mut self, input: i32) -> Self {
         self.data = ::std::option::Option::Some(input);
         self
-103
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_data(mut self, input: ::std::option::Option<i32>) -> Self {
         self.data = input;
         self
-108
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_data(&self) -> &::std::option::Option<i32> {
         &self.data
-112
+    }
     /// Consumes the builder and constructs a [`PayloadConfig`](crate::types::PayloadConfig).
     pub fn build(self) -> crate::types::PayloadConfig {

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_payload_structure.rs

@@ -1,1 +106,117 @@

↥ Expand context

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(missing_docs)] // documentation missing in model
 #[non_exhaustive]
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::fmt::Debug)]
 pub struct PayloadStructure {
     #[allow(missing_docs)] // documentation missing in model
     pub structure_member: ::std::option::Option<::std::string::String>,
-8
+}
 impl PayloadStructure {
     #[allow(missing_docs)] // documentation missing in model
     pub fn structure_member(&self) -> ::std::option::Option<&str> {
         self.structure_member.as_deref()
-13
+    }
-14
+}
 static PAYLOADSTRUCTURE_SCHEMA_ID: ::aws_smithy_schema::ShapeId = ::aws_smithy_schema::ShapeId::from_static(
     "aws.protocoltests.restjson#PayloadStructure",

     "aws.protocoltests.restjson",
     "PayloadStructure",
 );
 static PAYLOADSTRUCTURE_MEMBER_STRUCTURE_MEMBER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#PayloadStructure$structureMember",
         "aws.protocoltests.restjson",
         "PayloadStructure",
     ),
     ::aws_smithy_schema::ShapeType::String,
     "structure_member",
     "structureMember",
 ,
 );
 static PAYLOADSTRUCTURE_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     PAYLOADSTRUCTURE_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[&PAYLOADSTRUCTURE_MEMBER_STRUCTURE_MEMBER],
 );
 impl PayloadStructure {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &PAYLOADSTRUCTURE_SCHEMA;
-38
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for PayloadStructure {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.structure_member {
             ser.write_string(&PAYLOADSTRUCTURE_MEMBER_STRUCTURE_MEMBER, val)?;
-47
+        }
         Ok(())
-49
+    }
-50
+}
 impl PayloadStructure {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&PAYLOADSTRUCTURE_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&PAYLOADSTRUCTURE_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.structure_member = Some(deser.read_string(member)?);
-69
+                }
                 _ => {}
-71
+            }
             Ok(())
         })?;
         Ok(builder.build())
-75
+    }
-76
+}
 impl PayloadStructure {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl PayloadStructure {
     /// Creates a new builder-style object to manufacture [`PayloadStructure`](crate::types::PayloadStructure).
     pub fn builder() -> crate::types::builders::PayloadStructureBuilder {
         crate::types::builders::PayloadStructureBuilder::default()
-92
+    }
-93
+}
-94
 /// A builder for [`PayloadStructure`](crate::types::PayloadStructure).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct PayloadStructureBuilder {
     pub(crate) structure_member: ::std::option::Option<::std::string::String>,
-100
+}
 impl PayloadStructureBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn structure_member(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.structure_member = ::std::option::Option::Some(input.into());
         self
-106
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_structure_member(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.structure_member = input;
         self
-111
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_structure_member(&self) -> &::std::option::Option<::std::string::String> {
         &self.structure_member
-115
+    }
     /// Consumes the builder and constructs a [`PayloadStructure`](crate::types::PayloadStructure).
     pub fn build(self) -> crate::types::PayloadStructure {

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_payload_union.rs

@@ -8,8 +0,90 @@

↥ Expand context

     /// The `Unknown` variant represents cases where new union variant was received. Consider upgrading the SDK to the latest available version.
     /// An unknown enum variant
     ///
     /// _Note: If you encounter this error, consider upgrading your SDK to the latest version._
     /// The `Unknown` variant represents cases where the server sent a value that wasn't recognized
     /// by the client. This can happen when the server adds new functionality, but the client has not been updated.
     /// To investigate this, consider turning on debug logging to print the raw HTTP response.
     #[non_exhaustive]
     Unknown,
-17
+}
 impl PayloadUnion {
     #[allow(irrefutable_let_patterns)]
     /// Tries to convert the enum instance into [`UnionMember`](crate::types::PayloadUnion::UnionMember), extracting the inner [`String`](::std::string::String).
     /// Returns `Err(&Self)` if it can't be converted.
     pub fn as_union_member(&self) -> ::std::result::Result<&::std::string::String, &Self> {
         if let PayloadUnion::UnionMember(val) = &self {
             ::std::result::Result::Ok(val)
         } else {
             ::std::result::Result::Err(self)
-27
+        }

-28
+    }
     /// Returns true if this is a [`UnionMember`](crate::types::PayloadUnion::UnionMember).
     pub fn is_union_member(&self) -> bool {
         self.as_union_member().is_ok()
-32
+    }
     /// Returns true if the enum instance is the `Unknown` variant.
     pub fn is_unknown(&self) -> bool {
         matches!(self, Self::Unknown)
-36
+    }
-37
+}
 static PAYLOADUNION_SCHEMA_ID: ::aws_smithy_schema::ShapeId =
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#PayloadUnion", "aws.protocoltests.restjson", "PayloadUnion");
 static PAYLOADUNION_MEMBER_UNIONMEMBER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#PayloadUnion$unionMember",
         "aws.protocoltests.restjson",
         "PayloadUnion",
     ),
     ::aws_smithy_schema::ShapeType::String,
     "unionMember",
 ,
 );
 static PAYLOADUNION_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     PAYLOADUNION_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Union,
     &[&PAYLOADUNION_MEMBER_UNIONMEMBER],
 );
 impl PayloadUnion {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &PAYLOADUNION_SCHEMA;
-+
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for PayloadUnion {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         match self {
             Self::UnionMember(val) => {
                 ser.write_string(&PAYLOADUNION_MEMBER_UNIONMEMBER, val)?;
-+
+            }
             Self::Unknown => return Err(::aws_smithy_schema::serde::SerdeError::custom("cannot serialize unknown union variant")),
-+
+        }
         Ok(())
-+
+    }
-+
+}
 impl PayloadUnion {
     /// Deserializes this union from a [`ShapeDeserializer`].
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         let mut result: ::std::option::Option<Self> = ::std::option::Option::None;
         #[allow(unused_variables, unreachable_code, clippy::single_match, clippy::match_single_binding)]
         deserializer.read_struct(&PAYLOADUNION_SCHEMA, &mut |member, deser| {
             result = ::std::option::Option::Some(match member.member_index() {
                 Some(0) => Self::UnionMember(deser.read_string(member)?),
                 _ => Self::Unknown,
             });
             Ok(())
         })?;
         result.ok_or_else(|| ::aws_smithy_schema::serde::SerdeError::custom("expected a union variant"))
-+
+    }
-+
+}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_player_action.rs

@@ -8,8 +0,102 @@

↥ Expand context

     /// The `Unknown` variant represents cases where new union variant was received. Consider upgrading the SDK to the latest available version.
     /// An unknown enum variant
     ///
     /// _Note: If you encounter this error, consider upgrading your SDK to the latest version._
     /// The `Unknown` variant represents cases where the server sent a value that wasn't recognized
     /// by the client. This can happen when the server adds new functionality, but the client has not been updated.
     /// To investigate this, consider turning on debug logging to print the raw HTTP response.
     #[non_exhaustive]
     Unknown,
-17
+}
 impl PlayerAction {
     #[allow(irrefutable_let_patterns)]
     /// Tries to convert the enum instance into [`Quit`](crate::types::PlayerAction::Quit), extracting the inner `()`.
     /// Returns `Err(&Self)` if it can't be converted.
     pub fn as_quit(&self) -> ::std::result::Result<(), &Self> {
         if let PlayerAction::Quit = &self {
             ::std::result::Result::Ok(())
         } else {
             ::std::result::Result::Err(self)
-27
+        }

-28
+    }
     /// Returns true if this is a [`Quit`](crate::types::PlayerAction::Quit).
     pub fn is_quit(&self) -> bool {
         self.as_quit().is_ok()
-32
+    }
     /// Returns true if the enum instance is the `Unknown` variant.
     pub fn is_unknown(&self) -> bool {
         matches!(self, Self::Unknown)
-36
+    }
-37
+}
 static PLAYERACTION_SCHEMA_ID: ::aws_smithy_schema::ShapeId =
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#PlayerAction", "aws.protocoltests.restjson", "PlayerAction");
 static PLAYERACTION_MEMBER_QUIT: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#PlayerAction$quit",
         "aws.protocoltests.restjson",
         "PlayerAction",
     ),
     ::aws_smithy_schema::ShapeType::Structure,
     "quit",
 ,
 );
 static PLAYERACTION_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     PLAYERACTION_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Union,
     &[&PLAYERACTION_MEMBER_QUIT],
 );
 impl PlayerAction {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &PLAYERACTION_SCHEMA;
-+
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for PlayerAction {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         match self {
             Self::Quit => {
                 struct Empty;
                 impl ::aws_smithy_schema::serde::SerializableStruct for Empty {
                     fn serialize_members(
                         &self,
                         _ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
                     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
                         Ok(())
-+
+                    }
-+
+                }
                 ser.write_struct(&PLAYERACTION_MEMBER_QUIT, &Empty)?;
-+
+            }
             Self::Unknown => return Err(::aws_smithy_schema::serde::SerdeError::custom("cannot serialize unknown union variant")),
-+
+        }
         Ok(())
-+
+    }
-+
+}
 impl PlayerAction {
     /// Deserializes this union from a [`ShapeDeserializer`].
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         let mut result: ::std::option::Option<Self> = ::std::option::Option::None;
         #[allow(unused_variables, unreachable_code, clippy::single_match, clippy::match_single_binding)]
         deserializer.read_struct(&PLAYERACTION_SCHEMA, &mut |member, deser| {
             result = ::std::option::Option::Some(match member.member_index() {
                 Some(0) => {
                     deser.read_struct(member, &mut |_, _| Ok(()))?;
                     Self::Quit
-+
+                }
                 _ => Self::Unknown,
             });
             Ok(())
         })?;
         result.ok_or_else(|| ::aws_smithy_schema::serde::SerdeError::custom("expected a union variant"))
-+
+    }
-+
+}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_recursive_shapes_input_output_nested1.rs

@@ -45,45 +131,142 @@

↥ Expand context

 );
 static RECURSIVESHAPESINPUTOUTPUTNESTED1_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     RECURSIVESHAPESINPUTOUTPUTNESTED1_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[
         &RECURSIVESHAPESINPUTOUTPUTNESTED1_MEMBER_FOO,
         &RECURSIVESHAPESINPUTOUTPUTNESTED1_MEMBER_NESTED,
     ],
 );
 impl RecursiveShapesInputOutputNested1 {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &RECURSIVESHAPESINPUTOUTPUTNESTED1_SCHEMA;
-57
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for RecursiveShapesInputOutputNested1 {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.foo {

             ser.write_string(&RECURSIVESHAPESINPUTOUTPUTNESTED1_MEMBER_FOO, val)?;
-66
+        }
         if let Some(ref val) = self.nested {
             ser.write_struct(&RECURSIVESHAPESINPUTOUTPUTNESTED1_MEMBER_NESTED, val)?;
-69
+        }
         Ok(())
-71
+    }
-72
+}
 impl RecursiveShapesInputOutputNested1 {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&RECURSIVESHAPESINPUTOUTPUTNESTED1_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&RECURSIVESHAPESINPUTOUTPUTNESTED1_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.foo = Some(deser.read_string(member)?);
-91
+                }
                 Some(1) => {
                     builder.nested = Some(Box::new(crate::types::RecursiveShapesInputOutputNested2::deserialize(deser)?));
-94
+                }
                 _ => {}
-96
+            }
             Ok(())
         })?;
         Ok(builder.build())
-100
+    }
-101
+}
 impl RecursiveShapesInputOutputNested1 {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl RecursiveShapesInputOutputNested1 {
     /// Creates a new builder-style object to manufacture [`RecursiveShapesInputOutputNested1`](crate::types::RecursiveShapesInputOutputNested1).
     pub fn builder() -> crate::types::builders::RecursiveShapesInputOutputNested1Builder {
         crate::types::builders::RecursiveShapesInputOutputNested1Builder::default()
-117
+    }
-118
+}
-119
 /// A builder for [`RecursiveShapesInputOutputNested1`](crate::types::RecursiveShapesInputOutputNested1).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct RecursiveShapesInputOutputNested1Builder {
     pub(crate) foo: ::std::option::Option<::std::string::String>,
     pub(crate) nested: ::std::option::Option<::std::boxed::Box<crate::types::RecursiveShapesInputOutputNested2>>,
-126
+}
 impl RecursiveShapesInputOutputNested1Builder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn foo(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.foo = ::std::option::Option::Some(input.into());
         self
-132
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_foo(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.foo = input;
         self
-137
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_foo(&self) -> &::std::option::Option<::std::string::String> {
         &self.foo
-141
+    }
     #[allow(missing_docs)] // documentation missing in model

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_recursive_shapes_input_output_nested2.rs

@@ -13,13 +131,142 @@

↥ Expand context

     pub fn bar(&self) -> ::std::option::Option<&str> {
         self.bar.as_deref()
-15
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn recursive_member(&self) -> ::std::option::Option<&crate::types::RecursiveShapesInputOutputNested1> {
         self.recursive_member.as_ref()
-19
+    }
-20
+}
 static RECURSIVESHAPESINPUTOUTPUTNESTED2_SCHEMA_ID: ::aws_smithy_schema::ShapeId = ::aws_smithy_schema::ShapeId::from_static(
     "aws.protocoltests.restjson#RecursiveShapesInputOutputNested2",
     "aws.protocoltests.restjson",
     "RecursiveShapesInputOutputNested2",
 );
 static RECURSIVESHAPESINPUTOUTPUTNESTED2_MEMBER_BAR: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#RecursiveShapesInputOutputNested2$bar",
         "aws.protocoltests.restjson",
         "RecursiveShapesInputOutputNested2",
     ),
     ::aws_smithy_schema::ShapeType::String,

     "bar",
 ,
 );
 static RECURSIVESHAPESINPUTOUTPUTNESTED2_MEMBER_RECURSIVE_MEMBER: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#RecursiveShapesInputOutputNested2$recursiveMember",
         "aws.protocoltests.restjson",
         "RecursiveShapesInputOutputNested2",
     ),
     ::aws_smithy_schema::ShapeType::Structure,
     "recursive_member",
     "recursiveMember",
 ,
 );
 static RECURSIVESHAPESINPUTOUTPUTNESTED2_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     RECURSIVESHAPESINPUTOUTPUTNESTED2_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[
         &RECURSIVESHAPESINPUTOUTPUTNESTED2_MEMBER_BAR,
         &RECURSIVESHAPESINPUTOUTPUTNESTED2_MEMBER_RECURSIVE_MEMBER,
     ],
 );
 impl RecursiveShapesInputOutputNested2 {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &RECURSIVESHAPESINPUTOUTPUTNESTED2_SCHEMA;
-57
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for RecursiveShapesInputOutputNested2 {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.bar {
             ser.write_string(&RECURSIVESHAPESINPUTOUTPUTNESTED2_MEMBER_BAR, val)?;
-66
+        }
         if let Some(ref val) = self.recursive_member {
             ser.write_struct(&RECURSIVESHAPESINPUTOUTPUTNESTED2_MEMBER_RECURSIVE_MEMBER, val)?;
-69
+        }
         Ok(())
-71
+    }
-72
+}
 impl RecursiveShapesInputOutputNested2 {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&RECURSIVESHAPESINPUTOUTPUTNESTED2_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&RECURSIVESHAPESINPUTOUTPUTNESTED2_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.bar = Some(deser.read_string(member)?);
-91
+                }
                 Some(1) => {
                     builder.recursive_member = Some(crate::types::RecursiveShapesInputOutputNested1::deserialize(deser)?);
-94
+                }
                 _ => {}
-96
+            }
             Ok(())
         })?;
         Ok(builder.build())
-100
+    }
-101
+}
 impl RecursiveShapesInputOutputNested2 {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl RecursiveShapesInputOutputNested2 {
     /// Creates a new builder-style object to manufacture [`RecursiveShapesInputOutputNested2`](crate::types::RecursiveShapesInputOutputNested2).
     pub fn builder() -> crate::types::builders::RecursiveShapesInputOutputNested2Builder {
         crate::types::builders::RecursiveShapesInputOutputNested2Builder::default()
-117
+    }
-118
+}
-119
 /// A builder for [`RecursiveShapesInputOutputNested2`](crate::types::RecursiveShapesInputOutputNested2).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct RecursiveShapesInputOutputNested2Builder {
     pub(crate) bar: ::std::option::Option<::std::string::String>,
     pub(crate) recursive_member: ::std::option::Option<crate::types::RecursiveShapesInputOutputNested1>,
-126
+}
 impl RecursiveShapesInputOutputNested2Builder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn bar(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.bar = ::std::option::Option::Some(input.into());
         self
-132
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_bar(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.bar = input;
         self
-137
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_bar(&self) -> &::std::option::Option<::std::string::String> {
         &self.bar
-141
+    }
     #[allow(missing_docs)] // documentation missing in model

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_renamed_greeting.rs

@@ -23,23 +106,117 @@

↥ Expand context

         "aws.protocoltests.restjson.nested",
         "GreetingStruct",
     ),
     ::aws_smithy_schema::ShapeType::String,
     "salutation",
 ,
 );
 static RENAMEDGREETING_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     RENAMEDGREETING_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[&RENAMEDGREETING_MEMBER_SALUTATION],
 );
 impl RenamedGreeting {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &RENAMEDGREETING_SCHEMA;
-38
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for RenamedGreeting {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,

         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.salutation {
             ser.write_string(&RENAMEDGREETING_MEMBER_SALUTATION, val)?;
-47
+        }
         Ok(())
-49
+    }
-50
+}
 impl RenamedGreeting {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&RENAMEDGREETING_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&RENAMEDGREETING_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.salutation = Some(deser.read_string(member)?);
-69
+                }
                 _ => {}
-71
+            }
             Ok(())
         })?;
         Ok(builder.build())
-75
+    }
-76
+}
 impl RenamedGreeting {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl RenamedGreeting {
     /// Creates a new builder-style object to manufacture [`RenamedGreeting`](crate::types::RenamedGreeting).
     pub fn builder() -> crate::types::builders::RenamedGreetingBuilder {
         crate::types::builders::RenamedGreetingBuilder::default()
-92
+    }
-93
+}
-94
 /// A builder for [`RenamedGreeting`](crate::types::RenamedGreeting).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct RenamedGreetingBuilder {
     pub(crate) salutation: ::std::option::Option<::std::string::String>,
-100
+}
 impl RenamedGreetingBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn salutation(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.salutation = ::std::option::Option::Some(input.into());
         self
-106
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_salutation(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.salutation = input;
         self
-111
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_salutation(&self) -> &::std::option::Option<::std::string::String> {
         &self.salutation
-115
+    }
     /// Consumes the builder and constructs a [`RenamedGreeting`](crate::types::RenamedGreeting).
     pub fn build(self) -> crate::types::RenamedGreeting {

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_simple_union.rs

@@ -22,22 +0,114 @@

↥ Expand context

     /// Returns `Err(&Self)` if it can't be converted.
     pub fn as_int(&self) -> ::std::result::Result<&i32, &Self> {
         if let SimpleUnion::Int(val) = &self {
             ::std::result::Result::Ok(val)
         } else {
             ::std::result::Result::Err(self)
-28
+        }
-29
+    }
     /// Returns true if this is a [`Int`](crate::types::SimpleUnion::Int).
     pub fn is_int(&self) -> bool {
         self.as_int().is_ok()
-33
+    }
     /// Tries to convert the enum instance into [`String`](crate::types::SimpleUnion::String), extracting the inner [`String`](::std::string::String).
     /// Returns `Err(&Self)` if it can't be converted.
     pub fn as_string(&self) -> ::std::result::Result<&::std::string::String, &Self> {
         if let SimpleUnion::String(val) = &self {
             ::std::result::Result::Ok(val)
         } else {
             ::std::result::Result::Err(self)
-41
+        }

-42
+    }
     /// Returns true if this is a [`String`](crate::types::SimpleUnion::String).
     pub fn is_string(&self) -> bool {
         self.as_string().is_ok()
-46
+    }
     /// Returns true if the enum instance is the `Unknown` variant.
     pub fn is_unknown(&self) -> bool {
         matches!(self, Self::Unknown)
-50
+    }
-51
+}
 static SIMPLEUNION_SCHEMA_ID: ::aws_smithy_schema::ShapeId =
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#SimpleUnion", "aws.protocoltests.restjson", "SimpleUnion");
 static SIMPLEUNION_MEMBER_INT: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static("aws.protocoltests.restjson#SimpleUnion$int", "aws.protocoltests.restjson", "SimpleUnion"),
     ::aws_smithy_schema::ShapeType::Integer,
     "int",
 ,
 );
 static SIMPLEUNION_MEMBER_STRING: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#SimpleUnion$string",
         "aws.protocoltests.restjson",
         "SimpleUnion",
     ),
     ::aws_smithy_schema::ShapeType::String,
     "string",
 ,
 );
 static SIMPLEUNION_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     SIMPLEUNION_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Union,
     &[&SIMPLEUNION_MEMBER_INT, &SIMPLEUNION_MEMBER_STRING],
 );
 impl SimpleUnion {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &SIMPLEUNION_SCHEMA;
-+
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for SimpleUnion {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         match self {
             Self::Int(val) => {
                 ser.write_integer(&SIMPLEUNION_MEMBER_INT, *val)?;
-+
+            }
             Self::String(val) => {
                 ser.write_string(&SIMPLEUNION_MEMBER_STRING, val)?;
-+
+            }
             Self::Unknown => return Err(::aws_smithy_schema::serde::SerdeError::custom("cannot serialize unknown union variant")),
-+
+        }
         Ok(())
-+
+    }
-+
+}
 impl SimpleUnion {
     /// Deserializes this union from a [`ShapeDeserializer`].
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         let mut result: ::std::option::Option<Self> = ::std::option::Option::None;
         #[allow(unused_variables, unreachable_code, clippy::single_match, clippy::match_single_binding)]
         deserializer.read_struct(&SIMPLEUNION_SCHEMA, &mut |member, deser| {
             result = ::std::option::Option::Some(match member.member_index() {
                 Some(0) => Self::Int(deser.read_integer(member)?),
                 Some(1) => Self::String(deser.read_string(member)?),
                 _ => Self::Unknown,
             });
             Ok(())
         })?;
         result.ok_or_else(|| ::aws_smithy_schema::serde::SerdeError::custom("expected a union variant"))
-+
+    }
-+
+}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_singleton_event.rs

@@ -23,23 +106,117 @@

↥ Expand context

         "aws.protocoltests.restjson",
         "SingletonEvent",
     ),
     ::aws_smithy_schema::ShapeType::String,
     "value",
 ,
 );
 static SINGLETONEVENT_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     SINGLETONEVENT_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[&SINGLETONEVENT_MEMBER_VALUE],
 );
 impl SingletonEvent {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &SINGLETONEVENT_SCHEMA;
-38
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for SingletonEvent {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,

         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.value {
             ser.write_string(&SINGLETONEVENT_MEMBER_VALUE, val)?;
-47
+        }
         Ok(())
-49
+    }
-50
+}
 impl SingletonEvent {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&SINGLETONEVENT_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&SINGLETONEVENT_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.value = Some(deser.read_string(member)?);
-69
+                }
                 _ => {}
-71
+            }
             Ok(())
         })?;
         Ok(builder.build())
-75
+    }
-76
+}
 impl SingletonEvent {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl SingletonEvent {
     /// Creates a new builder-style object to manufacture [`SingletonEvent`](crate::types::SingletonEvent).
     pub fn builder() -> crate::types::builders::SingletonEventBuilder {
         crate::types::builders::SingletonEventBuilder::default()
-92
+    }
-93
+}
-94
 /// A builder for [`SingletonEvent`](crate::types::SingletonEvent).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct SingletonEventBuilder {
     pub(crate) value: ::std::option::Option<::std::string::String>,
-100
+}
 impl SingletonEventBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn value(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.value = ::std::option::Option::Some(input.into());
         self
-106
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_value(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.value = input;
         self
-111
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_value(&self) -> &::std::option::Option<::std::string::String> {
         &self.value
-115
+    }
     /// Consumes the builder and constructs a [`SingletonEvent`](crate::types::SingletonEvent).
     pub fn build(self) -> crate::types::SingletonEvent {

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_singleton_event_stream.rs

@@ -8,8 +0,93 @@

↥ Expand context

     /// The `Unknown` variant represents cases where new union variant was received. Consider upgrading the SDK to the latest available version.
     /// An unknown enum variant
     ///
     /// _Note: If you encounter this error, consider upgrading your SDK to the latest version._
     /// The `Unknown` variant represents cases where the server sent a value that wasn't recognized
     /// by the client. This can happen when the server adds new functionality, but the client has not been updated.
     /// To investigate this, consider turning on debug logging to print the raw HTTP response.
     #[non_exhaustive]
     Unknown,
-17
+}
 impl SingletonEventStream {
     #[allow(irrefutable_let_patterns)]
     /// Tries to convert the enum instance into [`Singleton`](crate::types::SingletonEventStream::Singleton), extracting the inner [`SingletonEvent`](crate::types::SingletonEvent).
     /// Returns `Err(&Self)` if it can't be converted.
     pub fn as_singleton(&self) -> ::std::result::Result<&crate::types::SingletonEvent, &Self> {
         if let SingletonEventStream::Singleton(val) = &self {
             ::std::result::Result::Ok(val)
         } else {
             ::std::result::Result::Err(self)
-27
+        }

-28
+    }
     /// Returns true if this is a [`Singleton`](crate::types::SingletonEventStream::Singleton).
     pub fn is_singleton(&self) -> bool {
         self.as_singleton().is_ok()
-32
+    }
     /// Returns true if the enum instance is the `Unknown` variant.
     pub fn is_unknown(&self) -> bool {
         matches!(self, Self::Unknown)
-36
+    }
-37
+}
 static SINGLETONEVENTSTREAM_SCHEMA_ID: ::aws_smithy_schema::ShapeId = ::aws_smithy_schema::ShapeId::from_static(
     "aws.protocoltests.restjson#SingletonEventStream",
     "aws.protocoltests.restjson",
     "SingletonEventStream",
 );
 static SINGLETONEVENTSTREAM_MEMBER_SINGLETON: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_member(
     ::aws_smithy_schema::ShapeId::from_static(
         "aws.protocoltests.restjson#SingletonEventStream$singleton",
         "aws.protocoltests.restjson",
         "SingletonEventStream",
     ),
     ::aws_smithy_schema::ShapeType::Structure,
     "singleton",
 ,
 );
 static SINGLETONEVENTSTREAM_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     SINGLETONEVENTSTREAM_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Union,
     &[&SINGLETONEVENTSTREAM_MEMBER_SINGLETON],
 );
 impl SingletonEventStream {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &SINGLETONEVENTSTREAM_SCHEMA;
-+
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for SingletonEventStream {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         match self {
             Self::Singleton(val) => {
                 ser.write_struct(&SINGLETONEVENTSTREAM_MEMBER_SINGLETON, val)?;
-+
+            }
             Self::Unknown => return Err(::aws_smithy_schema::serde::SerdeError::custom("cannot serialize unknown union variant")),
-+
+        }
         Ok(())
-+
+    }
-+
+}
 impl SingletonEventStream {
     /// Deserializes this union from a [`ShapeDeserializer`].
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         let mut result: ::std::option::Option<Self> = ::std::option::Option::None;
         #[allow(unused_variables, unreachable_code, clippy::single_match, clippy::match_single_binding)]
         deserializer.read_struct(&SINGLETONEVENTSTREAM_SCHEMA, &mut |member, deser| {
             result = ::std::option::Option::Some(match member.member_index() {
                 Some(0) => Self::Singleton(crate::types::SingletonEvent::deserialize(deser)?),
                 _ => Self::Unknown,
             });
             Ok(())
         })?;
         result.ok_or_else(|| ::aws_smithy_schema::serde::SerdeError::custom("expected a union variant"))
-+
+    }
-+
+}

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_string_payload_event.rs

@@ -24,24 +107,118 @@

↥ Expand context

         "StringPayloadEvent",
     ),
     ::aws_smithy_schema::ShapeType::String,
     "payload",
 ,
-29
+)
 .with_event_payload();
 static STRINGPAYLOADEVENT_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     STRINGPAYLOADEVENT_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[&STRINGPAYLOADEVENT_MEMBER_PAYLOAD],
 );
 impl StringPayloadEvent {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &STRINGPAYLOADEVENT_SCHEMA;
-39
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for StringPayloadEvent {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,

         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.payload {
             ser.write_string(&STRINGPAYLOADEVENT_MEMBER_PAYLOAD, val)?;
-48
+        }
         Ok(())
-50
+    }
-51
+}
 impl StringPayloadEvent {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&STRINGPAYLOADEVENT_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&STRINGPAYLOADEVENT_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.payload = Some(deser.read_string(member)?);
-70
+                }
                 _ => {}
-72
+            }
             Ok(())
         })?;
         Ok(builder.build())
-76
+    }
-77
+}
 impl StringPayloadEvent {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl StringPayloadEvent {
     /// Creates a new builder-style object to manufacture [`StringPayloadEvent`](crate::types::StringPayloadEvent).
     pub fn builder() -> crate::types::builders::StringPayloadEventBuilder {
         crate::types::builders::StringPayloadEventBuilder::default()
-93
+    }
-94
+}
-95
 /// A builder for [`StringPayloadEvent`](crate::types::StringPayloadEvent).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct StringPayloadEventBuilder {
     pub(crate) payload: ::std::option::Option<::std::string::String>,
-101
+}
 impl StringPayloadEventBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn payload(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.payload = ::std::option::Option::Some(input.into());
         self
-107
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_payload(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.payload = input;
         self
-112
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_payload(&self) -> &::std::option::Option<::std::string::String> {
         &self.payload
-116
+    }
     /// Consumes the builder and constructs a [`StringPayloadEvent`](crate::types::StringPayloadEvent).
     pub fn build(self) -> crate::types::StringPayloadEvent {

tmp-codegen-diff/codegen-client-test/rest_json/rust-client-codegen/src/types/_structure_list_member.rs

@@ -44,44 +130,141 @@

↥ Expand context

     "b",
 ,
-46
+)
 .with_json_name("other");
 static STRUCTURELISTMEMBER_SCHEMA: ::aws_smithy_schema::Schema = ::aws_smithy_schema::Schema::new_struct(
     STRUCTURELISTMEMBER_SCHEMA_ID,
     ::aws_smithy_schema::ShapeType::Structure,
     &[&STRUCTURELISTMEMBER_MEMBER_A, &STRUCTURELISTMEMBER_MEMBER_B],
 );
 impl StructureListMember {
     /// The schema for this shape.
     pub const SCHEMA: &'static ::aws_smithy_schema::Schema = &STRUCTURELISTMEMBER_SCHEMA;
-56
+}
 impl ::aws_smithy_schema::serde::SerializableStruct for StructureListMember {
     #[allow(unused_variables, clippy::diverging_sub_expression)]
     fn serialize_members(
         &self,
         ser: &mut dyn ::aws_smithy_schema::serde::ShapeSerializer,
     ) -> ::std::result::Result<(), ::aws_smithy_schema::serde::SerdeError> {
         if let Some(ref val) = self.a {

             ser.write_string(&STRUCTURELISTMEMBER_MEMBER_A, val)?;
-65
+        }
         if let Some(ref val) = self.b {
             ser.write_string(&STRUCTURELISTMEMBER_MEMBER_B, val)?;
-68
+        }
         Ok(())
-70
+    }
-71
+}
 impl StructureListMember {
     /// Deserializes this structure from a [`ShapeDeserializer`].
     pub fn deserialize<D: ::aws_smithy_schema::serde::ShapeDeserializer>(
         deserializer: &mut D,
     pub fn deserialize(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         #[allow(unused_variables, unused_mut)]
         let mut builder = Self::builder();
         #[allow(
             unused_variables,
             unreachable_code,
             clippy::single_match,
             clippy::match_single_binding,
             clippy::diverging_sub_expression
         )]
         deserializer.read_struct(&STRUCTURELISTMEMBER_SCHEMA, (), |_, member, deser| {
         deserializer.read_struct(&STRUCTURELISTMEMBER_SCHEMA, &mut |member, deser| {
             match member.member_index() {
                 Some(0) => {
                     builder.a = Some(deser.read_string(member)?);
-90
+                }
                 Some(1) => {
                     builder.b = Some(deser.read_string(member)?);
-93
+                }
                 _ => {}
-95
+            }
             Ok(())
         })?;
         Ok(builder.build())
-99
+    }
-100
+}
 impl StructureListMember {
     /// Deserializes this structure from a body deserializer and HTTP response.
     pub fn deserialize_with_response(
         deserializer: &mut dyn ::aws_smithy_schema::serde::ShapeDeserializer,
         _headers: &::aws_smithy_runtime_api::http::Headers,
         _status: u16,
         _body: &[u8],
     ) -> ::std::result::Result<Self, ::aws_smithy_schema::serde::SerdeError> {
         Self::deserialize(deserializer)
-+
+    }
-+
+}
 impl StructureListMember {
     /// Creates a new builder-style object to manufacture [`StructureListMember`](crate::types::StructureListMember).
     pub fn builder() -> crate::types::builders::StructureListMemberBuilder {
         crate::types::builders::StructureListMemberBuilder::default()
-116
+    }
-117
+}
-118
 /// A builder for [`StructureListMember`](crate::types::StructureListMember).
 #[derive(::std::clone::Clone, ::std::cmp::PartialEq, ::std::default::Default, ::std::fmt::Debug)]
 #[non_exhaustive]

↧ Expand context

 pub struct StructureListMemberBuilder {
     pub(crate) a: ::std::option::Option<::std::string::String>,
     pub(crate) b: ::std::option::Option<::std::string::String>,
-125
+}
 impl StructureListMemberBuilder {
     #[allow(missing_docs)] // documentation missing in model
     pub fn a(mut self, input: impl ::std::convert::Into<::std::string::String>) -> Self {
         self.a = ::std::option::Option::Some(input.into());
         self
-131
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn set_a(mut self, input: ::std::option::Option<::std::string::String>) -> Self {
         self.a = input;
         self
-136
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn get_a(&self) -> &::std::option::Option<::std::string::String> {
         &self.a
-140
+    }
     #[allow(missing_docs)] // documentation missing in model

Client Test

Files changed: