From e701c212cdc6bb57f1af37316e7834f2ac982630 Mon Sep 17 00:00:00 2001 From: BD103 <59022059+BD103@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:42:17 -0500 Subject: [PATCH] refactor: re-order imports Modules first, imports second --- benches/benches/bevy_ecs/components/mod.rs | 3 +-- benches/benches/bevy_ecs/events/mod.rs | 4 ++-- benches/benches/bevy_ecs/iteration/mod.rs | 3 +-- benches/benches/bevy_ecs/observers/mod.rs | 4 ++-- benches/benches/bevy_ecs/param/mod.rs | 3 +-- benches/benches/bevy_ecs/scheduling/mod.rs | 3 +-- benches/benches/bevy_ecs/world/mod.rs | 23 +++++++++------------- 7 files changed, 17 insertions(+), 26 deletions(-) diff --git a/benches/benches/bevy_ecs/components/mod.rs b/benches/benches/bevy_ecs/components/mod.rs index 495cb0fd45..aec44ed27c 100644 --- a/benches/benches/bevy_ecs/components/mod.rs +++ b/benches/benches/bevy_ecs/components/mod.rs @@ -1,5 +1,3 @@ -use criterion::*; - mod add_remove; mod add_remove_big_sparse_set; mod add_remove_big_table; @@ -11,6 +9,7 @@ mod insert_simple; mod insert_simple_unbatched; use archetype_updates::*; +use criterion::{criterion_group, Criterion}; criterion_group!( benches, diff --git a/benches/benches/bevy_ecs/events/mod.rs b/benches/benches/bevy_ecs/events/mod.rs index 15492bc92c..4367c45c3e 100644 --- a/benches/benches/bevy_ecs/events/mod.rs +++ b/benches/benches/bevy_ecs/events/mod.rs @@ -1,8 +1,8 @@ -use criterion::*; - mod iter; mod send; +use criterion::{criterion_group, Criterion}; + criterion_group!(benches, send, iter); fn send(c: &mut Criterion) { diff --git a/benches/benches/bevy_ecs/iteration/mod.rs b/benches/benches/bevy_ecs/iteration/mod.rs index 5a9661a70e..0fa7aced28 100644 --- a/benches/benches/bevy_ecs/iteration/mod.rs +++ b/benches/benches/bevy_ecs/iteration/mod.rs @@ -1,5 +1,3 @@ -use criterion::*; - mod heavy_compute; mod iter_frag; mod iter_frag_foreach; @@ -22,6 +20,7 @@ mod iter_simple_wide_sparse_set; mod par_iter_simple; mod par_iter_simple_foreach_hybrid; +use criterion::{criterion_group, Criterion}; use heavy_compute::*; criterion_group!( diff --git a/benches/benches/bevy_ecs/observers/mod.rs b/benches/benches/bevy_ecs/observers/mod.rs index 01a72ca908..16008def7e 100644 --- a/benches/benches/bevy_ecs/observers/mod.rs +++ b/benches/benches/bevy_ecs/observers/mod.rs @@ -1,7 +1,7 @@ -use criterion::criterion_group; - mod propagation; mod simple; + +use criterion::criterion_group; use propagation::*; use simple::*; diff --git a/benches/benches/bevy_ecs/param/mod.rs b/benches/benches/bevy_ecs/param/mod.rs index da2246ccf3..6cc6132f66 100644 --- a/benches/benches/bevy_ecs/param/mod.rs +++ b/benches/benches/bevy_ecs/param/mod.rs @@ -1,10 +1,9 @@ -use criterion::criterion_group; - mod combinator_system; mod dyn_param; mod param_set; use combinator_system::*; +use criterion::criterion_group; use dyn_param::*; use param_set::*; diff --git a/benches/benches/bevy_ecs/scheduling/mod.rs b/benches/benches/bevy_ecs/scheduling/mod.rs index 01f6f32c1f..310662e629 100644 --- a/benches/benches/bevy_ecs/scheduling/mod.rs +++ b/benches/benches/bevy_ecs/scheduling/mod.rs @@ -1,9 +1,8 @@ -use criterion::criterion_group; - mod run_condition; mod running_systems; mod schedule; +use criterion::criterion_group; use run_condition::*; use running_systems::*; use schedule::*; diff --git a/benches/benches/bevy_ecs/world/mod.rs b/benches/benches/bevy_ecs/world/mod.rs index 0da09362b1..e35dc999c2 100644 --- a/benches/benches/bevy_ecs/world/mod.rs +++ b/benches/benches/bevy_ecs/world/mod.rs @@ -1,22 +1,17 @@ -use criterion::criterion_group; - mod commands; -use commands::*; - mod despawn; -use despawn::*; - mod despawn_recursive; -use despawn_recursive::*; - -mod spawn; -use spawn::*; - -mod world_get; -use world_get::*; - mod entity_hash; +mod spawn; +mod world_get; + +use commands::*; +use criterion::criterion_group; +use despawn::*; +use despawn_recursive::*; use entity_hash::*; +use spawn::*; +use world_get::*; criterion_group!( benches,