rm unwraps

Author: cowlicks

src/framing.rs

@@ -331,7 +331,7 @@ pub(crate) mod test {
         // NB this sluice pipe
         //
         for d in data {
-            rightlp.feed(d.to_vec()).await.unwrap();
+            rightlp.feed(d.to_vec()).await?;
         }
         let rflush = spawn(async move {
             rightlp.flush().await.unwrap();
@@ -340,14 +340,14 @@ pub(crate) mod test {
 
         let mut result1 = vec![];
         for _ in data {
-            result1.push(leftlp.next().await.unwrap().unwrap());
+            result1.push(leftlp.next().await.unwrap()?);
         }
         let mut rightlp = rflush.await?;
 
         assert_eq!(result1, data);
 
         for d in data {
-            leftlp.feed(d.to_vec()).await.unwrap();
+            leftlp.feed(d.to_vec()).await?;
         }
         let lflush = spawn(async move {
             leftlp.flush().await.unwrap();
@@ -356,7 +356,7 @@ pub(crate) mod test {
 
         let mut result2 = vec![];
         for _ in data {
-            result2.push(rightlp.next().await.unwrap().unwrap());
+            result2.push(rightlp.next().await.unwrap()?);
         }
         let mut leftlp = lflush.await?;
         assert_eq!(result2, data);
@@ -365,13 +365,13 @@ pub(crate) mod test {
         let mut r4 = vec![];
 
         for d in data {
-            rightlp.send(d.to_vec()).await.unwrap();
-            leftlp.send(d.to_vec()).await.unwrap();
+            rightlp.send(d.to_vec()).await?;
+            leftlp.send(d.to_vec()).await?;
         }
 
         for _ in data {
-            r3.push(rightlp.next().await.unwrap().unwrap());
-            r4.push(leftlp.next().await.unwrap().unwrap());
+            r3.push(rightlp.next().await.unwrap()?);
+            r4.push(leftlp.next().await.unwrap()?);
         }
 
         assert_eq!(r3, data);

tests/basic.rs

@@ -11,7 +11,6 @@ mod _util;
 
 #[tokio::test]
 async fn basic_protocol() -> anyhow::Result<()> {
-    _util::log();
     let (proto_a, proto_b) = create_pair_memory2().await?;
 
     let next_a = next_event(proto_a);

tests/js_interop.rs

@@ -93,7 +93,6 @@ async fn ncrs_client_writer() -> Result<()> {
 #[tokio::test]
 #[cfg_attr(not(feature = "js_interop_tests"), ignore)]
 async fn rcrs_server_writer() -> Result<()> {
-    _util::log();
     rcrs(true, 8107).await?;
     Ok(())
 }