Address clippy warnings

Signed-off-by: Jim Crossley <jim@crossleys.org>

src/binding/actix/server_request.rs

@@ -84,7 +84,7 @@ mod tests {
     use serde_json::json;
 
     async fn to_event(req: &HttpRequest, mut payload: Payload) -> Event {
-        web::Payload::from_request(&req, &mut payload)
+        web::Payload::from_request(req, &mut payload)
             .then(|p| req.to_event(p.unwrap()))
             .await
             .unwrap()
@@ -120,7 +120,7 @@ mod tests {
             .insert_header(("ce-int_ex", "10"))
             .insert_header(("ce-bool_ex", "true"))
             .insert_header(("content-type", "application/json"))
-            .set_json(&fixtures::json_data())
+            .set_json(fixtures::json_data())
             .to_http_parts();
 
         assert_eq!(expected, to_event(&req, payload).await);

src/binding/mod.rs

@@ -67,7 +67,7 @@ macro_rules! header_value_to_str {
     ($header_value:expr) => {
         $header_value
             .to_str()
-            .map_err(|e| crate::message::Error::Other {
+            .map_err(|e| $crate::message::Error::Other {
                 source: Box::new(e),
             })
     };

src/binding/nats/deserializer.rs

@@ -50,7 +50,7 @@ mod tests {
         let nats_message = nats::Message::new(
             "not_relevant",
             None,
-            json!(expected.clone()).to_string().as_bytes().to_vec(),
+            json!(expected).to_string().as_bytes(),
             None,
         );
 
@@ -66,7 +66,7 @@ mod tests {
         let nats_message = nats::Message::new(
             "not_relevant",
             None,
-            json!(expected.clone()).to_string().as_bytes().to_vec(),
+            json!(expected).to_string().as_bytes(),
             None,
         );
 

src/binding/nats/serializer.rs

@@ -12,7 +12,7 @@ pub struct NatsCloudEvent {
 
 impl AsRef<[u8]> for NatsCloudEvent {
     fn as_ref(&self) -> &[u8] {
-        &self.payload.as_ref()
+        self.payload.as_ref()
     }
 }
 

src/binding/poem/extractor.rs

@@ -76,7 +76,7 @@ mod tests {
             .header("ce-string_ex", "val")
             .header("ce-int_ex", "10")
             .header("ce-bool_ex", "true")
-            .header("ce-time", &fixtures::time().to_rfc3339())
+            .header("ce-time", fixtures::time().to_rfc3339())
             .body(fixtures::json_data_binary());
         let (req, mut body) = req.split();
         let result = Event::from_request(&req, &mut body).await.unwrap();

src/binding/rdkafka/kafka_consumer_record.rs

@@ -94,7 +94,7 @@ impl BinaryDeserializer for ConsumerRecordDeserializer {
             }
         }
 
-        if self.payload != None {
+        if self.payload.is_some() {
             visitor.end_with_data(self.payload.unwrap())
         } else {
             visitor.end()
@@ -116,8 +116,7 @@ impl MessageDeserializer for ConsumerRecordDeserializer {
         match (
             self.headers
                 .get("content-type")
-                .map(|s| String::from_utf8(s.to_vec()).ok())
-                .flatten()
+                .and_then(|s| String::from_utf8(s.to_vec()).ok())
                 .map(|s| s.starts_with(CLOUDEVENTS_JSON_HEADER))
                 .unwrap_or(false),
             self.headers.get(SPEC_VERSION_HEADER),

src/event/attributes.rs

@@ -259,8 +259,7 @@ pub(crate) fn default_hostname() -> Url {
             "http://{}",
             hostname::get()
                 .ok()
-                .map(|s| s.into_string().ok())
-                .flatten()
+                .and_then(|s| s.into_string().ok())
                 .unwrap_or_else(|| "localhost".to_string())
         )
         .as_ref(),

src/event/format.rs

@@ -58,7 +58,7 @@ pub fn parse_data_string<E: serde::de::Error>(v: Value) -> Result<String, E> {
 
 pub fn parse_data_base64<E: serde::de::Error>(v: Value) -> Result<Vec<u8>, E> {
     parse_field!(v, String, E).and_then(|s| {
-        base64::decode(&s).map_err(|e| E::custom(format_args!("decode error `{}`", e)))
+        base64::decode(s).map_err(|e| E::custom(format_args!("decode error `{}`", e)))
     })
 }
 

src/test/fixtures/v03.rs

@@ -120,7 +120,7 @@ pub fn full_json_base64_data_json() -> Value {
         "datacontenttype": json_datacontenttype(),
         "schemaurl": dataschema(),
         "datacontentencoding": "base64",
-        "data": base64::encode(&json_data_binary())
+        "data": base64::encode(json_data_binary())
     })
 }
 

src/test/fixtures/v10.rs

@@ -166,7 +166,7 @@ pub fn full_json_base64_data_json() -> Value {
         int_ext_name: int_ext_value,
         "datacontenttype": json_datacontenttype(),
         "dataschema": dataschema(),
-        "data_base64": base64::encode(&json_data_binary())
+        "data_base64": base64::encode(json_data_binary())
     })
 }