fix conflicts

examples/without-db/Cargo.toml

@@ -16,7 +16,6 @@ eyre = "*"
 tokio = { version = "1.33.0", features = ["full"] }
 async-trait = "0.1.74"
 tracing = "0.1.40"
-chrono = "*"
 validator = { version = "*" }
 
 axum = "*"

src/cli.rs

@@ -235,6 +235,10 @@ pub async fn main<H: Hooks, M: MigratorTrait>() -> eyre::Result<()> {
 #[cfg(not(feature = "with-db"))]
 pub async fn main<H: Hooks>() -> eyre::Result<()> {
     let cli = Cli::parse();
+    let environment = cli
+        .environment
+        .or_else(resolve_from_env)
+        .unwrap_or_else(|| "development".to_string());
     match cli.command {
         Commands::Start {
             worker,
@@ -248,15 +252,15 @@ pub async fn main<H: Hooks>() -> eyre::Result<()> {
                 StartMode::ServerOnly
             };
 
-            let boot_result = create_app::<H>(start_mode, &cli.environment).await?;
+            let boot_result = create_app::<H>(start_mode, &environment).await?;
             start(boot_result).await?;
         }
         Commands::Task { name, params } => {
             let mut hash = BTreeMap::new();
             for (k, v) in params {
                 hash.insert(k, v);
             }
-            let app_context = create_context(&cli.environment).await?;
+            let app_context = create_context(&environment).await?;
             run_task::<H>(&app_context, name.as_ref(), &hash).await?;
         }
         Commands::Generate { component } => {

src/environment.rs

@@ -20,6 +20,7 @@ use serde_variant::to_variant_name;
 use super::config::Config;
 use crate::Result;
 
+#[must_use]
 pub fn resolve_from_env() -> Option<String> {
     std::env::var("RR_ENV")
         .or_else(|_| std::env::var("RAILS_ENV"))