From dcc76c8585338629940beb1781502c95fe620e00 Mon Sep 17 00:00:00 2001 From: Cutieguwu Date: Mon, 7 Apr 2025 11:25:42 -0400 Subject: [PATCH] Various cleanups --- gamelog.ron | 12 ++++++------ gamelog/Cargo.lock | 2 +- gamelog/Cargo.toml | 2 +- gamelog/src/game.rs | 5 +++-- gamelog/src/lib.rs | 2 +- miller/Cargo.lock | 2 +- miller/src/main.rs | 6 +----- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/gamelog.ron b/gamelog.ron index c4c05a2..d3f5687 100644 --- a/gamelog.ron +++ b/gamelog.ron @@ -4,7 +4,7 @@ [ Game( - version: "0.5.1", + version: "0.6.0", flags: [Interval(2), IgnoreScore], periods: [ Period( @@ -189,7 +189,7 @@ ] ), Game( - version: "0.5.1", + version: "0.6.0", flags: [Interval(2), IgnoreScore], periods: [ Period( @@ -343,7 +343,7 @@ ] ), Game( - version: "0.5.1", + version: "0.6.0", flags: [Interval(2)], periods: [ Period( @@ -556,7 +556,7 @@ ] ), Game( - version: "0.5.1", + version: "0.6.0", flags: [Interval(2)], periods: [ Period( @@ -766,7 +766,7 @@ ] ), Game( - version: "0.5.1", + version: "0.6.0", flags: [Interval(2)], periods: [ Period( @@ -993,7 +993,7 @@ Game( // TexasAnM were opponents, but not recorded as // they were not present; Miller played in place. - version: "0.5.1", + version: "0.6.0", flags: [Interval(2), IgnoreTeam(TexasAnM)], periods: [ Period( diff --git a/gamelog/Cargo.lock b/gamelog/Cargo.lock index 362722b..29cd030 100644 --- a/gamelog/Cargo.lock +++ b/gamelog/Cargo.lock @@ -19,7 +19,7 @@ dependencies = [ [[package]] name = "gamelog" -version = "0.5.1" +version = "0.6.0" dependencies = [ "ron", "semver", diff --git a/gamelog/Cargo.toml b/gamelog/Cargo.toml index f0ecc0c..9888864 100644 --- a/gamelog/Cargo.toml +++ b/gamelog/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gamelog" -version = "0.5.1" +version = "0.6.0" edition = "2024" [dependencies] diff --git a/gamelog/src/game.rs b/gamelog/src/game.rs index 1c085c3..2ed7852 100644 --- a/gamelog/src/game.rs +++ b/gamelog/src/game.rs @@ -142,6 +142,7 @@ impl Game { } pub fn penalties(&self, team: Team) -> usize { + // Knock down nesting? self.periods .iter() .filter_map(|period| { @@ -405,7 +406,7 @@ mod tests { ], }; - assert!(dbg!(game.deltas(Team::Nebraska)) == vec![10_i8, -3_i8, 5_i8, -2_i8, 12_i8]); - assert!(dbg!(game.deltas(Team::ArizonaState)) == vec![10_i8, 0_i8]); + assert!(game.deltas(Team::Nebraska) == vec![10_i8, -3_i8, 5_i8, -2_i8, 12_i8]); + assert!(game.deltas(Team::ArizonaState) == vec![10_i8, 0_i8]); } } diff --git a/gamelog/src/lib.rs b/gamelog/src/lib.rs index 81f722f..e625fa5 100644 --- a/gamelog/src/lib.rs +++ b/gamelog/src/lib.rs @@ -9,7 +9,7 @@ mod play; mod terrain; #[allow(unused)] -pub const MIN_VER: semver::Version = semver::Version::new(0, 5, 0); +pub const MIN_VER: semver::Version = semver::Version::new(0, 6, 0); // I'm lazy. pub use action::*; diff --git a/miller/Cargo.lock b/miller/Cargo.lock index 2fb65ea..4990f65 100644 --- a/miller/Cargo.lock +++ b/miller/Cargo.lock @@ -64,7 +64,7 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "gamelog" -version = "0.5.1" +version = "0.6.0" dependencies = [ "ron", "semver", diff --git a/miller/src/main.rs b/miller/src/main.rs index 461bd4c..411564e 100644 --- a/miller/src/main.rs +++ b/miller/src/main.rs @@ -11,11 +11,7 @@ struct Args { short, long, value_hint = clap::ValueHint::DirPath, - default_value = format!("{}/../templates/logfile.ron", std::env::current_dir() - .expect("Failed to get current working dir.") - .into_os_string() - .to_str() - .unwrap()) + default_value = format!("../templates/logfile.ron") )] logfile_path: PathBuf,