Minor reformatting

Signed-off-by: Jim Crossley <jim@crossleys.org>
This commit is contained in:
Jim Crossley 2021-07-14 17:32:43 -04:00
parent ac35535283
commit 13a1af1302
4 changed files with 16 additions and 29 deletions

View File

@ -1,6 +1,6 @@
macro_rules! str_to_header_value {
($header_value:expr) => {
HeaderValue::from_str($header_value.to_string().as_str()).map_err(|e| {
HeaderValue::from_str(&$header_value.to_string()).map_err(|e| {
crate::message::Error::Other {
source: Box::new(e),
}

View File

@ -45,36 +45,25 @@ impl Default for MessageRecord {
}
impl BinarySerializer<MessageRecord> for MessageRecord {
fn set_spec_version(mut self, spec_version: SpecVersion) -> Result<Self> {
self.headers = self.headers.add(SPEC_VERSION_HEADER, spec_version.as_str());
fn set_spec_version(mut self, sv: SpecVersion) -> Result<Self> {
self.headers = self.headers.add(SPEC_VERSION_HEADER, &sv.to_string());
Ok(self)
}
fn set_attribute(mut self, name: &str, value: MessageAttributeValue) -> Result<Self> {
self.headers = self.headers.add(
&attribute_header(PREFIX, name),
// TODO: return Option or Result
// .ok_or(crate::message::Error::UnknownAttribute {
// name: String::from(name),
// })?
&value.to_string(),
);
let key = &attribute_header(PREFIX, name);
self.headers = self.headers.add(key, &value.to_string());
Ok(self)
}
fn set_extension(mut self, name: &str, value: MessageAttributeValue) -> Result<Self> {
self.headers = self
.headers
.add(&attribute_header(PREFIX, name), &value.to_string());
let key = &attribute_header(PREFIX, name);
self.headers = self.headers.add(key, &value.to_string());
Ok(self)
}
fn end_with_data(mut self, bytes: Vec<u8>) -> Result<MessageRecord> {
self.payload = Some(bytes);
Ok(self)
}

View File

@ -21,22 +21,20 @@ impl RequestSerializer {
}
impl BinarySerializer<RequestBuilder> for RequestSerializer {
fn set_spec_version(mut self, spec_version: SpecVersion) -> Result<Self> {
self.req = self.req.header(SPEC_VERSION_HEADER, spec_version.as_str());
fn set_spec_version(mut self, spec_ver: SpecVersion) -> Result<Self> {
self.req = self.req.header(SPEC_VERSION_HEADER, spec_ver.to_string());
Ok(self)
}
fn set_attribute(mut self, name: &str, value: MessageAttributeValue) -> Result<Self> {
self.req = self
.req
.header(&attribute_header(PREFIX, name), value.to_string());
let key = &attribute_header(PREFIX, name);
self.req = self.req.header(key, value.to_string());
Ok(self)
}
fn set_extension(mut self, name: &str, value: MessageAttributeValue) -> Result<Self> {
self.req = self
.req
.header(&attribute_header(PREFIX, name), value.to_string());
let key = &attribute_header(PREFIX, name);
self.req = self.req.header(key, value.to_string());
Ok(self)
}

View File

@ -32,7 +32,7 @@ impl BinarySerializer<Response> for ResponseSerializer {
fn set_spec_version(mut self, spec_version: SpecVersion) -> Result<Self> {
self.builder = self.builder.header(
SPEC_VERSION_HEADER,
HeaderValue::try_from(spec_version.to_string().as_str()).map_err(|e| {
HeaderValue::try_from(spec_version.to_string()).map_err(|e| {
crate::message::Error::Other {
source: Box::new(e),
}
@ -44,7 +44,7 @@ impl BinarySerializer<Response> for ResponseSerializer {
fn set_attribute(mut self, name: &str, value: MessageAttributeValue) -> Result<Self> {
self.builder = self.builder.header(
&attribute_header(PREFIX, name),
HeaderValue::try_from(value.to_string().as_str()).map_err(|e| {
HeaderValue::try_from(&value.to_string()).map_err(|e| {
crate::message::Error::Other {
source: Box::new(e),
}
@ -56,7 +56,7 @@ impl BinarySerializer<Response> for ResponseSerializer {
fn set_extension(mut self, name: &str, value: MessageAttributeValue) -> Result<Self> {
self.builder = self.builder.header(
&attribute_header(PREFIX, name),
HeaderValue::try_from(value.to_string().as_str()).map_err(|e| {
HeaderValue::try_from(&value.to_string()).map_err(|e| {
crate::message::Error::Other {
source: Box::new(e),
}