rework commit chain 3

Author: rohrsben

Cargo.lock

@@ -21,4 +21,4 @@ png = "0.18.0"
 rand = "0.9.2"
 thiserror = "2.0.17"
 tracing = "0.1.44"
-tracing-subscriber = "0.3.22"
+tracing-subscriber = { version = "0.3.22", features = ["env-filter"]}

Cargo.toml

@@ -26,10 +26,10 @@ impl GradientArgs {
                     ))
                 };
 
-                let end = match parse::color(table.get::<Value>("last")?) {
+                let last = match parse::color(table.get::<Value>("last")?) {
                     Ok(color) => color,
                     Err(e) => return Err(mlua::Error::RuntimeError(
-                        format!("While processing 'gradient(end)': {e}")
+                        format!("While processing 'gradient(last)': {e}")
                     ))
                 };
 
@@ -40,7 +40,7 @@ impl GradientArgs {
                     ))
                 };
 
-                Ok(Self { start, last: end, at })
+                Ok(Self { start, last, at })
             }
             _ => Err(mlua::Error::RuntimeError(format!("While calling provided function 'gradient':\n  Expected: GradientArgs\n  Got: {}", input.type_name())))
         }

src/config/gradient.rs

@@ -32,8 +32,8 @@ fn parse_table(table: Table, loc: &Location) -> Result<Output, AppError> {
     opt_simple!(width,     uint_necessary, table, loc);
     opt_simple!(height,    uint_necessary, table, loc);
 
-    // handle offset default
-    let offset = offset.unwrap_or_else(|| offset_default());
+    // handle defaults
+    let offset = offset.unwrap_or_else(offset_default);
 
     Ok(Output {
         directory,

src/config/output.rs

@@ -4,59 +4,58 @@ mod cli;
 mod config;
 mod error;
 mod image;
+mod result;
 mod runtime;
 mod user_data;
-mod result;
 mod util;
 
-use error::AppError;
-use cli::Args;
 use clap::Parser;
+use cli::Args;
 use config::Config;
-use runtime::Runtime;
-use result::*;
-
+use error::AppError;
 use image::Image;
-
+use result::*;
+use runtime::Runtime;
 use std::{env::set_current_dir, process};
+use tracing_subscriber::EnvFilter;
+
+fn mainmain() -> Result<(), AppError> {
+    let trace_format = tracing_subscriber::fmt::format()
+        .without_time()
+        .pretty();
+    let trace_filter = EnvFilter::from_default_env();
+    tracing_subscriber::fmt()
+        .event_format(trace_format)
+        .with_env_filter(trace_filter)
+        .init();
 
-fn main() {
     let args = Args::parse();
 
-    match &args.command {
-        Some(c) => {
-            question_mark(c.run(&args));
-            process::exit(0)
-        }
-        None => {}
-    }
+    if let Some(c) = &args.command { return c.run(&args) }
 
     // TODO make dir if nonexistent? populate with default config?
     if let Err(e) = set_current_dir(config::config_dir()) {
-        println!("Failed to open configuration directory {}:\n{}", config::config_dir(), e);
-        process::exit(1)
+        return Err(AppError::Runtime(
+            format!("Failed to open configuration directory {}:\n{}", config::config_dir(), e)
+        ))
     }
 
-    let config = question_mark(Config::parse());
-    let runtime = question_mark(Runtime::from_config(config));
+    let runtime = Runtime::from_config( Config::parse()? )?;
+    let path = runtime.save_path(&args.path);
 
-    let result = ResultAnchors::new(&runtime);
-    let result = question_mark(result.to_tiles(&runtime));
-    let result = result.to_infos();
-    let result = question_mark(result.to_colors(&runtime));
-    let result = result.finalize();
+    let result = ResultAnchors::new(&runtime)
+        .to_tiles(&runtime)?
+        .to_infos()
+        .to_colors(&runtime)?
+        .finalize();
 
-    let path = runtime.save_path(&args.path);
-    question_mark(result.save(&path));
+    result.save(&path)
 }
 
-fn question_mark<T>(input: Result<T, AppError>) -> T {
-    match input {
-        Ok(result) => result,
-        Err(e) => {
-            println!("{}", e);
-            process::exit(1)
-        }
-   }
-}
+fn main() {
+    if let Err(err) = mainmain() {
+        println!("{err}");
 
+        process::exit(1)
+    }
+}

src/main.rs

@@ -77,9 +77,8 @@ impl Runtime {
             }
         };
 
-        let recipe = match tileset.recipes.get(&recipe_name) {
-            Some(recipe) => recipe,
-            None => return Err(AppError::Runtime(
+        let Some(recipe) = tileset.recipes.get(&recipe_name) else {
+            return Err(AppError::Runtime(
                 format!("No recipe found with name: {recipe_name}")
             ))
         };

src/runtime/mod.rs

@@ -1,4 +1,5 @@
 pub mod tests {
+    #![allow(dead_code)]
     use mlua::{Lua, Value};
 
     pub struct TestVal {
@@ -13,6 +14,12 @@ pub mod tests {
 
             Self { lua, val }
         }
+
+        pub fn new_with_lua(lua: Lua, input: &'static str) -> Self {
+            let val = lua.load(input).eval::<Value>().unwrap();
+
+            Self { lua, val }
+        }
     }
 }