forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove parking_lot dependency from bevy_ecs (#4543)

Browse Source 
It is only used in some tests so any potential performance regressions don't matter.
This commit is contained in:
bjorn3 2022-04-20 11:26:38 +00:00
parent 46321930f2
commit e65f28d8d7
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/bevy_ecs/Cargo.toml
View File

@ -27,7 +27,6 @@ downcast-rs = "1.2"
serde = "1" serde = "1"
[dev-dependencies] [dev-dependencies]
parking_lot = "0.11"
rand = "0.8" rand = "0.8"
[[example]] [[example]]

15
crates/bevy_ecs/src/lib.rs
View File

@ -56,12 +56,11 @@ mod tests {
world::{Mut, World}, world::{Mut, World},
}; };
use bevy_tasks::TaskPool; use bevy_tasks::TaskPool;
use parking_lot::Mutex;
use std::{ use std::{
any::TypeId, any::TypeId,
sync::{ sync::{
atomic::{AtomicUsize, Ordering}, atomic::{AtomicUsize, Ordering},
Arc, Arc, Mutex,
}, },
}; };
@ -383,11 +382,11 @@ mod tests {
world world
.query::<(Entity, &A)>() .query::<(Entity, &A)>()
.par_for_each(&world, &task_pool, 2, |(e, &A(i))| { .par_for_each(&world, &task_pool, 2, |(e, &A(i))| {
results.lock().push((e, i)); results.lock().unwrap().push((e, i));
}); });
results.lock().sort(); results.lock().unwrap().sort();
assert_eq!( assert_eq!(
&*results.lock(), &*results.lock().unwrap(),
&[(e1, 1), (e2, 2), (e3, 3), (e4, 4), (e5, 5)] &[(e1, 1), (e2, 2), (e3, 3), (e4, 4), (e5, 5)]
); );
} }
@ -407,11 +406,11 @@ mod tests {
&world, &world,
&task_pool, &task_pool,
2, 2,
|(e, &SparseStored(i))| results.lock().push((e, i)), |(e, &SparseStored(i))| results.lock().unwrap().push((e, i)),
); );
results.lock().sort(); results.lock().unwrap().sort();
assert_eq!( assert_eq!(
&*results.lock(), &*results.lock().unwrap(),
&[(e1, 1), (e2, 2), (e3, 3), (e4, 4), (e5, 5)] &[(e1, 1), (e2, 2), (e3, 3), (e4, 4), (e5, 5)]
); );
} }