Merge remote-tracking branch 'refs/remotes/origin/main' into feat/ver…

…sion # Conflicts: # src/stream/merge.rs
tonbo-io · Jul 16, 2024 · bd7d87e · bd7d87e
2 parents 7fef2be + 2601443
commit bd7d87e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/stream/merge.rs b/src/stream/merge.rs
@@ -186,10 +186,9 @@ mod tests {
         let lower = "1".to_string();
         let upper = "4".to_string();
         let bound = (Bound::Included(&lower), Bound::Included(&upper));
-        let mut merge =
-            MergeStream::<String, TokioExecutor>::from_vec(vec![m1.scan(bound, 0.into()).into()])
-                .await
-                .unwrap();
+        let mut merge = MergeStream::<String, TokioExecutor>::from_vec(vec![m1.scan(bound, 0.into()).into()])
+            .await
+            .unwrap();
 
         dbg!(merge.next().await);
         dbg!(merge.next().await);
@@ -198,10 +197,9 @@ mod tests {
         let lower = "1".to_string();
         let upper = "4".to_string();
         let bound = (Bound::Included(&lower), Bound::Included(&upper));
-        let mut merge =
-            MergeStream::<String, TokioExecutor>::from_vec(vec![m1.scan(bound, 1.into()).into()])
-                .await
-                .unwrap();
+        let mut merge = MergeStream::<String, TokioExecutor>::from_vec(vec![m1.scan(bound, 1.into()).into()])
+            .await
+            .unwrap();
 
         dbg!(merge.next().await);
         dbg!(merge.next().await);