[smithy-rs] Cherry-pick codegen fix for unions with the `@httpPayload…

…` trait (#2987)

## Motivation and Context
Cherry-picks smithy-lang/smithy-rs#2969, since our
internal build based on the `smithy-rs-release-0.56.x` branch failed to
code gen for the latest `medicalimaging` SDK model.

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._

Co-authored-by: John DiSanti <[email protected]>

sdk/amplifyuibuilder/src/protocol_serde.rs

@@ -25,7 +25,7 @@ pub fn parse_http_error_metadata(
 
 pub(crate) mod shape_create_component;
 
-pub fn rest_json_unsetpayload() -> ::std::vec::Vec<u8> {
+pub fn rest_json_unset_struct_payload() -> ::std::vec::Vec<u8> {
     b"{}"[..].into()
 }
 

sdk/amplifyuibuilder/src/protocol_serde/shape_create_component_input.rs

@@ -4,7 +4,7 @@ pub fn ser_component_to_create_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_component_input::ser_component_to_create_payload(
         payload,

sdk/amplifyuibuilder/src/protocol_serde/shape_create_form_input.rs

@@ -4,7 +4,7 @@ pub fn ser_form_to_create_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_form_input::ser_form_to_create_payload(payload)?)
 }

sdk/amplifyuibuilder/src/protocol_serde/shape_create_theme_input.rs

@@ -4,7 +4,7 @@ pub fn ser_theme_to_create_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_theme_input::ser_theme_to_create_payload(payload)?)
 }

sdk/amplifyuibuilder/src/protocol_serde/shape_exchange_code_for_token_input.rs

@@ -4,7 +4,7 @@ pub fn ser_request_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_exchange_code_for_token_input::ser_request_payload(payload)?)
 }

sdk/amplifyuibuilder/src/protocol_serde/shape_put_metadata_flag_input.rs

@@ -4,7 +4,7 @@ pub fn ser_body_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_put_metadata_flag_input::ser_body_payload(payload)?)
 }

sdk/amplifyuibuilder/src/protocol_serde/shape_refresh_token_input.rs

@@ -4,7 +4,7 @@ pub fn ser_refresh_token_body_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_refresh_token_input::ser_refresh_token_body_payload(payload)?)
 }

sdk/amplifyuibuilder/src/protocol_serde/shape_start_codegen_job_input.rs

@@ -4,7 +4,7 @@ pub fn ser_codegen_job_to_create_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_start_codegen_job_input::ser_codegen_job_to_create_payload(
         payload,

sdk/amplifyuibuilder/src/protocol_serde/shape_update_component_input.rs

@@ -4,7 +4,7 @@ pub fn ser_updated_component_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_component_input::ser_updated_component_payload(
         payload,

sdk/amplifyuibuilder/src/protocol_serde/shape_update_form_input.rs

@@ -4,7 +4,7 @@ pub fn ser_updated_form_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_form_input::ser_updated_form_payload(payload)?)
 }

sdk/amplifyuibuilder/src/protocol_serde/shape_update_theme_input.rs

@@ -4,7 +4,7 @@ pub fn ser_updated_theme_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_json_unsetpayload()),
+        None => return Ok(crate::protocol_serde::rest_json_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_theme_input::ser_updated_theme_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde.rs

@@ -29,7 +29,7 @@ pub(crate) mod shape_copy_distribution;
 
 pub(crate) mod shape_create_cache_policy;
 
-pub fn rest_xml_unset_payload() -> ::std::vec::Vec<u8> {
+pub fn rest_xml_unset_struct_payload() -> ::std::vec::Vec<u8> {
     Vec::new()
 }
 

sdk/cloudfront/src/protocol_serde/shape_create_cache_policy_input.rs

@@ -4,7 +4,7 @@ pub fn ser_cache_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_cache_policy_input::ser_cache_policy_config_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_create_cloud_front_origin_access_identity_input.rs

@@ -4,7 +4,7 @@ pub fn ser_cloud_front_origin_access_identity_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_cloud_front_origin_access_identity_input::ser_cloud_front_origin_access_identity_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_continuous_deployment_policy_input.rs

@@ -4,7 +4,7 @@ pub fn ser_continuous_deployment_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_continuous_deployment_policy_input::ser_continuous_deployment_policy_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_distribution_input.rs

@@ -4,7 +4,7 @@ pub fn ser_distribution_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_distribution_input::ser_distribution_config_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_create_distribution_with_tags_input.rs

@@ -4,7 +4,7 @@ pub fn ser_distribution_config_with_tags_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_distribution_with_tags_input::ser_distribution_config_with_tags_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_config_input.rs

@@ -4,7 +4,7 @@ pub fn ser_field_level_encryption_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_field_level_encryption_config_input::ser_field_level_encryption_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_field_level_encryption_profile_input.rs

@@ -4,7 +4,7 @@ pub fn ser_field_level_encryption_profile_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_field_level_encryption_profile_input::ser_field_level_encryption_profile_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_invalidation_input.rs

@@ -4,7 +4,7 @@ pub fn ser_invalidation_batch_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_invalidation_input::ser_invalidation_batch_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_create_key_group_input.rs

@@ -4,7 +4,7 @@ pub fn ser_key_group_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_key_group_input::ser_key_group_config_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_create_monitoring_subscription_input.rs

@@ -4,7 +4,7 @@ pub fn ser_monitoring_subscription_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_monitoring_subscription_input::ser_monitoring_subscription_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_origin_access_control_input.rs

@@ -4,7 +4,7 @@ pub fn ser_origin_access_control_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_origin_access_control_input::ser_origin_access_control_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_origin_request_policy_input.rs

@@ -4,7 +4,7 @@ pub fn ser_origin_request_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_origin_request_policy_input::ser_origin_request_policy_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_public_key_input.rs

@@ -4,7 +4,7 @@ pub fn ser_public_key_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_public_key_input::ser_public_key_config_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_create_response_headers_policy_input.rs

@@ -4,7 +4,7 @@ pub fn ser_response_headers_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_response_headers_policy_input::ser_response_headers_policy_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_input.rs

@@ -4,7 +4,7 @@ pub fn ser_streaming_distribution_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_streaming_distribution_input::ser_streaming_distribution_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_create_streaming_distribution_with_tags_input.rs

@@ -4,7 +4,7 @@ pub fn ser_streaming_distribution_config_with_tags_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_create_streaming_distribution_with_tags_input::ser_streaming_distribution_config_with_tags_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_tag_resource_input.rs

@@ -4,7 +4,7 @@ pub fn ser_tags_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_tag_resource_input::ser_tags_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_untag_resource_input.rs

@@ -4,7 +4,7 @@ pub fn ser_tag_keys_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_untag_resource_input::ser_tag_keys_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_update_cache_policy_input.rs

@@ -4,7 +4,7 @@ pub fn ser_cache_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_cache_policy_input::ser_cache_policy_config_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_update_cloud_front_origin_access_identity_input.rs

@@ -4,7 +4,7 @@ pub fn ser_cloud_front_origin_access_identity_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_cloud_front_origin_access_identity_input::ser_cloud_front_origin_access_identity_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_update_continuous_deployment_policy_input.rs

@@ -4,7 +4,7 @@ pub fn ser_continuous_deployment_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_continuous_deployment_policy_input::ser_continuous_deployment_policy_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_update_distribution_input.rs

@@ -4,7 +4,7 @@ pub fn ser_distribution_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_distribution_input::ser_distribution_config_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_config_input.rs

@@ -4,7 +4,7 @@ pub fn ser_field_level_encryption_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_field_level_encryption_config_input::ser_field_level_encryption_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_update_field_level_encryption_profile_input.rs

@@ -4,7 +4,7 @@ pub fn ser_field_level_encryption_profile_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_field_level_encryption_profile_input::ser_field_level_encryption_profile_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_update_key_group_input.rs

@@ -4,7 +4,7 @@ pub fn ser_key_group_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_key_group_input::ser_key_group_config_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_update_origin_access_control_input.rs

@@ -4,7 +4,7 @@ pub fn ser_origin_access_control_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_origin_access_control_input::ser_origin_access_control_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_update_origin_request_policy_input.rs

@@ -4,7 +4,7 @@ pub fn ser_origin_request_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_origin_request_policy_input::ser_origin_request_policy_config_payload(payload)?)
 }

sdk/cloudfront/src/protocol_serde/shape_update_public_key_input.rs

@@ -4,7 +4,7 @@ pub fn ser_public_key_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_public_key_input::ser_public_key_config_payload(
         payload,

sdk/cloudfront/src/protocol_serde/shape_update_response_headers_policy_input.rs

@@ -4,7 +4,7 @@ pub fn ser_response_headers_policy_config_http_payload(
 ) -> Result<::std::vec::Vec<u8>, ::aws_smithy_http::operation::error::BuildError> {
     let payload = match payload.as_ref() {
         Some(t) => t,
-        None => return Ok(crate::protocol_serde::rest_xml_unset_payload()),
+        None => return Ok(crate::protocol_serde::rest_xml_unset_struct_payload()),
     };
     Ok(crate::protocol_serde::shape_update_response_headers_policy_input::ser_response_headers_policy_config_payload(payload)?)
 }