fix: simplify Option convert

Author: jjeffcaii

rsocket-transport-tcp/src/connection/tcp.rs

@@ -34,11 +34,10 @@ impl Writer for InnerWriter {
 #[async_trait]
 impl Reader for InnerReader {
     async fn read(&mut self) -> Option<Result<Frame>> {
-        match self.stream.next().await {
-            Some(Ok(frame)) => Some(Ok(frame)),
-            Some(Err(e)) => Some(Err(RSocketError::IO(e).into())),
-            None => None,
-        }
+        self.stream
+            .next()
+            .await
+            .map(|next| next.map_err(|e| RSocketError::IO(e).into()))
     }
 }
 

rsocket-transport-tcp/src/connection/uds.rs

@@ -49,11 +49,10 @@ impl Writer for InnerWriter {
 #[async_trait]
 impl Reader for InnerReader {
     async fn read(&mut self) -> Option<Result<Frame>> {
-        match self.stream.next().await {
-            Some(Ok(frame)) => Some(Ok(frame)),
-            Some(Err(e)) => Some(Err(RSocketError::IO(e).into())),
-            None => None,
-        }
+        self.stream
+            .next()
+            .await
+            .map(|it| it.map_err(|e| RSocketError::IO(e).into()))
     }
 }
 

rsocket-transport-wasm/src/connection.rs

@@ -37,10 +37,7 @@ impl Writer for InnerWriter {
 #[async_trait]
 impl Reader for InnerReader {
     async fn read(&mut self) -> Option<Result<Frame>> {
-        match self.rx.next().await {
-            Some(frame) => Some(Ok(frame)),
-            None => None,
-        }
+        self.rx.next().await.map(|frame| Ok(frame))
     }
 }
 

rsocket-transport-wasm/src/misc.rs

@@ -98,10 +98,7 @@ fn to_vec(input: JsValue) -> Option<Vec<u8>> {
     if input.is_null() || input.is_undefined() {
         None
     } else if input.is_string() {
-        match input.as_string() {
-            Some(s) => Some(s.into_bytes()),
-            None => None,
-        }
+        input.as_string().map(|s| s.into_bytes())
     } else {
         Some(Uint8Array::from(input).to_vec())
     }

rsocket/src/core/client.rs

@@ -120,10 +120,7 @@ where
         let mut socket = DuplexSocket::new(1, snd_tx, splitter).await;
 
         let mut cloned_socket = socket.clone();
-        let acceptor: Option<Acceptor> = match self.responder {
-            Some(it) => Some(Acceptor::Simple(Arc::new(it))),
-            None => None,
-        };
+        let acceptor: Option<Acceptor> = self.responder.map(|it| Acceptor::Simple(Arc::new(it)));
 
         let conn = tp.connect().await?;
         let (mut sink, mut stream) = conn.split();

rsocket/src/core/server.rs

@@ -65,11 +65,7 @@ where
 
     pub async fn serve(mut self) -> Result<()> {
         let mut server_transport = self.transport.take().expect("missing transport");
-
-        let acceptor = match self.on_setup {
-            Some(v) => Some(Acceptor::Generate(Arc::new(v))),
-            None => None,
-        };
+        let acceptor = self.on_setup.map(|v| Acceptor::Generate(Arc::new(v)));
 
         let mtu = self.mtu;
 

rsocket/src/frame/error.rs

@@ -70,10 +70,7 @@ impl Error {
     }
 
     pub fn get_data(&self) -> Option<&Bytes> {
-        match &self.data {
-            Some(b) => Some(b),
-            None => None,
-        }
+        self.data.as_ref()
     }
 
     pub fn get_code(&self) -> u32 {

rsocket/src/frame/keepalive.rs

@@ -68,10 +68,7 @@ impl Keepalive {
     }
 
     pub fn get_data(&self) -> Option<&Bytes> {
-        match &self.data {
-            Some(b) => Some(b),
-            None => None,
-        }
+        self.data.as_ref()
     }
 
     pub fn split(self) -> (Option<Bytes>, Option<Bytes>) {

rsocket/src/frame/lease.rs

@@ -78,10 +78,7 @@ impl Lease {
     }
 
     pub fn get_metadata(&self) -> Option<&Bytes> {
-        match &self.metadata {
-            Some(b) => Some(b),
-            None => None,
-        }
+        self.metadata.as_ref()
     }
 
     pub fn get_ttl(&self) -> u32 {

rsocket/src/frame/metadata_push.rs

@@ -44,10 +44,7 @@ impl MetadataPush {
     }
 
     pub fn get_metadata(&self) -> Option<&Bytes> {
-        match &self.metadata {
-            Some(b) => Some(b),
-            None => None,
-        }
+        self.metadata.as_ref()
     }
 
     pub fn split(self) -> (Option<Bytes>, Option<Bytes>) {