From: Joshua Simmons <josh@nega.tv>
Date: Mon, 27 Feb 2023 20:19:15 +0000 (+0100)
Subject: Reformat imports
X-Git-Url: https://git.nega.tv//gitweb.cgi?a=commitdiff_plain;h=18ff412e3dcffc98089884ccf25c95030ee6c013;p=josh%2Fnarcissus

Reformat imports
---

diff --git a/bins/narcissus/src/main.rs b/bins/narcissus/src/main.rs
index 42e3835..fb282d7 100644
--- 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 3a2f9d9..6f5c2e6 100644
--- 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 038ddd1..c8e1ad3 100644
--- 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 5e5c12b..9f94738 100644
--- 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 ef60da2..d07efab 100644
--- 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 88352d7..5317754 100644
--- 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 38cfbd6..1e22e0b 100644
--- 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 32cb2e4..ce93343 100644
--- 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 bf598fd..26aa063 100644
--- 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 ffe1cbd..e91386b 100644
--- 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 8021465..3890c83 100644
--- a/libs/narcissus-gpu/src/backend/mod.rs
+++ b/libs/narcissus-gpu/src/backend/mod.rs
@@ -1,2 +1 @@
 pub mod vulkan;
-