merge layout/ with space/

crates/tek/src/layout.rs

@@ -1,20 +0,0 @@
-pub(crate) mod align;        pub(crate) use align::*;
-pub(crate) mod bsp;          pub(crate) use bsp::*;
-pub(crate) mod cond;         pub(crate) use cond::*;
-pub(crate) mod fill;         pub(crate) use fill::*;
-pub(crate) mod fixed;        pub(crate) use fixed::*;
-pub(crate) mod inset_outset; pub(crate) use inset_outset::*;
-pub(crate) mod layers;       pub(crate) use layers::*;
-pub(crate) mod measure;      pub(crate) use measure::*;
-pub(crate) mod min_max;      pub(crate) use min_max::*;
-pub(crate) mod push_pull;    pub(crate) use push_pull::*;
-pub(crate) mod scroll;       pub(crate) use scroll::*;
-pub(crate) mod shrink_grow;  pub(crate) use shrink_grow::*;
-pub(crate) mod split;        pub(crate) use split::*;
-pub(crate) mod stack;        pub(crate) use stack::*;
-
-pub use self::{
-    align::*,
-    bsp::*,
-    fill::*,
-};

crates/tek/src/lib.rs

@@ -1,5 +1,4 @@
 pub mod core;   pub(crate) use self::core::*;
-pub mod layout; pub(crate) use self::layout::*;
 pub mod api;    pub(crate) use self::api::*;
 pub mod tui;    pub(crate) use self::tui::*;
 pub mod edn;    pub(crate) use self::edn::*;

crates/tek/src/space.rs

@@ -5,3 +5,26 @@ pub(crate) mod direction; pub(crate) use direction::*;
 
 // TODO: return impl Point and impl Size instead of [N;x]
 // to disambiguate between usage of 2-"tuple"s
+
+//////////////////////////////////////////////////////
+
+pub(crate) mod align;        pub(crate) use align::*;
+pub(crate) mod bsp;          pub(crate) use bsp::*;
+pub(crate) mod cond;         pub(crate) use cond::*;
+pub(crate) mod fill;         pub(crate) use fill::*;
+pub(crate) mod fixed;        pub(crate) use fixed::*;
+pub(crate) mod inset_outset; pub(crate) use inset_outset::*;
+pub(crate) mod layers;       pub(crate) use layers::*;
+pub(crate) mod measure;      pub(crate) use measure::*;
+pub(crate) mod min_max;      pub(crate) use min_max::*;
+pub(crate) mod push_pull;    pub(crate) use push_pull::*;
+pub(crate) mod scroll;       pub(crate) use scroll::*;
+pub(crate) mod shrink_grow;  pub(crate) use shrink_grow::*;
+pub(crate) mod split;        pub(crate) use split::*;
+pub(crate) mod stack;        pub(crate) use stack::*;
+
+pub use self::{
+    align::*,
+    bsp::*,
+    fill::*,
+};