From 94704a5558d966787f144ca30395fc3b6842621a Mon Sep 17 00:00:00 2001 From: Cutieguwu Date: Wed, 26 Mar 2025 20:53:41 -0400 Subject: [PATCH] Fix formatting and LogFile loading. --- src/main.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 915c6ee..4378b0f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,9 +1,10 @@ mod calculator; +mod error; mod gamelog; use clap::Parser; use core::panic; -use gamelog::{GAMELOG_MIN_VER, LogFile}; +use gamelog::LogFile; use std::path::PathBuf; #[derive(Debug, Parser)] @@ -13,9 +14,11 @@ struct Args { short, long, value_hint = clap::ValueHint::DirPath, - default_value = dbg!(format!("{}/templates/logfile.ron", std::env::current_dir() + default_value = format!("{}/templates/logfile.ron", std::env::current_dir() .expect("Failed to get current working dir.") - .into_os_string().to_str().unwrap())) + .into_os_string() + .to_str() + .unwrap()) )] logfile_path: PathBuf, } @@ -23,14 +26,14 @@ struct Args { fn main() { let config = Args::parse(); - let mut log: LogFile = { + let log: LogFile = { let file = match LogFile::try_from(config.logfile_path) { Ok(f) => f, Err(err) => panic!("Error: Failed to open logfile: {:?}", err), }; match file.ensure_compatible() { - Ok(f) => f.try_into().expect(msg), + Ok(f) => f, Err(err) => panic!("Error: Failed to ensure logfile compatibility: {:?}", err), } };