wip: final simplify

src/lib.rs

@@ -25,30 +25,32 @@ pub(crate) use ::{
     std::ops::{Add, Sub, Mul, Div},
     std::sync::{Arc, RwLock},
     std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::*},
+    std::error::Error,
+    std::marker::PhantomData
 };
 
-#[cfg(feature = "lang")]
-pub use ::dizzle::{Usually, Perhaps, impl_default};
-/// DSL builtins.
-#[cfg(feature = "lang")] pub mod eval;
-/// Temporal dimension.
-#[cfg(feature = "time")] pub mod time;
-/// Circuit breaker for main loop.
-#[cfg(feature = "play")] pub mod exit;
-/// Thread management.
-#[cfg(feature = "play")] pub mod task;
-/// Integration with JACK audio backend.
-#[cfg(feature = "sing")] pub mod sing;
-/// Generic drawing utilities.
-#[cfg(feature = "draw")] pub mod draw;
-/// Spatial dimension.
-#[cfg(feature = "draw")] pub mod space;
-/// Color handling.
-#[cfg(feature = "draw")] pub mod color;
-/// Text handling.
-#[cfg(feature = "text")] pub mod text;
-/// Terminal output.
-#[cfg(feature = "term")] pub mod term;
+macro_rules! features {
+    ($($feature:literal: [ $($module:ident),* ]),*) => {
+        $(
+            $(
+                #[cfg(feature = $feature)] mod $module;
+                #[cfg(feature = $feature)] pub use $module::*;
+            )*
+        )*
+    }
+}
+
+#[cfg(feature = "lang")] pub use ::dizzle::{Usually, Perhaps, impl_default};
+
+features! {
+    "lang": [ eval ],
+    "time": [ time ],
+    "play": [ exit, task ],
+    "sing": [ sing ],
+    "draw": [ draw, space, layout, color ],
+    "text": [ text ],
+    "term": [ term ]
+}
 
 /// Define a trait an implement it for various mutation-enabled wrapper types. */
 #[macro_export] macro_rules! flex_trait_mut (