Reformat imports

diff --git a/bins/narcissus/src/main.rs b/bins/narcissus/src/main.rs
index 42e3835d242f4ed145deb50c936603e51144bd64..fb282d739d18f22ce54d89f6a7391ad7c760e689 100644 (file)
--- a/bins/narcissus/src/main.rs
+++ b/bins/narcissus/src/main.rs
@@ -1,5 +1,9 @@
 use std::time::Instant;
 
+use crate::{
+    fonts::{FontFamily, Fonts},
+    pipelines::{BasicPipeline, TextPipeline},
+};
 use helpers::{create_buffer_with_data, create_image_with_data, load_image, load_obj};
 use mapped_buffer::MappedBuffer;
 use narcissus_app::{create_app, Event, Key, PressedState, WindowDesc};
@@ -11,15 +15,9 @@ use narcissus_gpu::{
     ImageUsageFlags, LoadOp, MemoryLocation, Offset2d, Offset3d, RenderingAttachment,
     RenderingDesc, Scissor, StoreOp, ThreadToken, Viewport,
 };
-
 use narcissus_maths::{sin_cos_pi_f32, vec3, Affine3, Deg, HalfTurn, Mat3, Mat4, Point3, Vec3};
 use pipelines::{BasicUniforms, GlyphInstance, TextUniforms};
 
-use crate::{
-    fonts::{FontFamily, Fonts},
-    pipelines::{BasicPipeline, TextPipeline},
-};
-
 mod fonts;
 mod helpers;
 mod mapped_buffer;

diff --git a/bins/narcissus/src/pipelines/mod.rs b/bins/narcissus/src/pipelines/mod.rs
index 3a2f9d9dd0bec69bbeed90e24ec7c44f1dde2c57..6f5c2e6afd72fe3bb77513fff96612e3b3613088 100644 (file)
--- a/bins/narcissus/src/pipelines/mod.rs
+++ b/bins/narcissus/src/pipelines/mod.rs
@@ -1,10 +1,6 @@
 mod basic;
 mod text;
 
-pub use basic::BasicPipeline;
-pub use basic::BasicUniforms;
-pub use basic::Vertex;
+pub use basic::{BasicPipeline, BasicUniforms, Vertex};
 
-pub use text::GlyphInstance;
-pub use text::TextPipeline;
-pub use text::TextUniforms;
+pub use text::{GlyphInstance, TextPipeline, TextUniforms};

diff --git a/libs/narcissus-core/src/lib.rs b/libs/narcissus-core/src/lib.rs
index 038ddd1f150046493a9dd00dc514f329a09f7986..c8e1ad3c61734074a186a93949d4f79151e981c0 100644 (file)
--- a/libs/narcissus-core/src/lib.rs
+++ b/libs/narcissus-core/src/lib.rs
@@ -48,8 +48,7 @@ macro_rules! static_assert {
 macro_rules! thread_token_def {
     ($token_name:ident, $container_name:ident, $max_concurrency:expr) => {
         mod private {
-            use std::cell::UnsafeCell;
-            use std::sync::atomic::AtomicUsize;
+            use std::{cell::UnsafeCell, sync::atomic::AtomicUsize};
             use $crate::PhantomUnsend;
             pub struct $token_name {
                 index: usize,
@@ -107,8 +106,7 @@ macro_rules! thread_token_def {
                 }
             }
         }
-        pub use private::$container_name;
-        pub use private::$token_name;
+        pub use private::{$container_name, $token_name};
     };
 }
 
@@ -504,9 +502,7 @@ pub fn cstr_from_bytes_until_nul(bytes: &[u8]) -> Result<&CStr, FromBytesUntilNu
 mod tests {
     use std::ffi::CStr;
 
-    use super::cstr;
-    use super::mod_inverse_u32;
-    use super::mod_inverse_u64;
+    use super::{cstr, mod_inverse_u32, mod_inverse_u64};
 
     #[test]
     fn test_cstr() {

diff --git a/libs/narcissus-core/src/virtual_vec/deque.rs b/libs/narcissus-core/src/virtual_vec/deque.rs
index 5e5c12b52e1f8e799afb063659a3424e310f48f9..9f947380309994bd8acb179a9e9b7faefc1a4226 100644 (file)
--- a/libs/narcissus-core/src/virtual_vec/deque.rs
+++ b/libs/narcissus-core/src/virtual_vec/deque.rs
@@ -1,7 +1,8 @@
-use std::iter::repeat_with;
-use std::ops::{Index, IndexMut};
-use std::ptr;
-use std::slice;
+use std::{
+    iter::repeat_with,
+    ops::{Index, IndexMut},
+    ptr, slice,
+};
 
 use super::VirtualRawVec;
 

diff --git a/libs/narcissus-core/src/virtual_vec/mod.rs b/libs/narcissus-core/src/virtual_vec/mod.rs
index ef60da2231186e7f77424cf8f42f318f742412a1..d07efab3142d1f5cfa8291456b328f25bbe85a97 100644 (file)
--- a/libs/narcissus-core/src/virtual_vec/mod.rs
+++ b/libs/narcissus-core/src/virtual_vec/mod.rs
@@ -2,9 +2,7 @@ mod deque;
 mod raw_vec;
 mod vec;
 
-pub use self::deque::VirtualDeque;
-pub use self::raw_vec::VirtualRawVec;
-pub use self::vec::VirtualVec;
+pub use self::{deque::VirtualDeque, raw_vec::VirtualRawVec, vec::VirtualVec};
 
 #[cfg(test)]
 mod tests {

diff --git a/libs/narcissus-core/src/virtual_vec/raw_vec.rs b/libs/narcissus-core/src/virtual_vec/raw_vec.rs
index 88352d7325745648b3638143064aa2976d4c2edc..531775487f3425d0bda503b68f833cf51897df53 100644 (file)
--- a/libs/narcissus-core/src/virtual_vec/raw_vec.rs
+++ b/libs/narcissus-core/src/virtual_vec/raw_vec.rs
@@ -1,5 +1,5 @@
-use std::cmp;
 use std::{
+    cmp,
     mem::{align_of, size_of},
     ptr::NonNull,
 };

diff --git a/libs/narcissus-core/src/virtual_vec/vec.rs b/libs/narcissus-core/src/virtual_vec/vec.rs
index 38cfbd64216bd47076c5ed5fbc6718bfe4657d55..1e22e0bc5fcc0a1c37ab5a59ae061923e316e69f 100644 (file)
--- a/libs/narcissus-core/src/virtual_vec/vec.rs
+++ b/libs/narcissus-core/src/virtual_vec/vec.rs
@@ -1,5 +1,7 @@
-use std::ops::{Deref, DerefMut};
-use std::ptr;
+use std::{
+    ops::{Deref, DerefMut},
+    ptr,
+};
 
 use super::VirtualRawVec;
 

diff --git a/libs/narcissus-font/src/cache.rs b/libs/narcissus-font/src/cache.rs
index 32cb2e422352126917777100f0fd7b193af6f69f..ce9334346e65c4202b28fd6a3417826cb36ca197 100644 (file)
--- a/libs/narcissus-font/src/cache.rs
+++ b/libs/narcissus-font/src/cache.rs
@@ -1,8 +1,7 @@
+use crate::{font::GlyphBitmapBox, FontCollection, GlyphIndex, Oversample, Packer};
 use rustc_hash::FxHashMap;
 use stb_truetype_sys::rectpack::Rect;
 
-use crate::{font::GlyphBitmapBox, FontCollection, GlyphIndex, Oversample, Packer};
-
 pub use narcissus_core::FiniteF32;
 
 /// An index into the CachedGlyph slice.

diff --git a/libs/narcissus-font/src/font.rs b/libs/narcissus-font/src/font.rs
index bf598fd52aa5fcbc43657c7a2b50c6ab1a61c4c5..26aa0633cff0f479a9597c14991dca01f16844d5 100644 (file)
--- a/libs/narcissus-font/src/font.rs
+++ b/libs/narcissus-font/src/font.rs
@@ -1,10 +1,9 @@
-use std::{marker::PhantomData, mem::MaybeUninit, num::NonZeroI32};
-
 use stb_truetype_sys::{
     stbtt_FindGlyphIndex, stbtt_GetFontOffsetForIndex, stbtt_GetFontVMetrics,
     stbtt_GetGlyphBitmapBoxSubpixel, stbtt_GetGlyphHMetrics, stbtt_GetGlyphKernAdvance,
     stbtt_InitFont, stbtt_MakeGlyphBitmapSubpixelPrefilter, truetype,
 };
+use std::{marker::PhantomData, mem::MaybeUninit, num::NonZeroI32};
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum Oversample {

diff --git a/libs/narcissus-font/src/lib.rs b/libs/narcissus-font/src/lib.rs
index ffe1cbd48be4fe56844ce90d41bb4ced4895bc36..e91386b3d5eb28ad09b2b64d9812d81fbd0704da 100644 (file)
--- a/libs/narcissus-font/src/lib.rs
+++ b/libs/narcissus-font/src/lib.rs
@@ -2,12 +2,6 @@ mod cache;
 mod font;
 mod packer;
 
-pub use cache::CachedGlyph;
-pub use cache::CachedGlyphIndex;
-pub use cache::GlyphCache;
-pub use font::Font;
-pub use font::FontCollection;
-pub use font::GlyphIndex;
-pub use font::Oversample;
-pub use packer::Packer;
-pub use packer::Rect;
+pub use cache::{CachedGlyph, CachedGlyphIndex, GlyphCache};
+pub use font::{Font, FontCollection, GlyphIndex, Oversample};
+pub use packer::{Packer, Rect};

diff --git a/libs/narcissus-gpu/src/backend/mod.rs b/libs/narcissus-gpu/src/backend/mod.rs
index 8021465f488aa8cfc21ffe5c7b1ba6b88a4bf222..3890c8373235e0ffeefbd19fe5d33209b84dfb23 100644 (file)
--- a/libs/narcissus-gpu/src/backend/mod.rs
+++ b/libs/narcissus-gpu/src/backend/mod.rs
@@ -1,2 +1 @@
 pub mod vulkan;
-