Skip to content

Commit 2e6e438

Browse files
committed
fix rebase formatting issues
1 parent 57bf8ca commit 2e6e438

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

crates/bevy_tasks/src/task_pool.rs

Lines changed: 4 additions & 3 deletions
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;
@@ -253,7 +254,7 @@ impl TaskPool {
253254
results
254255
};
255256

256-
// Pin the futures on the stack.
257+
// Pin the futures on the stack.
257258
pin!(get_results);
258259

259260
// SAFETY: This function blocks until all futures complete, so we do not read/write
@@ -275,7 +276,7 @@ impl TaskPool {
275276
if let Some(result) = future::block_on(future::poll_once(&mut spawned)) {
276277
break result;
277278
};
278-
279+
279280
self.executor.try_tick();
280281
task_scope_executor.try_tick();
281282
}

0 commit comments

Comments
 (0)