Skip to content

Commit 415f91b

Browse files
committed
fix rebase formatting issues
1 parent 59b2dd2 commit 415f91b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

crates/bevy_tasks/src/task_pool.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ use std::{
22
future::Future,
33
marker::PhantomData,
44
mem,
5+
pin::Pin,
56
sync::Arc,
6-
thread::{self, JoinHandle}, pin::Pin,
7+
thread::{self, JoinHandle},
78
};
89

910
use concurrent_queue::ConcurrentQueue;
@@ -264,7 +265,7 @@ impl TaskPool {
264265
results
265266
};
266267

267-
// Pin the futures on the stack.
268+
// Pin the futures on the stack.
268269
pin!(get_results);
269270

270271
// SAFETY: This function blocks until all futures complete, so we do not read/write
@@ -286,7 +287,7 @@ impl TaskPool {
286287
if let Some(result) = future::block_on(future::poll_once(&mut spawned)) {
287288
break result;
288289
};
289-
290+
290291
self.executor.try_tick();
291292
task_scope_executor.try_tick();
292293
}

0 commit comments

Comments
 (0)