Merge remote-tracking branch 'origin' into feat/pushd

revoltchat · Nov 27, 2024 · 3f58103 · 3f58103
2 parents 457683e + 4c00a7d
commit 3f58103
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/config/Cargo.toml b/crates/core/config/Cargo.toml
@@ -15,7 +15,6 @@ default = ["test"]
 
 [dependencies]
 # Utility
-dotenv = "0.15.0"
 config = "0.13.3"
 cached = "0.44.0"
 once_cell = "1.18.0"

diff --git a/crates/core/config/src/lib.rs b/crates/core/config/src/lib.rs
@@ -357,8 +357,6 @@ pub async fn config() -> Settings {
 
 /// Configure logging and common Rust variables
 pub async fn setup_logging(release: &'static str, dsn: String) -> Option<sentry::ClientInitGuard> {
-    dotenv::dotenv().ok();
-
     if std::env::var("RUST_LOG").is_err() {
         std::env::set_var("RUST_LOG", "info");
     }

diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml
@@ -16,7 +16,6 @@ redis-kiss = "0.1.4"
 lru = "0.7.0"
 url = "2.2.2"
 log = "0.4.11"
-dotenv = "0.15.0"
 dashmap = "5.2.0"
 linkify = "0.6.0"
 once_cell = "1.17.1"

diff --git a/crates/delta/src/util/test.rs b/crates/delta/src/util/test.rs
@@ -20,8 +20,8 @@ pub struct TestHarness {
 
 impl TestHarness {
     pub async fn new() -> TestHarness {
-        dotenv::dotenv().ok();
         let config = revolt_config::config().await;
+
         let client = Client::tracked(crate::web().await)
             .await
             .expect("valid rocket instance");