refactor(whirl): move whirl struct to lib

3 files changed, 35 insertions, 38 deletions

diff --git a/crates/whirl/src/lib.rs b/crates/whirl/src/lib.rs
index 10061fd..47e0ecb 100644
--- a/crates/whirl/src/lib.rs
+++ b/crates/whirl/src/lib.rs
@@ -25,4 +25,37 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 pub mod cli;
-pub mod whirl;
+
+use whirl_config::Config;
+
+pub struct Whirl;
+impl Whirl {
+  pub async fn splash() -> Result<(), Box<dyn std::error::Error>> {
+    // Environment
+    std::env::set_var("DATABASE_URL", "whirl.sqlite3");
+
+    // Logging
+    dotenv::dotenv().ok();
+    human_panic::setup_panic!();
+    if Config::get().whirlsplash.log.enable {
+      let logger = flexi_logger::Logger::with_str(whirl_common::log::calculate_log_level());
+      if std::env::var("LOG_FILE").unwrap_or_else(|_| "true".to_string()) == "false"
+        || !whirl_config::Config::get().whirlsplash.log.file
+        || std::env::args().collect::<Vec<_>>()[1] == "clean"
+      // Cheeky as all hell.
+      {
+        logger.start()?;
+      } else {
+        logger
+          .print_message()
+          .log_to_file()
+          .directory("log")
+          .start()?;
+      }
+    }
+
+    crate::cli::Cli::execute().await.unwrap();
+
+    Ok(())
+  }
+}
diff --git a/crates/whirl/src/main.rs b/crates/whirl/src/main.rs
index 8aa7ceb..dabc574 100644
--- a/crates/whirl/src/main.rs
+++ b/crates/whirl/src/main.rs
@@ -2,4 +2,4 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> { whirl::whirl::Whirl::splash().await }
+async fn main() -> Result<(), Box<dyn std::error::Error>> { whirl::Whirl::splash().await }
diff --git a/crates/whirl/src/whirl.rs b/crates/whirl/src/whirl.rs
deleted file mode 100644
index f422c4f..0000000
--- a/crates/whirl/src/whirl.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective
-// SPDX-License-Identifier: GPL-3.0-only
-
-use whirl_config::Config;
-
-pub struct Whirl;
-impl Whirl {
-  pub async fn splash() -> Result<(), Box<dyn std::error::Error>> {
-    // Environment
-    std::env::set_var("DATABASE_URL", "whirl.sqlite3");
-
-    // Logging
-    dotenv::dotenv().ok();
-    human_panic::setup_panic!();
-    if Config::get().whirlsplash.log.enable {
-      let logger = flexi_logger::Logger::with_str(whirl_common::log::calculate_log_level());
-      if std::env::var("LOG_FILE").unwrap_or_else(|_| "true".to_string()) == "false"
-        || !whirl_config::Config::get().whirlsplash.log.file
-        || std::env::args().collect::<Vec<_>>()[1] == "clean"
-      // Cheeky as all hell.
-      {
-        logger.start()?;
-      } else {
-        logger
-          .print_message()
-          .log_to_file()
-          .directory("log")
-          .start()?;
-      }
-    }
-
-    crate::cli::Cli::execute().await.unwrap();
-
-    Ok(())
-  }
-}