Useless Option<HeaderMap>

nats-io · Jul 22, 2023 · 8809b13 · 8809b13
1 parent 0534719
commit 8809b13
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 61 deletions.
diff --git a/async-nats/src/client.rs b/async-nats/src/client.rs
@@ -149,15 +149,8 @@ impl Client {
     /// # }
     /// ```
     pub async fn publish(&self, subject: String, payload: Bytes) -> Result<(), PublishError> {
-        self.sender
-            .send(Command::Publish {
-                subject,
-                payload,
-                respond: None,
-                headers: None,
-            })
-            .await?;
-        Ok(())
+        self.publish_with_headers(subject, HeaderMap::new(), payload)
+            .await
     }
 
     /// Publish a [Message] with headers to a given subject.
@@ -190,7 +183,7 @@ impl Client {
                 subject,
                 payload,
                 respond: None,
-                headers: Some(headers),
+                headers,
             })
             .await?;
         Ok(())
@@ -222,15 +215,8 @@ impl Client {
         reply: String,
         payload: Bytes,
     ) -> Result<(), PublishError> {
-        self.sender
-            .send(Command::Publish {
-                subject,
-                payload,
-                respond: Some(reply),
-                headers: None,
-            })
-            .await?;
-        Ok(())
+        self.publish_with_reply_and_headers(subject, reply, HeaderMap::new(), payload)
+            .await
     }
 
     /// Publish a [Message] to a given subject with headers and specified response subject
@@ -268,7 +254,7 @@ impl Client {
                 subject,
                 payload,
                 respond: Some(reply),
-                headers: Some(headers),
+                headers,
             })
             .await?;
         Ok(())

diff --git a/async-nats/src/connection.rs b/async-nats/src/connection.rs
@@ -359,13 +359,10 @@ impl Connection {
                 respond,
                 headers,
             } => {
-                match headers.as_ref() {
-                    Some(headers) if !headers.is_empty() => {
-                        self.stream.write_all(b"HPUB ").await?;
-                    }
-                    _ => {
-                        self.stream.write_all(b"PUB ").await?;
-                    }
+                if !headers.is_empty() {
+                    self.stream.write_all(b"HPUB ").await?;
+                } else {
+                    self.stream.write_all(b"PUB ").await?;
                 }
 
                 self.stream.write_all(subject.as_bytes()).await?;
@@ -376,36 +373,33 @@ impl Connection {
                     self.stream.write_all(b" ").await?;
                 }
 
-                match headers {
-                    Some(headers) if !headers.is_empty() => {
-                        let headers = headers.to_bytes();
+                if !headers.is_empty() {
+                    let headers = headers.to_bytes();
 
-                        let mut header_len_buf = itoa::Buffer::new();
-                        self.stream
-                            .write_all(header_len_buf.format(headers.len()).as_bytes())
-                            .await?;
+                    let mut header_len_buf = itoa::Buffer::new();
+                    self.stream
+                        .write_all(header_len_buf.format(headers.len()).as_bytes())
+                        .await?;
 
-                        self.stream.write_all(b" ").await?;
+                    self.stream.write_all(b" ").await?;
 
-                        let mut total_len_buf = itoa::Buffer::new();
-                        self.stream
-                            .write_all(
-                                total_len_buf
-                                    .format(headers.len() + payload.len())
-                                    .as_bytes(),
-                            )
-                            .await?;
+                    let mut total_len_buf = itoa::Buffer::new();
+                    self.stream
+                        .write_all(
+                            total_len_buf
+                                .format(headers.len() + payload.len())
+                                .as_bytes(),
+                        )
+                        .await?;
 
-                        self.stream.write_all(b"\r\n").await?;
-                        self.stream.write_all(&headers).await?;
-                    }
-                    _ => {
-                        let mut len_buf = itoa::Buffer::new();
-                        self.stream
-                            .write_all(len_buf.format(payload.len()).as_bytes())
-                            .await?;
-                        self.stream.write_all(b"\r\n").await?;
-                    }
+                    self.stream.write_all(b"\r\n").await?;
+                    self.stream.write_all(&headers).await?;
+                } else {
+                    let mut len_buf = itoa::Buffer::new();
+                    self.stream
+                        .write_all(len_buf.format(payload.len()).as_bytes())
+                        .await?;
+                    self.stream.write_all(b"\r\n").await?;
                 }
 
                 self.stream.write_all(payload).await?;
@@ -780,7 +774,7 @@ mod write_op {
                 subject: "FOO.BAR".into(),
                 payload: "Hello World".into(),
                 respond: None,
-                headers: None,
+                headers: HeaderMap::new(),
             })
             .await
             .unwrap();
@@ -797,7 +791,7 @@ mod write_op {
                 subject: "FOO.BAR".into(),
                 payload: "Hello World".into(),
                 respond: Some("INBOX.67".into()),
-                headers: None,
+                headers: HeaderMap::new(),
             })
             .await
             .unwrap();
@@ -813,10 +807,7 @@ mod write_op {
                 subject: "FOO.BAR".into(),
                 payload: "Hello World".into(),
                 respond: Some("INBOX.67".into()),
-                headers: Some(HeaderMap::from_iter([(
-                    "Header".parse().unwrap(),
-                    "X".parse().unwrap(),
-                )])),
+                headers: HeaderMap::from_iter([("Header".parse().unwrap(), "X".parse().unwrap())]),
             })
             .await
             .unwrap();

diff --git a/async-nats/src/lib.rs b/async-nats/src/lib.rs
@@ -264,7 +264,7 @@ pub(crate) enum Command {
         subject: String,
         payload: Bytes,
         respond: Option<String>,
-        headers: Option<HeaderMap>,
+        headers: HeaderMap,
     },
     Subscribe {
         sid: u64,
@@ -289,7 +289,7 @@ pub(crate) enum ClientOp {
         subject: String,
         payload: Bytes,
         respond: Option<String>,
-        headers: Option<HeaderMap>,
+        headers: HeaderMap,
     },
     Subscribe {
         sid: u64,