From a878743b07d017450b03d371a598f2d2feeb5890 Mon Sep 17 00:00:00 2001 From: Ry Date: Thu, 29 Aug 2024 19:53:03 -0700 Subject: [PATCH] Fix bug with FXF generation when filename has multiple extensions --- Cargo.lock | 2 +- src/main.rs | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d5f477..7a40e30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,7 +147,7 @@ dependencies = [ [[package]] name = "fox32asm" -version = "0.4.0" +version = "0.4.1" dependencies = [ "anyhow", "lazy_static", diff --git a/src/main.rs b/src/main.rs index 68f0003..ef84741 100644 --- a/src/main.rs +++ b/src/main.rs @@ -104,14 +104,5 @@ fn main() -> anyhow::Result<()> { .parse()? .assemble()? .batchpatch_labels() - .build_binary(match output_file_name.split_once('.') { - Some((_file_name, ext)) => { - if ext == "fxf" { - BinaryType::Fxf - } else { - BinaryType::Flat - } - } - None => BinaryType::Flat, - }) + .build_binary(if output_file_name.ends_with(".fxf") { BinaryType::Fxf } else { BinaryType::Flat }) }