From 54aa1369ab977454c73d31accf08b2e9c626b474 Mon Sep 17 00:00:00 2001
From: numzero <numzer0@yandex.ru>
Date: Sun, 30 Jun 2024 14:17:00 +0300
Subject: [PATCH] Clean the imports up

---
 src/bin/flat/fns.rs         |  3 ++-
 src/bin/flat/main.rs        | 15 ++++++++-------
 src/bin/flat/tube/metric.rs |  3 +++
 src/bin/flat/tube/mod.rs    | 13 +++++++++----
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/bin/flat/fns.rs b/src/bin/flat/fns.rs
index 7c55c7b..c52bdaa 100644
--- a/src/bin/flat/fns.rs
+++ b/src/bin/flat/fns.rs
@@ -74,9 +74,10 @@ impl QuadraticAccelerator {
 
 #[cfg(test)]
 mod test {
-	use super::*;
 	use approx::{abs_diff_eq, AbsDiffEq, assert_abs_diff_eq};
 
+	use super::*;
+
 	fn test_limiter(testee: impl Limiter, min: f32, max: f32, δ: f32) {
 		let ε = 1.0e-4f32;
 		let margin = 1.0 / 16.0;
diff --git a/src/bin/flat/main.rs b/src/bin/flat/main.rs
index 38a0621..51e5983 100644
--- a/src/bin/flat/main.rs
+++ b/src/bin/flat/main.rs
@@ -1,20 +1,21 @@
 use std::f32::consts::{FRAC_PI_2, PI};
-use flo_draw::*;
+
 use flo_canvas::*;
+use flo_draw::*;
 use glam::*;
 
+use riemann::{Metric, trace_iter};
+use tube::metric::Tube;
+use tube::Space;
+use tube::Subspace::{Boundary, Inner, Outer};
+use types::{Location, Object, Ray};
+
 mod riemann;
 mod fns;
 mod float_fun;
 mod tube;
 mod types;
 
-use riemann::{Metric, trace_iter};
-use tube::Subspace::{Boundary, Inner, Outer};
-use tube::metric::Tube;
-use tube::Space;
-use types::{Location, Object, Ray};
-
 const DT: f32 = 0.1;
 
 fn draw_loop(gc: &mut Vec<Draw>, mut pts: impl Iterator<Item=Vec2>) {
diff --git a/src/bin/flat/tube/metric.rs b/src/bin/flat/tube/metric.rs
index 45dee22..03ab641 100644
--- a/src/bin/flat/tube/metric.rs
+++ b/src/bin/flat/tube/metric.rs
@@ -1,4 +1,5 @@
 use glam::{f32, Mat2, Vec2, vec2};
+
 use crate::fns::{self, Limiter};
 use crate::riemann::{Decomp2, Metric, Tens2};
 
@@ -54,9 +55,11 @@ mod test {
 	use approx::assert_abs_diff_eq;
 	use glam::{Vec2, vec2};
 	use itertools_num::linspace;
+
 	use crate::riemann::{Decomp2, Metric};
 	use crate::tube::Space;
 	use crate::types::Ray;
+
 	use super::Tube;
 
 	#[test]
diff --git a/src/bin/flat/tube/mod.rs b/src/bin/flat/tube/mod.rs
index 7bcf8de..713e107 100644
--- a/src/bin/flat/tube/mod.rs
+++ b/src/bin/flat/tube/mod.rs
@@ -1,8 +1,10 @@
 use glam::{bool, f32, Mat2, Vec2, vec2};
-use crate::riemann;
-use Subspace::{Boundary, Inner, Outer};
-use metric::Tube;
+
 use coords::{FlatCoordinateSystem, InnerCS, OuterCS};
+use metric::Tube;
+use Subspace::{Boundary, Inner, Outer};
+
+use crate::riemann;
 use crate::tube::coords::FlatRegion;
 use crate::types::{FlatTraceResult, Hit, Location, Object, Ray};
 
@@ -185,8 +187,10 @@ fn test_rect() {
 
 mod coords {
 	use glam::{Mat2, Vec2, vec2};
+
 	use crate::riemann::Metric;
 	use crate::types::{Location, Ray};
+
 	use super::{Rect, Tube};
 
 	pub trait FlatCoordinateSystem<T> {
@@ -298,11 +302,12 @@ mod coords {
 
 	#[cfg(test)]
 	mod test {
-		use super::*;
 		use approx::{AbsDiffEq, assert_abs_diff_eq};
 		use glam::{Mat2, vec2, Vec2};
 		use itertools_num::linspace;
 
+		use super::*;
+
 		fn test_flat_region(region: &impl FlatRegion, range_global: (Vec2, Vec2), range_flat: (Vec2, Vec2)) {
 			const ε: f32 = 1e-3;
 			macro_rules! assert_eq_at {