From e2bd82d9ac9e34034bc156bca381b19b212cf1b6 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 6 May 2024 13:05:04 -0500
Subject: [PATCH] Merge

---
 src/main.rs    | 22 ++++++++++++++++++++--
 src/observe.rs | 12 ------------
 src/prelude.rs |  2 --
 3 files changed, 20 insertions(+), 16 deletions(-)
 delete mode 100644 src/observe.rs
 delete mode 100644 src/prelude.rs

diff --git a/src/main.rs b/src/main.rs
index 2be2cf2..fde2adc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,8 +6,26 @@ use std::{
 use tokio::sync::mpsc::channel;
 
 use notify::{Config, RecommendedWatcher, RecursiveMode, Watcher};
-mod observe;
-mod prelude;
+
+mod observe {
+    use tracing::level_filters::LevelFilter;
+    use tracing_subscriber::EnvFilter;
+
+    pub fn setup_logging() {
+        color_eyre::install().expect("Failed to install color_eyre");
+
+        let filter = EnvFilter::builder()
+            .with_default_directive(LevelFilter::TRACE.into())
+            .parse_lossy("info,chatbot=trace");
+
+        tracing_subscriber::fmt().with_env_filter(filter).init();
+    }
+}
+
+mod prelude {
+    #![allow(unused_imports)]
+    pub use tracing::{debug, error, info, warn};
+}
 
 use axum::{serve, Router};
 use tower_http::services::ServeDir;
diff --git a/src/observe.rs b/src/observe.rs
deleted file mode 100644
index 684704a..0000000
--- a/src/observe.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use tracing::level_filters::LevelFilter;
-use tracing_subscriber::EnvFilter;
-
-pub fn setup_logging() {
-    color_eyre::install().expect("Failed to install color_eyre");
-
-    let filter = EnvFilter::builder()
-        .with_default_directive(LevelFilter::TRACE.into())
-        .parse_lossy("info,chatbot=trace");
-
-    tracing_subscriber::fmt().with_env_filter(filter).init();
-}
diff --git a/src/prelude.rs b/src/prelude.rs
deleted file mode 100644
index 5a8681c..0000000
--- a/src/prelude.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#![allow(unused_imports)]
-pub use tracing::{debug, error, info, warn};