From b9e321ff444970998a43cbf581648b3a15111804 Mon Sep 17 00:00:00 2001 From: Yuval Adam <_@yuv.al> Date: Tue, 24 Jun 2025 11:02:22 +0200 Subject: Upgrade to rust 2024 and cleanup --- Cargo.lock | 111 +-------------------------------------------- Cargo.toml | 6 +-- README.md | 4 ++ tests/integration_tests.rs | 8 ++-- 4 files changed, 11 insertions(+), 118 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 184d6e8..9b5482d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,18 +73,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "bitflags" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" - -[[package]] -name = "cfg-if" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" - [[package]] name = "clap" version = "4.5.40" @@ -133,7 +121,7 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "ditdah" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "clap", @@ -142,7 +130,6 @@ dependencies = [ "log", "rubato", "rustfft", - "tempfile", ] [[package]] @@ -168,34 +155,6 @@ dependencies = [ "log", ] -[[package]] -name = "errno" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "getrandom" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" -dependencies = [ - "cfg-if", - "libc", - "r-efi", - "wasi", -] - [[package]] name = "heck" version = "0.5.0" @@ -238,18 +197,6 @@ dependencies = [ "syn", ] -[[package]] -name = "libc" -version = "0.2.174" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" - -[[package]] -name = "linux-raw-sys" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" - [[package]] name = "log" version = "0.4.27" @@ -289,12 +236,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - [[package]] name = "once_cell_polyfill" version = "1.70.1" @@ -343,12 +284,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - [[package]] name = "realfft" version = "3.5.0" @@ -413,19 +348,6 @@ dependencies = [ "transpose", ] -[[package]] -name = "rustix" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - [[package]] name = "serde" version = "1.0.219" @@ -469,19 +391,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "tempfile" -version = "3.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" -dependencies = [ - "fastrand", - "getrandom", - "once_cell", - "rustix", - "windows-sys", -] - [[package]] name = "transpose" version = "0.2.3" @@ -504,15 +413,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" -[[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" -dependencies = [ - "wit-bindgen-rt", -] - [[package]] name = "windows-sys" version = "0.59.0" @@ -585,12 +485,3 @@ name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "wit-bindgen-rt" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags", -] diff --git a/Cargo.toml b/Cargo.toml index ae49e1a..f61925a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ditdah" -version = "0.1.0" -edition = "2021" +version = "0.2.0" +edition = "2024" license = "MIT" description = "High-performance Morse code decoder with 100% test suite accuracy" repository = "https://github.com/yuvadm/ditdah" @@ -25,5 +25,3 @@ log = "0.4.27" rubato = "0.16.2" rustfft = "6.4.0" -[dev-dependencies] -tempfile = "3.8" diff --git a/README.md b/README.md index 16f6997..b75013a 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,11 @@ cargo test ### Baseline Tests (Quick Verification) ```bash +# Basic test cargo test baseline_decoder_test -- --nocapture + +# With debug output +RUST_LOG=info cargo test baseline_decoder_test -- --nocapture ``` ### Comprehensive Test Suite diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs index 666fdb0..7661e32 100644 --- a/tests/integration_tests.rs +++ b/tests/integration_tests.rs @@ -339,20 +339,20 @@ fn baseline_decoder_test() -> Result<()> { // Clean baseline test to establish current decoder status println!("=== DECODER BASELINE TEST ==="); - std::env::set_var("RUST_LOG", "info"); + // Note: Set RUST_LOG=info environment variable to see decoder output during testing env_logger::try_init().ok(); let generator = MorseGenerator::new(12000, 600.0, 20.0); let test_cases = [ ("EEEE", "4 dots"), - ("TTTT", "4 dashes"), + ("TTTT", "4 dashes"), ("ETET", "dot-dash-dot-dash"), ]; for (i, (test_text, description)) in test_cases.iter().enumerate() { println!("\n--- Test {}: {} ({}) ---", i + 1, test_text, description); - + let temp_file = format!("baseline_test_{}.wav", i); generator.generate_wav_file(test_text, &temp_file)?; let decoded = decode_wav_file(&temp_file)?; @@ -362,7 +362,7 @@ fn baseline_decoder_test() -> Result<()> { decoded, decoded == *test_text ); - + // Clean up immediately std::fs::remove_file(&temp_file).ok(); } -- cgit v1.3.1