style: format for Rust edition 2021HEADmaster

8 files changed, 16 insertions, 16 deletions

diff --git a/engine-ecs/examples/error_handling.rs b/engine-ecs/examples/error_handling.rs
index 3d57778..264b12f 100644
--- a/engine-ecs/examples/error_handling.rs
+++ b/engine-ecs/examples/error_handling.rs
@@ -4,12 +4,12 @@ use engine_ecs::pair::Pair;
 use engine_ecs::phase::UPDATE;
 use engine_ecs::query::Query;
 use engine_ecs::system::observer::Observe;
-use engine_ecs::{Component, World, error};
+use engine_ecs::{error, Component, World};
 use tracing::level_filters::LevelFilter;
-use tracing_subscriber::EnvFilter;
 use tracing_subscriber::fmt::time::ChronoLocal;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
+use tracing_subscriber::EnvFilter;
 
 #[derive(Component)]
 struct State
diff --git a/engine-ecs/src/component/storage.rs b/engine-ecs/src/component/storage.rs
index dc38b6a..d4457bb 100644
--- a/engine-ecs/src/component/storage.rs
+++ b/engine-ecs/src/component/storage.rs
@@ -766,8 +766,8 @@ struct ImaginaryArchetype
 #[cfg(test)]
 mod tests
 {
-    use crate::component::storage::Storage;
     use crate::component::storage::archetype::Id as ArchetypeId;
+    use crate::component::storage::Storage;
     use crate::uid::{Kind as UidKind, Uid};
 
     #[test]
diff --git a/engine-ecs/src/event/component.rs b/engine-ecs/src/event/component.rs
index 70ea3e5..894fd95 100644
--- a/engine-ecs/src/event/component.rs
+++ b/engine-ecs/src/event/component.rs
@@ -2,11 +2,11 @@
 
 use std::convert::Infallible;
 
-use crate::Component;
 use crate::component::{Handle as ComponentHandle, HandleMut as ComponentHandleMut};
 use crate::entity::Handle as EntityHandle;
 use crate::pair::Pair;
 use crate::system::observer::{EventMatch, Observed};
+use crate::Component;
 
 /// Implemented by the relations of component event pairs
 pub trait EventRelation: Component {}
diff --git a/engine-ecs/src/lib.rs b/engine-ecs/src/lib.rs
index 6450587..a60ddcd 100644
--- a/engine-ecs/src/lib.rs
+++ b/engine-ecs/src/lib.rs
@@ -1,12 +1,12 @@
 #![deny(clippy::all, clippy::pedantic)]
 
-use std::any::{Any, TypeId, type_name};
+use std::any::{type_name, Any, TypeId};
 use std::fmt::Debug;
 use std::hint::cold_path;
 use std::mem::ManuallyDrop;
 use std::rc::Rc;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
 
 use hashbrown::HashMap;
 
@@ -21,10 +21,10 @@ use crate::component::{
 };
 use crate::entity::{Declaration as EntityDeclaration, Handle as EntityHandle};
 use crate::error::{
+    err_handler_panic,
     ErrorHandler,
     Metadata as ErrorMetadata,
     SourceKind as ErrorSourceKind,
-    err_handler_panic,
 };
 use crate::event::component::Added;
 use crate::event::{Emitted as EmittedEvent, NewEvents, Submitter as EventSubmitter};
@@ -33,19 +33,19 @@ use crate::lock::Lock;
 use crate::pair::{ChildOf, Pair, Wildcard};
 use crate::phase::{
     HasSystem as PhaseHasSystem,
+    Phase,
     POST_UPDATE as POST_UPDATE_PHASE,
     PRE_UPDATE as PRE_UPDATE_PHASE,
-    Phase,
     START as START_PHASE,
     UPDATE as UPDATE_PHASE,
 };
 use crate::query::flexible::Query as FlexibleQuery;
 use crate::query::{
-    MAX_TERM_CNT as QUERY_MAX_TERM_CNT,
     TermWithFieldTuple as QueryTermWithFieldTuple,
     TermWithoutFieldTuple as QueryTermWithoutFieldTuple,
     Terms as QueryTerms,
     TermsBuilderInterface,
+    MAX_TERM_CNT as QUERY_MAX_TERM_CNT,
 };
 use crate::sole::{Single, Sole};
 use crate::stats::Stats;
@@ -670,7 +670,7 @@ impl<'a> EntityComponentRef<'a>
     }
 
     fn new(component_id: Uid, comp: &'a ArchetypeEntityComponent, entity_id: Uid)
-    -> Self
+        -> Self
     {
         Self {
             component_id,
diff --git a/engine-ecs/src/phase.rs b/engine-ecs/src/phase.rs
index 976de1b..434e728 100644
--- a/engine-ecs/src/phase.rs
+++ b/engine-ecs/src/phase.rs
@@ -1,4 +1,4 @@
-use crate::{Component, World, declare_entity};
+use crate::{declare_entity, Component, World};
 
 #[derive(Debug, Default, Clone, Copy, Component)]
 pub struct Phase;
diff --git a/engine-ecs/src/sole.rs b/engine-ecs/src/sole.rs
index 82e5e0f..9e27fee 100644
--- a/engine-ecs/src/sole.rs
+++ b/engine-ecs/src/sole.rs
@@ -1,12 +1,12 @@
-use std::any::{Any, type_name};
+use std::any::{type_name, Any};
 use std::fmt::Debug;
 use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
 
-use crate::World;
 use crate::lock::{Lock, WriteGuard};
 use crate::system::{Metadata as SystemMetadata, Param as SystemParam};
+use crate::World;
 
 /// A type which has a single instance and is shared globally.
 pub trait Sole: Any
diff --git a/engine-ecs/src/system/stateful.rs b/engine-ecs/src/system/stateful.rs
index 3e0076a..b73baeb 100644
--- a/engine-ecs/src/system/stateful.rs
+++ b/engine-ecs/src/system/stateful.rs
@@ -3,9 +3,8 @@ use std::mem::transmute;
 
 use seq_macro::seq;
 
-use crate::World;
-use crate::component::Parts as ComponentParts;
 use crate::component::local::SystemWithLocalComponents;
+use crate::component::Parts as ComponentParts;
 use crate::event::Emitted as EmittedEvent;
 use crate::system::initializable::{Initializable, MaybeInitializableParamTuple};
 use crate::system::observer::{
@@ -22,6 +21,7 @@ use crate::system::{
     System,
     TypeErased,
 };
+use crate::World;
 
 /// A stateful system.
 pub struct Stateful<Func>
diff --git a/engine-ecs/tests/phase.rs b/engine-ecs/tests/phase.rs
index 8b755a9..c2469fd 100644
--- a/engine-ecs/tests/phase.rs
+++ b/engine-ecs/tests/phase.rs
@@ -2,8 +2,8 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 
 use engine_ecs::component::local::Local;
 use engine_ecs::phase::UPDATE;
-use engine_ecs::system::Into;
 use engine_ecs::system::initializable::Initializable;
+use engine_ecs::system::Into;
 use engine_ecs::{Component, World};
 
 #[derive(Component)]