fix rebase formatting issues

bevyengine · Jun 10, 2022 · 418ca49 · 418ca49
1 parent 0fce9ea
commit 418ca49
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/crates/bevy_tasks/src/task_pool.rs b/crates/bevy_tasks/src/task_pool.rs
@@ -2,8 +2,9 @@ use std::{
     future::Future,
     marker::PhantomData,
     mem,
+    pin::Pin,
     sync::Arc,
-    thread::{self, JoinHandle}, pin::Pin,
+    thread::{self, JoinHandle},
 };
 
 use concurrent_queue::ConcurrentQueue;
@@ -264,7 +265,7 @@ impl TaskPool {
                 results
             };
 
-                // Pin the futures on the stack.
+            // Pin the futures on the stack.
             pin!(get_results);
 
             // SAFETY: This function blocks until all futures complete, so we do not read/write
@@ -286,7 +287,7 @@ impl TaskPool {
                 if let Some(result) = future::block_on(future::poll_once(&mut spawned)) {
                     break result;
                 };
-    
+
                 self.executor.try_tick();
                 task_scope_executor.try_tick();
             }