Server Test

rev. eb19c4c7998eaae1210cb747286b497c3425236c

Files changed:

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras/rust-server-codegen/src/input.rs

@@ -1,1 +166,150 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(missing_docs)] // documentation missing in model
 #[derive(::std::fmt::Debug)]
 pub struct StreamingOperationWithOptionalDataInput {
     #[allow(missing_docs)] // documentation missing in model
     pub optional_data: ::std::option::Option<::std::string::String>,
     #[allow(missing_docs)] // documentation missing in model
     pub events: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
-12
+}
 impl StreamingOperationWithOptionalDataInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn optional_data(&self) -> ::std::option::Option<&str> {
         self.optional_data.as_deref()
-17
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn events(
         &self,
     ) -> &::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     > {
         &self.events
-26
+    }
-27
+}
 impl StreamingOperationWithOptionalDataInput {
     /// Creates a new builder-style object to manufacture [`StreamingOperationWithOptionalDataInput`](crate::input::StreamingOperationWithOptionalDataInput).
     pub fn builder() -> crate::input::streaming_operation_with_optional_data_input::Builder {
         crate::input::streaming_operation_with_optional_data_input::Builder::default()
-32
+    }
-33
+}
 impl crate::constrained::Constrained for crate::input::StreamingOperationWithOptionalDataInput {
     type Unconstrained = crate::input::streaming_operation_with_optional_data_input::Builder;
-36
+}
-37
 #[allow(missing_docs)] // documentation missing in model
 #[derive(::std::fmt::Debug)]
 pub struct StreamingOperationWithInitialResponseInput {
     #[allow(missing_docs)] // documentation missing in model
     pub events: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
-46
+}
 impl StreamingOperationWithInitialResponseInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn events(
         &self,
     ) -> &::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     > {
         &self.events
-56
+    }
-57
+}
 impl StreamingOperationWithInitialResponseInput {
     /// Creates a new builder-style object to manufacture [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput).
     pub fn builder() -> crate::input::streaming_operation_with_initial_response_input::Builder {
         crate::input::streaming_operation_with_initial_response_input::Builder::default()
-62
+    }
-63
+}
 impl crate::constrained::Constrained for crate::input::StreamingOperationWithInitialResponseInput {
     type Unconstrained = crate::input::streaming_operation_with_initial_response_input::Builder;
-66
+}
-67
 #[allow(missing_docs)] // documentation missing in model
 #[derive(::std::fmt::Debug)]
 pub struct StreamingOperationWithInitialDataInput {
     #[allow(missing_docs)] // documentation missing in model
     pub initial_data: ::std::string::String,
     #[allow(missing_docs)] // documentation missing in model
     pub events: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
-78
+}
 impl StreamingOperationWithInitialDataInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn initial_data(&self) -> &str {
         use std::ops::Deref;
         self.initial_data.deref()
-84
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn events(
         &self,
     ) -> &::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     > {
         &self.events
-93
+    }
-94
+}
 impl StreamingOperationWithInitialDataInput {
     /// Creates a new builder-style object to manufacture [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput).
     pub fn builder() -> crate::input::streaming_operation_with_initial_data_input::Builder {
         crate::input::streaming_operation_with_initial_data_input::Builder::default()
-99
+    }
-100
+}
 impl crate::constrained::Constrained for crate::input::StreamingOperationWithInitialDataInput {
     type Unconstrained = crate::input::streaming_operation_with_initial_data_input::Builder;
-103
+}
-104
 #[allow(missing_docs)] // documentation missing in model
 #[derive(::std::fmt::Debug)]
 pub struct StreamingOperationInput {
     #[allow(missing_docs)] // documentation missing in model
     pub events: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
-113
+}
 impl StreamingOperationInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn events(
         &self,
     ) -> &::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     > {
         &self.events
-123
+    }
-124
+}
 impl StreamingOperationInput {
     /// Creates a new builder-style object to manufacture [`StreamingOperationInput`](crate::input::StreamingOperationInput).
     pub fn builder() -> crate::input::streaming_operation_input::Builder {
         crate::input::streaming_operation_input::Builder::default()
-129
+    }
-130
+}

↧ Expand context

 impl crate::constrained::Constrained for crate::input::StreamingOperationInput {
     type Unconstrained = crate::input::streaming_operation_input::Builder;
-133
+}
-134
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct RecursiveUnionOperationInput {
     #[allow(missing_docs)] // documentation missing in model
     pub nested: ::std::option::Option<crate::model::RecursiveOperationInputOutputNested1>,
-142
+}
 impl RecursiveUnionOperationInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn nested(
         &self,
     ) -> ::std::option::Option<&crate::model::RecursiveOperationInputOutputNested1> {
         self.nested.as_ref()
-149
+    }
-150
+}

@@ -642,626 +747,725 @@

↥ Expand context

                 field_list: Some(vec![first_validation_exception_field]),
             };
             Self::ConstraintViolation(
                                 crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(&validation_exception)
                                     .expect("validation exceptions should never fail to serialize; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues")
-631
+                            )
-632
+        }
-633
+    }
     impl ::std::convert::From<Builder>
         for crate::constrained::MaybeConstrained<
             crate::input::StreamingOperationWithOptionalDataInput,
-637
+        >
-638
+    {
         fn from(builder: Builder) -> Self {
             Self::Unconstrained(builder)
-641
+        }
-642
+    }
     impl ::std::convert::TryFrom<Builder> for crate::input::StreamingOperationWithOptionalDataInput {
         type Error = ConstraintViolation;
-645

         fn try_from(builder: Builder) -> ::std::result::Result<Self, Self::Error> {
             builder.build()
-648
+        }
-649
+    }
     /// A builder for [`StreamingOperationWithOptionalDataInput`](crate::input::StreamingOperationWithOptionalDataInput).
     #[derive(::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) optional_data: ::std::option::Option<::std::string::String>,
         pub(crate) events: ::std::option::Option<
             ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         >,
-660
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn optional_data(
             mut self,
             input: ::std::option::Option<::std::string::String>,
         ) -> Self {
             self.optional_data = input;
             self
-669
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_optional_data(
             mut self,
             input: Option<impl ::std::convert::Into<::std::string::String>>,
         ) -> Self {
             self.optional_data = input.map(|v| v.into());
             self
-677
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub fn events(
             mut self,
             input: ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         ) -> Self {
             self.events = Some(input);
             self
-688
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_events(
             mut self,
             input: impl ::std::convert::Into<
                 ::aws_smithy_http::event_stream::Receiver<
                     crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                     crate::sigv4_event_stream::SignedEventError<
                         ::aws_smithy_http::event_stream::MessageStreamError,
                     >,
                     crate::model::Events,
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
             >,
         ) -> Self {
             self.events = Some(input.into());
             self
-701
+        }
         /// Consumes the builder and constructs a [`StreamingOperationWithOptionalDataInput`](crate::input::StreamingOperationWithOptionalDataInput).
         ///
         /// The builder fails to construct a [`StreamingOperationWithOptionalDataInput`](crate::input::StreamingOperationWithOptionalDataInput) if a [`ConstraintViolation`] occurs.
         ///

↧ Expand context

         pub fn build(
             self,
         ) -> Result<crate::input::StreamingOperationWithOptionalDataInput, ConstraintViolation>
-709
+        {
             self.build_enforcing_all_constraints()
-711
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::StreamingOperationWithOptionalDataInput, ConstraintViolation>
-715
+        {
             Ok(crate::input::StreamingOperationWithOptionalDataInput {
                 optional_data: self.optional_data,
                 events: self.events.ok_or(ConstraintViolation::MissingEvents)?,
             })
-720
+        }
-721
+    }
-722
+}
 /// See [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput).
 pub mod streaming_operation_with_initial_response_input {
-725

@@ -787,765 +876,848 @@

↥ Expand context

                 ),
                 field_list: Some(vec![first_validation_exception_field]),
             };
             Self::ConstraintViolation(
                                 crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(&validation_exception)
                                     .expect("validation exceptions should never fail to serialize; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues")
-771
+                            )
-772
+        }
-773
+    }
     impl ::std::convert::From<Builder>
         for crate::constrained::MaybeConstrained<
             crate::input::StreamingOperationWithInitialResponseInput,
-777
+        >
-778
+    {
         fn from(builder: Builder) -> Self {
             Self::Unconstrained(builder)
-781
+        }
-782
+    }
     impl ::std::convert::TryFrom<Builder> for crate::input::StreamingOperationWithInitialResponseInput {
         type Error = ConstraintViolation;

-785
         fn try_from(builder: Builder) -> ::std::result::Result<Self, Self::Error> {
             builder.build()
-788
+        }
-789
+    }
     /// A builder for [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput).
     #[derive(::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) events: ::std::option::Option<
             ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         >,
-799
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn events(
             mut self,
             input: ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         ) -> Self {
             self.events = Some(input);
             self
-811
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_events(
             mut self,
             input: impl ::std::convert::Into<
                 ::aws_smithy_http::event_stream::Receiver<
                     crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                     crate::sigv4_event_stream::SignedEventError<
                         ::aws_smithy_http::event_stream::MessageStreamError,
                     >,
                     crate::model::Events,
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
             >,
         ) -> Self {
             self.events = Some(input.into());
             self
-824
+        }
         /// Consumes the builder and constructs a [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput).
         ///
         /// The builder fails to construct a [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput) if a [`ConstraintViolation`] occurs.
         ///

↧ Expand context

         pub fn build(
             self,
         ) -> Result<crate::input::StreamingOperationWithInitialResponseInput, ConstraintViolation>
-832
+        {
             self.build_enforcing_all_constraints()
-834
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::StreamingOperationWithInitialResponseInput, ConstraintViolation>
-838
+        {
             Ok(crate::input::StreamingOperationWithInitialResponseInput {
                 events: self.events.ok_or(ConstraintViolation::MissingEvents)?,
             })
-842
+        }
-843
+    }
-844
+}
 /// See [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput).
 pub mod streaming_operation_with_initial_data_input {
-847
     #[derive(::std::cmp::PartialEq, ::std::fmt::Debug)]

@@ -923,895 +1025,991 @@

↥ Expand context

                 field_list: Some(vec![first_validation_exception_field]),
             };
             Self::ConstraintViolation(
                                 crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(&validation_exception)
                                     .expect("validation exceptions should never fail to serialize; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues")
-900
+                            )
-901
+        }
-902
+    }
     impl ::std::convert::From<Builder>
         for crate::constrained::MaybeConstrained<
             crate::input::StreamingOperationWithInitialDataInput,
-906
+        >
-907
+    {
         fn from(builder: Builder) -> Self {
             Self::Unconstrained(builder)
-910
+        }
-911
+    }
     impl ::std::convert::TryFrom<Builder> for crate::input::StreamingOperationWithInitialDataInput {
         type Error = ConstraintViolation;
-914

         fn try_from(builder: Builder) -> ::std::result::Result<Self, Self::Error> {
             builder.build()
-917
+        }
-918
+    }
     /// A builder for [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput).
     #[derive(::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) initial_data: ::std::option::Option<::std::string::String>,
         pub(crate) events: ::std::option::Option<
             ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         >,
-929
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn initial_data(mut self, input: ::std::string::String) -> Self {
             self.initial_data = Some(input);
             self
-935
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_initial_data(
             mut self,
             input: impl ::std::convert::Into<::std::string::String>,
         ) -> Self {
             self.initial_data = Some(input.into());
             self
-943
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub fn events(
             mut self,
             input: ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         ) -> Self {
             self.events = Some(input);
             self
-954
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_events(
             mut self,
             input: impl ::std::convert::Into<
                 ::aws_smithy_http::event_stream::Receiver<
                     crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                     crate::sigv4_event_stream::SignedEventError<
                         ::aws_smithy_http::event_stream::MessageStreamError,
                     >,
                     crate::model::Events,
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
             >,
         ) -> Self {
             self.events = Some(input.into());
             self
-967
+        }
         /// Consumes the builder and constructs a [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput).
         ///
         /// The builder fails to construct a [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput) if a [`ConstraintViolation`] occurs.
         ///

↧ Expand context

         /// If the builder fails, it will return the _first_ encountered [`ConstraintViolation`].
         pub fn build(
             self,
         ) -> Result<crate::input::StreamingOperationWithInitialDataInput, ConstraintViolation>
-976
+        {
             self.build_enforcing_all_constraints()
-978
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::StreamingOperationWithInitialDataInput, ConstraintViolation>
-982
+        {
             Ok(crate::input::StreamingOperationWithInitialDataInput {
                 initial_data: self
                     .initial_data
                     .ok_or(ConstraintViolation::MissingInitialData)?,
                 events: self.events.ok_or(ConstraintViolation::MissingEvents)?,
             })
-989
+        }
-990
+    }
-991
+}

@@ -1066,1032 +1155,1115 @@

↥ Expand context

                     "1 validation error detected. {}",
                     &first_validation_exception_field.message
                 ),
                 field_list: Some(vec![first_validation_exception_field]),
             };
             Self::ConstraintViolation(
                                 crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(&validation_exception)
                                     .expect("validation exceptions should never fail to serialize; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues")
-1040
+                            )
-1041
+        }
-1042
+    }
     impl ::std::convert::From<Builder>
         for crate::constrained::MaybeConstrained<crate::input::StreamingOperationInput>
-1045
+    {
         fn from(builder: Builder) -> Self {
             Self::Unconstrained(builder)
-1048
+        }
-1049
+    }
     impl ::std::convert::TryFrom<Builder> for crate::input::StreamingOperationInput {
         type Error = ConstraintViolation;

-1052
         fn try_from(builder: Builder) -> ::std::result::Result<Self, Self::Error> {
             builder.build()
-1055
+        }
-1056
+    }
     /// A builder for [`StreamingOperationInput`](crate::input::StreamingOperationInput).
     #[derive(::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) events: ::std::option::Option<
             ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         >,
-1066
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn events(
             mut self,
             input: ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         ) -> Self {
             self.events = Some(input);
             self
-1078
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_events(
             mut self,
             input: impl ::std::convert::Into<
                 ::aws_smithy_http::event_stream::Receiver<
                     crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                     crate::sigv4_event_stream::SignedEventError<
                         ::aws_smithy_http::event_stream::MessageStreamError,
                     >,
                     crate::model::Events,
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
             >,
         ) -> Self {
             self.events = Some(input.into());
             self
-1091
+        }
         /// Consumes the builder and constructs a [`StreamingOperationInput`](crate::input::StreamingOperationInput).
         ///
         /// The builder fails to construct a [`StreamingOperationInput`](crate::input::StreamingOperationInput) if a [`ConstraintViolation`] occurs.
         ///

↧ Expand context

         pub fn build(self) -> Result<crate::input::StreamingOperationInput, ConstraintViolation> {
             self.build_enforcing_all_constraints()
-1098
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::StreamingOperationInput, ConstraintViolation> {
             Ok(crate::input::StreamingOperationInput {
                 events: self.events.ok_or(ConstraintViolation::MissingEvents)?,
             })
-1105
+        }
-1106
+    }
-1107
+}
 /// See [`RecursiveUnionOperationInput`](crate::input::RecursiveUnionOperationInput).
 pub mod recursive_union_operation_input {
-1110
     impl ::std::convert::From<Builder> for crate::input::RecursiveUnionOperationInput {
         fn from(builder: Builder) -> Self {
             builder.build()
-1114
+        }
-1115
+    }

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras/rust-server-codegen/src/lib.rs

@@ -265,265 +299,297 @@

↥ Expand context

 pub mod input;
-266
 /// Data structures used by operation inputs/outputs. Documentation on these types is copied from the model.
 pub mod model;
-269
 /// All operations that this crate can perform.
 pub mod operation;
-272
 /// A collection of types representing each operation defined in the service closure.
 ///
 /// The [plugin system](::aws_smithy_http_server::plugin) makes use of these
 /// [zero-sized types](https://doc.rust-lang.org/nomicon/exotic-sizes.html#zero-sized-types-zsts) (ZSTs) to
 /// parameterize [`Plugin`](::aws_smithy_http_server::plugin::Plugin) implementations. Their traits, such as
 /// [`OperationShape`](::aws_smithy_http_server::operation::OperationShape), can be used to provide
 /// operation specific information to the [`Layer`](::tower::Layer) being applied.
 pub mod operation_shape;
-281
 /// Output structures for operations. Documentation on these types is copied from the model.
 pub mod output;
-284

 mod service;
-286
 /// Data primitives referenced by other data types.
 pub mod types;
-289
 /// Unconstrained types for constrained shapes.
 mod unconstrained;
-292
 mod mimes;
-294
 mod sigv4_event_stream;
--
 mod event_stream_serde;
-296
 pub(crate) mod protocol_serde;

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras/rust-server-codegen/src/protocol_serde/shape_streaming_operation_input.rs

@@ -1,1 +20,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
-17
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_initial_data_input.rs

@@ -1,1 +20,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
-17
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_initial_response_input.rs

@@ -1,1 +20,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
-17
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_optional_data_input.rs

@@ -1,1 +20,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
-17
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras/rust-server-codegen/src/sigv4_event_stream.rs

@@ -1,0 +195,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /// Wrapper for event stream messages that may be signed
 #[derive(Debug)]
 pub struct SignedEvent<T> {
     /// The actual event message
     pub message: T,
     /// Signature information if the message was signed
     pub signature: ::std::option::Option<crate::sigv4_event_stream::SignatureInfo>,
--
+}
--
 /// Error wrapper for signed event stream errors
 #[derive(Debug)]
 pub enum SignedEventError<E> {
     /// Error from the underlying event stream
     Event(E),
     /// Error extracting signed message
     InvalidSignedEvent(crate::sigv4_event_stream::ExtractionError),
--
+}
--
 impl<E> From<E> for SignedEventError<E> {
     fn from(err: E) -> Self {
         SignedEventError::Event(err)
--
+    }
--
+}
--
 /// Information extracted from a signed event stream message
 #[non_exhaustive]
 #[derive(Debug, Clone)]
 pub struct SignatureInfo {
     /// The chunk signature bytes from the `:chunk-signature` header
     pub chunk_signature: Vec<u8>,
     /// The timestamp from the `:date` header
     pub timestamp: ::std::time::SystemTime,
--
+}
--
 /// Error type for signed message extraction operations
 #[non_exhaustive]
 #[derive(Debug)]
 pub enum ExtractionError {
     /// The payload could not be decoded as a valid message
     #[non_exhaustive]
     InvalidPayload {
         error: ::aws_smithy_eventstream::error::Error,
     },
     /// The timestamp header is missing or has an invalid format
     #[non_exhaustive]
     InvalidTimestamp,
--
+}
--
 /// Unmarshaller wrapper that handles SigV4 signed event stream messages
 #[derive(Debug)]
 pub struct SigV4Unmarshaller<T> {
     inner: T,
--
+}
--
 impl<T> SigV4Unmarshaller<T> {
     pub fn new(inner: T) -> Self {
         Self { inner }
--
+    }
--
+}
--
 impl<T> ::aws_smithy_eventstream::frame::UnmarshallMessage for SigV4Unmarshaller<T>
 where
     T: ::aws_smithy_eventstream::frame::UnmarshallMessage,
--
+{
     type Output = crate::sigv4_event_stream::SignedEvent<T::Output>;
     type Error = crate::sigv4_event_stream::SignedEventError<T::Error>;
--
     fn unmarshall(
         &self,
         message: &::aws_smithy_types::event_stream::Message,
     ) -> ::std::result::Result<
         ::aws_smithy_eventstream::frame::UnmarshalledMessage<Self::Output, Self::Error>,
         ::aws_smithy_eventstream::error::Error,
     > {
         // First, try to extract the signed message
         match crate::sigv4_event_stream::extract_signed_message(message) {
             Ok(MaybeSignedMessage::Signed {
                 message: inner_message,
                 signature,
             }) => {
                 // Process the inner message with the base unmarshaller
                 match self.inner.unmarshall(&inner_message) {
                     Ok(unmarshalled) => match unmarshalled {
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(event) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(
                                 crate::sigv4_event_stream::SignedEvent {
                                     message: event,
                                     signature: Some(signature),
                                 },
                             ))
--
+                        }
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(err) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                                 crate::sigv4_event_stream::SignedEventError::Event(err),
                             ))
--
+                        }
                     },
                     Err(err) => Err(err),
--
+                }
--
+            }
             Ok(MaybeSignedMessage::Unsigned) => {
                 // Process unsigned message directly
                 match self.inner.unmarshall(message) {
                     Ok(unmarshalled) => match unmarshalled {
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(event) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(
                                 crate::sigv4_event_stream::SignedEvent {
                                     message: event,
                                     signature: None,
                                 },
                             ))
--
+                        }
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(err) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                                 crate::sigv4_event_stream::SignedEventError::Event(err),
                             ))
--
+                        }
                     },
                     Err(err) => Err(err),
--
+                }
--
+            }
             Err(extraction_err) => Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                 crate::sigv4_event_stream::SignedEventError::InvalidSignedEvent(extraction_err),
             )),
--
+        }
--
+    }
--
+}
--
 /// Result of extracting a potentially signed message
 #[derive(Debug)]
 pub enum MaybeSignedMessage {
     /// Message was signed and has been extracted
     Signed {
         /// The inner message that was signed
         message: ::aws_smithy_types::event_stream::Message,
         /// Signature information from the outer message
         signature: crate::sigv4_event_stream::SignatureInfo,
     },
     /// Message was not signed (no `:chunk-signature` header present)
     Unsigned,
--
+}
--
 /// Extracts the inner message from a potentially signed event stream message.
 pub fn extract_signed_message(
     message: &::aws_smithy_types::event_stream::Message,
 ) -> ::std::result::Result<MaybeSignedMessage, crate::sigv4_event_stream::ExtractionError> {
     // Check if message has chunk signature
     let mut chunk_signature = None;
     let mut timestamp = None;
--
     for header in message.headers() {
         match header.name().as_str() {
             ":chunk-signature" => {
                 if let ::aws_smithy_types::event_stream::HeaderValue::ByteArray(bytes) =
                     header.value()
--
+                {
                     chunk_signature = Some(bytes.as_ref().to_vec());
--
+                }
--
+            }
             ":date" => {
                 if let ::aws_smithy_types::event_stream::HeaderValue::Timestamp(ts) = header.value()
--
+                {
                     timestamp = Some(::std::time::SystemTime::try_from(*ts).map_err(|_err| {
                         crate::sigv4_event_stream::ExtractionError::InvalidTimestamp
                     })?);
                 } else {
                     return Err(crate::sigv4_event_stream::ExtractionError::InvalidTimestamp);
--
+                }
--
+            }
             _ => {}
--
+        }
--
+    }
--
     let Some(chunk_signature) = chunk_signature else {
         return Ok(MaybeSignedMessage::Unsigned);
     };
--
     let Some(timestamp) = timestamp else {
         return Err(crate::sigv4_event_stream::ExtractionError::InvalidTimestamp);
     };
--
     // Extract inner message
     let cursor = ::std::io::Cursor::new(message.payload());
     let inner_message = ::aws_smithy_eventstream::frame::read_message_from(cursor)
         .map_err(|err| crate::sigv4_event_stream::ExtractionError::InvalidPayload { error: err })?;
--
     Ok(MaybeSignedMessage::Signed {
         message: inner_message,
         signature: crate::sigv4_event_stream::SignatureInfo {
             chunk_signature,
             timestamp,
         },
     })
--
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/input.rs

@@ -1,1 +166,150 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 #[allow(missing_docs)] // documentation missing in model
 #[derive(::std::fmt::Debug)]
 pub struct StreamingOperationWithOptionalDataInput {
     #[allow(missing_docs)] // documentation missing in model
     pub optional_data: ::std::option::Option<::std::string::String>,
     #[allow(missing_docs)] // documentation missing in model
     pub events: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
-12
+}
 impl StreamingOperationWithOptionalDataInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn optional_data(&self) -> ::std::option::Option<&str> {
         self.optional_data.as_deref()
-17
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn events(
         &self,
     ) -> &::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     > {
         &self.events
-26
+    }
-27
+}
 impl StreamingOperationWithOptionalDataInput {
     /// Creates a new builder-style object to manufacture [`StreamingOperationWithOptionalDataInput`](crate::input::StreamingOperationWithOptionalDataInput).
     pub fn builder() -> crate::input::streaming_operation_with_optional_data_input::Builder {
         crate::input::streaming_operation_with_optional_data_input::Builder::default()
-32
+    }
-33
+}
 impl crate::constrained::Constrained for crate::input::StreamingOperationWithOptionalDataInput {
     type Unconstrained = crate::input::streaming_operation_with_optional_data_input::Builder;
-36
+}
-37
 #[allow(missing_docs)] // documentation missing in model
 #[derive(::std::fmt::Debug)]
 pub struct StreamingOperationWithInitialResponseInput {
     #[allow(missing_docs)] // documentation missing in model
     pub events: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
-46
+}
 impl StreamingOperationWithInitialResponseInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn events(
         &self,
     ) -> &::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     > {
         &self.events
-56
+    }
-57
+}
 impl StreamingOperationWithInitialResponseInput {
     /// Creates a new builder-style object to manufacture [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput).
     pub fn builder() -> crate::input::streaming_operation_with_initial_response_input::Builder {
         crate::input::streaming_operation_with_initial_response_input::Builder::default()
-62
+    }
-63
+}
 impl crate::constrained::Constrained for crate::input::StreamingOperationWithInitialResponseInput {
     type Unconstrained = crate::input::streaming_operation_with_initial_response_input::Builder;
-66
+}
-67
 #[allow(missing_docs)] // documentation missing in model
 #[derive(::std::fmt::Debug)]
 pub struct StreamingOperationWithInitialDataInput {
     #[allow(missing_docs)] // documentation missing in model
     pub initial_data: ::std::string::String,
     #[allow(missing_docs)] // documentation missing in model
     pub events: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
-78
+}
 impl StreamingOperationWithInitialDataInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn initial_data(&self) -> &str {
         use std::ops::Deref;
         self.initial_data.deref()
-84
+    }
     #[allow(missing_docs)] // documentation missing in model
     pub fn events(
         &self,
     ) -> &::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     > {
         &self.events
-93
+    }
-94
+}
 impl StreamingOperationWithInitialDataInput {
     /// Creates a new builder-style object to manufacture [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput).
     pub fn builder() -> crate::input::streaming_operation_with_initial_data_input::Builder {
         crate::input::streaming_operation_with_initial_data_input::Builder::default()
-99
+    }
-100
+}
 impl crate::constrained::Constrained for crate::input::StreamingOperationWithInitialDataInput {
     type Unconstrained = crate::input::streaming_operation_with_initial_data_input::Builder;
-103
+}
-104
 #[allow(missing_docs)] // documentation missing in model
 #[derive(::std::fmt::Debug)]
 pub struct StreamingOperationInput {
     #[allow(missing_docs)] // documentation missing in model
     pub events: ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
-113
+}
 impl StreamingOperationInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn events(
         &self,
     ) -> &::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     > {
         &self.events
-123
+    }
-124
+}
 impl StreamingOperationInput {
     /// Creates a new builder-style object to manufacture [`StreamingOperationInput`](crate::input::StreamingOperationInput).
     pub fn builder() -> crate::input::streaming_operation_input::Builder {
         crate::input::streaming_operation_input::Builder::default()
-129
+    }
-130
+}

↧ Expand context

 impl crate::constrained::Constrained for crate::input::StreamingOperationInput {
     type Unconstrained = crate::input::streaming_operation_input::Builder;
-133
+}
-134
 #[allow(missing_docs)] // documentation missing in model
 #[derive(
     ::std::clone::Clone, ::std::cmp::Eq, ::std::cmp::PartialEq, ::std::fmt::Debug, ::std::hash::Hash,
 )]
 pub struct RecursiveUnionOperationInput {
     #[allow(missing_docs)] // documentation missing in model
     pub nested: ::std::option::Option<crate::model::RecursiveOperationInputOutputNested1>,
-142
+}
 impl RecursiveUnionOperationInput {
     #[allow(missing_docs)] // documentation missing in model
     pub fn nested(
         &self,
     ) -> ::std::option::Option<&crate::model::RecursiveOperationInputOutputNested1> {
         self.nested.as_ref()
-149
+    }
-150
+}

@@ -642,626 +747,725 @@

↥ Expand context

                 field_list: Some(vec![first_validation_exception_field]),
             };
             Self::ConstraintViolation(
                                 crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(&validation_exception)
                                     .expect("validation exceptions should never fail to serialize; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues")
-631
+                            )
-632
+        }
-633
+    }
     impl ::std::convert::From<Builder>
         for crate::constrained::MaybeConstrained<
             crate::input::StreamingOperationWithOptionalDataInput,
-637
+        >
-638
+    {
         fn from(builder: Builder) -> Self {
             Self::Unconstrained(builder)
-641
+        }
-642
+    }
     impl ::std::convert::TryFrom<Builder> for crate::input::StreamingOperationWithOptionalDataInput {
         type Error = ConstraintViolation;
-645

         fn try_from(builder: Builder) -> ::std::result::Result<Self, Self::Error> {
             builder.build()
-648
+        }
-649
+    }
     /// A builder for [`StreamingOperationWithOptionalDataInput`](crate::input::StreamingOperationWithOptionalDataInput).
     #[derive(::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) optional_data: ::std::option::Option<::std::string::String>,
         pub(crate) events: ::std::option::Option<
             ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         >,
-660
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn optional_data(
             mut self,
             input: ::std::option::Option<::std::string::String>,
         ) -> Self {
             self.optional_data = input;
             self
-669
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_optional_data(
             mut self,
             input: Option<impl ::std::convert::Into<::std::string::String>>,
         ) -> Self {
             self.optional_data = input.map(|v| v.into());
             self
-677
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub fn events(
             mut self,
             input: ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         ) -> Self {
             self.events = Some(input);
             self
-688
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_events(
             mut self,
             input: impl ::std::convert::Into<
                 ::aws_smithy_http::event_stream::Receiver<
                     crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                     crate::sigv4_event_stream::SignedEventError<
                         ::aws_smithy_http::event_stream::MessageStreamError,
                     >,
                     crate::model::Events,
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
             >,
         ) -> Self {
             self.events = Some(input.into());
             self
-701
+        }
         /// Consumes the builder and constructs a [`StreamingOperationWithOptionalDataInput`](crate::input::StreamingOperationWithOptionalDataInput).
         ///
         /// The builder fails to construct a [`StreamingOperationWithOptionalDataInput`](crate::input::StreamingOperationWithOptionalDataInput) if a [`ConstraintViolation`] occurs.
         ///

↧ Expand context

         pub fn build(
             self,
         ) -> Result<crate::input::StreamingOperationWithOptionalDataInput, ConstraintViolation>
-709
+        {
             self.build_enforcing_all_constraints()
-711
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::StreamingOperationWithOptionalDataInput, ConstraintViolation>
-715
+        {
             Ok(crate::input::StreamingOperationWithOptionalDataInput {
                 optional_data: self.optional_data,
                 events: self.events.ok_or(ConstraintViolation::MissingEvents)?,
             })
-720
+        }
-721
+    }
-722
+}
 /// See [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput).
 pub mod streaming_operation_with_initial_response_input {
-725

@@ -787,765 +876,848 @@

↥ Expand context

                 ),
                 field_list: Some(vec![first_validation_exception_field]),
             };
             Self::ConstraintViolation(
                                 crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(&validation_exception)
                                     .expect("validation exceptions should never fail to serialize; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues")
-771
+                            )
-772
+        }
-773
+    }
     impl ::std::convert::From<Builder>
         for crate::constrained::MaybeConstrained<
             crate::input::StreamingOperationWithInitialResponseInput,
-777
+        >
-778
+    {
         fn from(builder: Builder) -> Self {
             Self::Unconstrained(builder)
-781
+        }
-782
+    }
     impl ::std::convert::TryFrom<Builder> for crate::input::StreamingOperationWithInitialResponseInput {
         type Error = ConstraintViolation;

-785
         fn try_from(builder: Builder) -> ::std::result::Result<Self, Self::Error> {
             builder.build()
-788
+        }
-789
+    }
     /// A builder for [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput).
     #[derive(::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) events: ::std::option::Option<
             ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         >,
-799
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn events(
             mut self,
             input: ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         ) -> Self {
             self.events = Some(input);
             self
-811
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_events(
             mut self,
             input: impl ::std::convert::Into<
                 ::aws_smithy_http::event_stream::Receiver<
                     crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                     crate::sigv4_event_stream::SignedEventError<
                         ::aws_smithy_http::event_stream::MessageStreamError,
                     >,
                     crate::model::Events,
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
             >,
         ) -> Self {
             self.events = Some(input.into());
             self
-824
+        }
         /// Consumes the builder and constructs a [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput).
         ///
         /// The builder fails to construct a [`StreamingOperationWithInitialResponseInput`](crate::input::StreamingOperationWithInitialResponseInput) if a [`ConstraintViolation`] occurs.
         ///

↧ Expand context

         pub fn build(
             self,
         ) -> Result<crate::input::StreamingOperationWithInitialResponseInput, ConstraintViolation>
-832
+        {
             self.build_enforcing_all_constraints()
-834
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::StreamingOperationWithInitialResponseInput, ConstraintViolation>
-838
+        {
             Ok(crate::input::StreamingOperationWithInitialResponseInput {
                 events: self.events.ok_or(ConstraintViolation::MissingEvents)?,
             })
-842
+        }
-843
+    }
-844
+}
 /// See [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput).
 pub mod streaming_operation_with_initial_data_input {
-847
     #[derive(::std::cmp::PartialEq, ::std::fmt::Debug)]

@@ -923,895 +1025,991 @@

↥ Expand context

                 field_list: Some(vec![first_validation_exception_field]),
             };
             Self::ConstraintViolation(
                                 crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(&validation_exception)
                                     .expect("validation exceptions should never fail to serialize; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues")
-900
+                            )
-901
+        }
-902
+    }
     impl ::std::convert::From<Builder>
         for crate::constrained::MaybeConstrained<
             crate::input::StreamingOperationWithInitialDataInput,
-906
+        >
-907
+    {
         fn from(builder: Builder) -> Self {
             Self::Unconstrained(builder)
-910
+        }
-911
+    }
     impl ::std::convert::TryFrom<Builder> for crate::input::StreamingOperationWithInitialDataInput {
         type Error = ConstraintViolation;
-914

         fn try_from(builder: Builder) -> ::std::result::Result<Self, Self::Error> {
             builder.build()
-917
+        }
-918
+    }
     /// A builder for [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput).
     #[derive(::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) initial_data: ::std::option::Option<::std::string::String>,
         pub(crate) events: ::std::option::Option<
             ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         >,
-929
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn initial_data(mut self, input: ::std::string::String) -> Self {
             self.initial_data = Some(input);
             self
-935
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_initial_data(
             mut self,
             input: impl ::std::convert::Into<::std::string::String>,
         ) -> Self {
             self.initial_data = Some(input.into());
             self
-943
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub fn events(
             mut self,
             input: ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         ) -> Self {
             self.events = Some(input);
             self
-954
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_events(
             mut self,
             input: impl ::std::convert::Into<
                 ::aws_smithy_http::event_stream::Receiver<
                     crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                     crate::sigv4_event_stream::SignedEventError<
                         ::aws_smithy_http::event_stream::MessageStreamError,
                     >,
                     crate::model::Events,
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
             >,
         ) -> Self {
             self.events = Some(input.into());
             self
-967
+        }
         /// Consumes the builder and constructs a [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput).
         ///
         /// The builder fails to construct a [`StreamingOperationWithInitialDataInput`](crate::input::StreamingOperationWithInitialDataInput) if a [`ConstraintViolation`] occurs.
         ///

↧ Expand context

         /// If the builder fails, it will return the _first_ encountered [`ConstraintViolation`].
         pub fn build(
             self,
         ) -> Result<crate::input::StreamingOperationWithInitialDataInput, ConstraintViolation>
-976
+        {
             self.build_enforcing_all_constraints()
-978
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::StreamingOperationWithInitialDataInput, ConstraintViolation>
-982
+        {
             Ok(crate::input::StreamingOperationWithInitialDataInput {
                 initial_data: self
                     .initial_data
                     .ok_or(ConstraintViolation::MissingInitialData)?,
                 events: self.events.ok_or(ConstraintViolation::MissingEvents)?,
             })
-989
+        }
-990
+    }
-991
+}

@@ -1066,1032 +1155,1115 @@

↥ Expand context

                     "1 validation error detected. {}",
                     &first_validation_exception_field.message
                 ),
                 field_list: Some(vec![first_validation_exception_field]),
             };
             Self::ConstraintViolation(
                                 crate::protocol_serde::shape_validation_exception::ser_validation_exception_error(&validation_exception)
                                     .expect("validation exceptions should never fail to serialize; please file a bug report under https://github.com/smithy-lang/smithy-rs/issues")
-1040
+                            )
-1041
+        }
-1042
+    }
     impl ::std::convert::From<Builder>
         for crate::constrained::MaybeConstrained<crate::input::StreamingOperationInput>
-1045
+    {
         fn from(builder: Builder) -> Self {
             Self::Unconstrained(builder)
-1048
+        }
-1049
+    }
     impl ::std::convert::TryFrom<Builder> for crate::input::StreamingOperationInput {
         type Error = ConstraintViolation;

-1052
         fn try_from(builder: Builder) -> ::std::result::Result<Self, Self::Error> {
             builder.build()
-1055
+        }
-1056
+    }
     /// A builder for [`StreamingOperationInput`](crate::input::StreamingOperationInput).
     #[derive(::std::default::Default, ::std::fmt::Debug)]
     pub struct Builder {
         pub(crate) events: ::std::option::Option<
             ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         >,
-1066
+    }
     impl Builder {
         #[allow(missing_docs)] // documentation missing in model
         pub fn events(
             mut self,
             input: ::aws_smithy_http::event_stream::Receiver<
                 crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                 crate::sigv4_event_stream::SignedEventError<
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
                 crate::model::Events,
                 ::aws_smithy_http::event_stream::MessageStreamError,
             >,
         ) -> Self {
             self.events = Some(input);
             self
-1078
+        }
         #[allow(missing_docs)] // documentation missing in model
         pub(crate) fn set_events(
             mut self,
             input: impl ::std::convert::Into<
                 ::aws_smithy_http::event_stream::Receiver<
                     crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
                     crate::sigv4_event_stream::SignedEventError<
                         ::aws_smithy_http::event_stream::MessageStreamError,
                     >,
                     crate::model::Events,
                     ::aws_smithy_http::event_stream::MessageStreamError,
                 >,
             >,
         ) -> Self {
             self.events = Some(input.into());
             self
-1091
+        }
         /// Consumes the builder and constructs a [`StreamingOperationInput`](crate::input::StreamingOperationInput).
         ///
         /// The builder fails to construct a [`StreamingOperationInput`](crate::input::StreamingOperationInput) if a [`ConstraintViolation`] occurs.
         ///

↧ Expand context

         pub fn build(self) -> Result<crate::input::StreamingOperationInput, ConstraintViolation> {
             self.build_enforcing_all_constraints()
-1098
+        }
         fn build_enforcing_all_constraints(
             self,
         ) -> Result<crate::input::StreamingOperationInput, ConstraintViolation> {
             Ok(crate::input::StreamingOperationInput {
                 events: self.events.ok_or(ConstraintViolation::MissingEvents)?,
             })
-1105
+        }
-1106
+    }
-1107
+}
 /// See [`RecursiveUnionOperationInput`](crate::input::RecursiveUnionOperationInput).
 pub mod recursive_union_operation_input {
-1110
     impl ::std::convert::From<Builder> for crate::input::RecursiveUnionOperationInput {
         fn from(builder: Builder) -> Self {
             builder.build()
-1114
+        }
-1115
+    }

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/lib.rs

@@ -265,265 +299,297 @@

↥ Expand context

 pub mod input;
-266
 /// Data structures used by operation inputs/outputs. Documentation on these types is copied from the model.
 pub mod model;
-269
 /// All operations that this crate can perform.
 pub mod operation;
-272
 /// A collection of types representing each operation defined in the service closure.
 ///
 /// The [plugin system](::aws_smithy_http_server::plugin) makes use of these
 /// [zero-sized types](https://doc.rust-lang.org/nomicon/exotic-sizes.html#zero-sized-types-zsts) (ZSTs) to
 /// parameterize [`Plugin`](::aws_smithy_http_server::plugin::Plugin) implementations. Their traits, such as
 /// [`OperationShape`](::aws_smithy_http_server::operation::OperationShape), can be used to provide
 /// operation specific information to the [`Layer`](::tower::Layer) being applied.
 pub mod operation_shape;
-281
 /// Output structures for operations. Documentation on these types is copied from the model.
 pub mod output;
-284

 mod service;
-286
 /// Data primitives referenced by other data types.
 pub mod types;
-289
 /// Unconstrained types for constrained shapes.
 mod unconstrained;
-292
 mod mimes;
-294
 mod sigv4_event_stream;
--
 mod event_stream_serde;
-296
 pub(crate) mod protocol_serde;

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/protocol_serde/shape_streaming_operation_input.rs

@@ -1,1 +20,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
-17
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_initial_data_input.rs

@@ -1,1 +20,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
-17
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_initial_response_input.rs

@@ -1,1 +20,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
-17
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/protocol_serde/shape_streaming_operation_with_optional_data_input.rs

@@ -1,1 +20,17 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 pub fn de_events_payload(
     body: &mut ::aws_smithy_types::body::SdkBody,
 ) -> std::result::Result<
     ::aws_smithy_http::event_stream::Receiver<
         crate::sigv4_event_stream::SignedEvent<crate::model::Events>,
         crate::sigv4_event_stream::SignedEventError<
             ::aws_smithy_http::event_stream::MessageStreamError,
         >,
         crate::model::Events,
         ::aws_smithy_http::event_stream::MessageStreamError,
     >,
     ::aws_smithy_cbor::decode::DeserializeError,
 > {
     let unmarshaller = crate::event_stream_serde::EventsUnmarshaller::new();
     let unmarshaller = crate::sigv4_event_stream::SigV4Unmarshaller::new(unmarshaller);
     let body = std::mem::replace(body, ::aws_smithy_types::body::SdkBody::taken());
     Ok(::aws_smithy_http::event_stream::Receiver::new(
         unmarshaller,
         body,
     ))
-17
+}

tmp-codegen-diff/codegen-server-test/rpcv2Cbor_extras_no_initial_response/rust-server-codegen/src/sigv4_event_stream.rs

@@ -1,0 +195,0 @@

 // Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 /// Wrapper for event stream messages that may be signed
 #[derive(Debug)]
 pub struct SignedEvent<T> {
     /// The actual event message
     pub message: T,
     /// Signature information if the message was signed
     pub signature: ::std::option::Option<crate::sigv4_event_stream::SignatureInfo>,
--
+}
--
 /// Error wrapper for signed event stream errors
 #[derive(Debug)]
 pub enum SignedEventError<E> {
     /// Error from the underlying event stream
     Event(E),
     /// Error extracting signed message
     InvalidSignedEvent(crate::sigv4_event_stream::ExtractionError),
--
+}
--
 impl<E> From<E> for SignedEventError<E> {
     fn from(err: E) -> Self {
         SignedEventError::Event(err)
--
+    }
--
+}
--
 /// Information extracted from a signed event stream message
 #[non_exhaustive]
 #[derive(Debug, Clone)]
 pub struct SignatureInfo {
     /// The chunk signature bytes from the `:chunk-signature` header
     pub chunk_signature: Vec<u8>,
     /// The timestamp from the `:date` header
     pub timestamp: ::std::time::SystemTime,
--
+}
--
 /// Error type for signed message extraction operations
 #[non_exhaustive]
 #[derive(Debug)]
 pub enum ExtractionError {
     /// The payload could not be decoded as a valid message
     #[non_exhaustive]
     InvalidPayload {
         error: ::aws_smithy_eventstream::error::Error,
     },
     /// The timestamp header is missing or has an invalid format
     #[non_exhaustive]
     InvalidTimestamp,
--
+}
--
 /// Unmarshaller wrapper that handles SigV4 signed event stream messages
 #[derive(Debug)]
 pub struct SigV4Unmarshaller<T> {
     inner: T,
--
+}
--
 impl<T> SigV4Unmarshaller<T> {
     pub fn new(inner: T) -> Self {
         Self { inner }
--
+    }
--
+}
--
 impl<T> ::aws_smithy_eventstream::frame::UnmarshallMessage for SigV4Unmarshaller<T>
 where
     T: ::aws_smithy_eventstream::frame::UnmarshallMessage,
--
+{
     type Output = crate::sigv4_event_stream::SignedEvent<T::Output>;
     type Error = crate::sigv4_event_stream::SignedEventError<T::Error>;
--
     fn unmarshall(
         &self,
         message: &::aws_smithy_types::event_stream::Message,
     ) -> ::std::result::Result<
         ::aws_smithy_eventstream::frame::UnmarshalledMessage<Self::Output, Self::Error>,
         ::aws_smithy_eventstream::error::Error,
     > {
         // First, try to extract the signed message
         match crate::sigv4_event_stream::extract_signed_message(message) {
             Ok(MaybeSignedMessage::Signed {
                 message: inner_message,
                 signature,
             }) => {
                 // Process the inner message with the base unmarshaller
                 match self.inner.unmarshall(&inner_message) {
                     Ok(unmarshalled) => match unmarshalled {
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(event) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(
                                 crate::sigv4_event_stream::SignedEvent {
                                     message: event,
                                     signature: Some(signature),
                                 },
                             ))
--
+                        }
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(err) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                                 crate::sigv4_event_stream::SignedEventError::Event(err),
                             ))
--
+                        }
                     },
                     Err(err) => Err(err),
--
+                }
--
+            }
             Ok(MaybeSignedMessage::Unsigned) => {
                 // Process unsigned message directly
                 match self.inner.unmarshall(message) {
                     Ok(unmarshalled) => match unmarshalled {
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(event) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Event(
                                 crate::sigv4_event_stream::SignedEvent {
                                     message: event,
                                     signature: None,
                                 },
                             ))
--
+                        }
                         ::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(err) => {
                             Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                                 crate::sigv4_event_stream::SignedEventError::Event(err),
                             ))
--
+                        }
                     },
                     Err(err) => Err(err),
--
+                }
--
+            }
             Err(extraction_err) => Ok(::aws_smithy_eventstream::frame::UnmarshalledMessage::Error(
                 crate::sigv4_event_stream::SignedEventError::InvalidSignedEvent(extraction_err),
             )),
--
+        }
--
+    }
--
+}
--
 /// Result of extracting a potentially signed message
 #[derive(Debug)]
 pub enum MaybeSignedMessage {
     /// Message was signed and has been extracted
     Signed {
         /// The inner message that was signed
         message: ::aws_smithy_types::event_stream::Message,
         /// Signature information from the outer message
         signature: crate::sigv4_event_stream::SignatureInfo,
     },
     /// Message was not signed (no `:chunk-signature` header present)
     Unsigned,
--
+}
--
 /// Extracts the inner message from a potentially signed event stream message.
 pub fn extract_signed_message(
     message: &::aws_smithy_types::event_stream::Message,
 ) -> ::std::result::Result<MaybeSignedMessage, crate::sigv4_event_stream::ExtractionError> {
     // Check if message has chunk signature
     let mut chunk_signature = None;
     let mut timestamp = None;
--
     for header in message.headers() {
         match header.name().as_str() {
             ":chunk-signature" => {
                 if let ::aws_smithy_types::event_stream::HeaderValue::ByteArray(bytes) =
                     header.value()
--
+                {
                     chunk_signature = Some(bytes.as_ref().to_vec());
--
+                }
--
+            }
             ":date" => {
                 if let ::aws_smithy_types::event_stream::HeaderValue::Timestamp(ts) = header.value()
--
+                {
                     timestamp = Some(::std::time::SystemTime::try_from(*ts).map_err(|_err| {
                         crate::sigv4_event_stream::ExtractionError::InvalidTimestamp
                     })?);
                 } else {
                     return Err(crate::sigv4_event_stream::ExtractionError::InvalidTimestamp);
--
+                }
--
+            }
             _ => {}
--
+        }
--
+    }
--
     let Some(chunk_signature) = chunk_signature else {
         return Ok(MaybeSignedMessage::Unsigned);
     };
--
     let Some(timestamp) = timestamp else {
         return Err(crate::sigv4_event_stream::ExtractionError::InvalidTimestamp);
     };
--
     // Extract inner message
     let cursor = ::std::io::Cursor::new(message.payload());
     let inner_message = ::aws_smithy_eventstream::frame::read_message_from(cursor)
         .map_err(|err| crate::sigv4_event_stream::ExtractionError::InvalidPayload { error: err })?;
--
     Ok(MaybeSignedMessage::Signed {
         message: inner_message,
         signature: crate::sigv4_event_stream::SignatureInfo {
             chunk_signature,
             timestamp,
         },
     })
--
+}

Pages: 1