Merge branch 'main' into dependabot/cargo/dyn-clone-1.0.16

valebes · Nov 8, 2023 · 9e938be · 9e938be
2 parents 86a1e96 + 9a1d043
commit 9e938be
Show file tree

Hide file tree

Showing 6 changed files with 1,070 additions and 112 deletions.
diff --git a/src/pipeline/mod.rs b/src/pipeline/mod.rs
@@ -110,15 +110,15 @@ where
 macro_rules! propagate {
     ($s1:expr) => {
         {
-            let mut block = InNode::new(Box::new($s1), get_global_orchestrator());
+            let block = InNode::new(Box::new($s1), get_global_orchestrator());
             block
         }
     };
 
     ($s1:expr $(, $tail:expr)*) => {
         {
             let node = ($s1);
-            let mut block = InOutNode::new(Box::new(node),
+            let block = InOutNode::new(Box::new(node),
                 propagate!($($tail),*),
                 get_global_orchestrator());
             block
@@ -168,10 +168,10 @@ macro_rules! pipeline {
     ($s1:expr $(, $tail:expr)*) => {
         {
             let orchestrator = get_global_orchestrator();
-            let mut block = OutNode::new(Box::new($s1),
+            let block = OutNode::new(Box::new($s1),
                 propagate!($($tail),*), orchestrator);
 
-            let mut pipeline = Pipeline::new(block);
+            let pipeline = Pipeline::new(block);
             pipeline
         }
     };

diff --git a/src/pipeline/node/inout_node.rs b/src/pipeline/node/inout_node.rs
@@ -442,6 +442,9 @@ where
                                 // If the node is not ordered, then i can send the messages to the next node
                                 // without any order.
                                 loop {
+                                    if tmp.is_empty() {
+                                        break;
+                                    }
                                     let msg = Message {
                                         op: Task::New(tmp.pop_front().unwrap()),
                                         order: 0,
@@ -450,9 +453,6 @@ where
                                     if err.is_err() {
                                         panic!("Error: {}", err.unwrap_err());
                                     }
-                                    if tmp.is_empty() {
-                                        break;
-                                    }
                                 }
                             }
                         }