style: format for Rust edition 2021HEADmaster

4 files changed, 16 insertions, 17 deletions

diff --git a/engine/src/renderer/main_render_pass.rs b/engine/src/renderer/main_render_pass.rs
index 04050f8..e63ce0e 100644
--- a/engine/src/renderer/main_render_pass.rs
+++ b/engine/src/renderer/main_render_pass.rs
@@ -1,8 +1,8 @@
 use crate::asset::Assets;
 use crate::draw_flags::{DrawFlags, NoDraw, PolygonModeConfig};
-use crate::ecs::Query;
 use crate::ecs::query::term::{With, Without};
 use crate::ecs::sole::Single;
+use crate::ecs::Query;
 use crate::model::{MaterialSearchResult, Model};
 use crate::renderer::object::{Id as RendererObjectId, Store as RendererObjectStore};
 use crate::renderer::{
diff --git a/engine/src/renderer/object.rs b/engine/src/renderer/object.rs
index 8441959..e10011d 100644
--- a/engine/src/renderer/object.rs
+++ b/engine/src/renderer/object.rs
@@ -1,9 +1,8 @@
 use std::collections::HashMap;
 use std::sync::atomic::{AtomicU64, Ordering};
 
-use crate::ecs::Sole;
-
 use crate::asset::Id as AssetId;
+use crate::ecs::Sole;
 
 pub type RawValue = u32;
 
diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs
index dcdd6a5..e6163ab 100644
--- a/engine/src/renderer/opengl.rs
+++ b/engine/src/renderer/opengl.rs
@@ -3,10 +3,6 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-use crate::ecs::actions::Actions;
-use crate::ecs::query::term::Without;
-use crate::ecs::sole::Single;
-use crate::ecs::{Component, Query, Sole};
 use glutin::config::Config as GlutinConfig;
 use glutin::display::GetGlDisplay;
 use glutin::error::Error as GlutinError;
@@ -17,29 +13,29 @@ use glutin::surface::{
     WindowSurface as GlutinWindowSurface,
 };
 use opengl_bindings::blending::{
+    configure as gl_blending_configure,
     Configuration as GlBlendingConfig,
     Equation as GlBlendingEquation,
     Factor as GlBlendingFactor,
-    configure as gl_blending_configure,
 };
 use opengl_bindings::debug::{
+    set_debug_message_callback,
+    set_debug_message_control,
     MessageIdsAction,
     MessageSeverity,
     MessageSource,
     MessageType,
     SetDebugMessageControlError as GlSetDebugMessageControlError,
-    set_debug_message_callback,
-    set_debug_message_control,
 };
 use opengl_bindings::misc::{
-    BufferClearMask as GlBufferClearMask,
-    Capability,
     clear_buffers,
     define_scissor_box as gl_define_scissor_box,
     enable,
     get_viewport as gl_get_viewport,
     set_enabled,
     set_viewport as gl_set_viewport,
+    BufferClearMask as GlBufferClearMask,
+    Capability,
 };
 use opengl_bindings::shader::{
     Error as GlShaderError,
@@ -72,6 +68,10 @@ use zerocopy::{Immutable, IntoBytes};
 
 use crate::asset::{Assets, Handle as AssetHandle};
 use crate::data_types::dimens::Dimens;
+use crate::ecs::actions::Actions;
+use crate::ecs::query::term::Without;
+use crate::ecs::sole::Single;
+use crate::ecs::{Component, Query, Sole};
 use crate::image::{ColorType as ImageColorType, Image};
 use crate::matrix::Matrix;
 use crate::reflection::EnumReflectionExt;
@@ -95,10 +95,10 @@ use crate::renderer::{
     DrawMeshOptions,
     DrawPropertiesUpdateFlags,
     GraphicsProperties,
-    POST_RENDER_PHASE,
-    RENDER_PHASE,
     SurfaceId,
     SurfaceSpec,
+    POST_RENDER_PHASE,
+    RENDER_PHASE,
 };
 use crate::shader::cursor::BindingValue as ShaderBindingValue;
 use crate::shader::{
@@ -115,13 +115,13 @@ use crate::texture::{
 };
 use crate::util::OptionExt;
 use crate::vector::{Vec2, Vec3};
-use crate::windowing::Context as WindowingContext;
 use crate::windowing::window::{
     Closed as WindowClosed,
     CreationAttributes as WindowCreationAttributes,
     CreationReady,
     Window,
 };
+use crate::windowing::Context as WindowingContext;
 
 mod glutin_compat;
 mod graphics_mesh;
@@ -1346,7 +1346,7 @@ fn opengl_debug_message_cb(
 {
     use std::backtrace::{Backtrace, BacktraceStatus};
 
-    use tracing::{Level, event};
+    use tracing::{event, Level};
 
     macro_rules! create_event {
         ($level: expr) => {
diff --git a/engine/src/renderer/opengl/graphics_mesh.rs b/engine/src/renderer/opengl/graphics_mesh.rs
index c5ff0c6..7db72d4 100644
--- a/engine/src/renderer/opengl/graphics_mesh.rs
+++ b/engine/src/renderer/opengl/graphics_mesh.rs
@@ -1,4 +1,3 @@
-use opengl_bindings::CurrentContextWithFns as GlCurrentContextWithFns;
 use opengl_bindings::buffer::{Buffer as GlBuffer, Usage as GlBufferUsage};
 use opengl_bindings::vertex_array::{
     AttributeFormat as GlVertexArrayAttributeFormat,
@@ -7,6 +6,7 @@ use opengl_bindings::vertex_array::{
     VertexArray as GlVertexArray,
     VertexBufferSpec as GlVertexArrayVertexBufferSpec,
 };
+use opengl_bindings::CurrentContextWithFns as GlCurrentContextWithFns;
 
 use crate::mesh::{Mesh, VertexAttrType};
 use crate::renderer::MeshUsage;