From 88edf8d799f54677410580f24b98c47597513f46 Mon Sep 17 00:00:00 2001
From: Thomas Karpiniec <tom.karpiniec@outlook.com>
Date: Wed, 4 Jun 2025 20:45:26 +1000
Subject: [PATCH] Update crates to 2024 edition

---
 m17app/Cargo.toml                 | 2 +-
 m17codec2/Cargo.toml              | 2 +-
 m17core/Cargo.toml                | 2 +-
 m17core/src/tnc.rs                | 6 +++---
 tools/m17rt-demod/Cargo.toml      | 3 +--
 tools/m17rt-mod/Cargo.toml        | 2 +-
 tools/m17rt-rxpacket/Cargo.toml   | 2 +-
 tools/m17rt-soundcards/Cargo.toml | 2 +-
 tools/m17rt-txpacket/Cargo.toml   | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/m17app/Cargo.toml b/m17app/Cargo.toml
index 4c2817f..5a0e621 100644
--- a/m17app/Cargo.toml
+++ b/m17app/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "m17app"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 keywords = ["amateur", "radio", "m17", "ham"]
 license = "MIT"
 authors = ["Thomas Karpiniec <tom.karpiniec@outlook.com"]
diff --git a/m17codec2/Cargo.toml b/m17codec2/Cargo.toml
index 29f8323..e7ef25f 100644
--- a/m17codec2/Cargo.toml
+++ b/m17codec2/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "m17codec2"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 keywords = ["amateur", "radio", "m17", "ham"]
 license = "MIT"
 authors = ["Thomas Karpiniec <tom.karpiniec@outlook.com"]
diff --git a/m17core/Cargo.toml b/m17core/Cargo.toml
index 42fab94..75f1c0c 100644
--- a/m17core/Cargo.toml
+++ b/m17core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "m17core"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 keywords = ["amateur", "radio", "m17", "ham", "no_std"]
 license = "MIT"
 authors = ["Thomas Karpiniec <tom.karpiniec@outlook.com"]
diff --git a/m17core/src/tnc.rs b/m17core/src/tnc.rs
index 93f1420..7e01e83 100644
--- a/m17core/src/tnc.rs
+++ b/m17core/src/tnc.rs
@@ -130,7 +130,7 @@ impl SoftTnc {
             }
             Frame::Packet(packet) => {
                 match &mut self.state {
-                    State::RxPacket(ref mut rx) => {
+                    State::RxPacket(rx) => {
                         match packet.counter {
                             PacketFrameCounter::Frame { index } => {
                                 if index == rx.count && index < 32 {
@@ -164,7 +164,7 @@ impl SoftTnc {
             }
             Frame::Stream(stream) => {
                 match &mut self.state {
-                    State::RxStream(ref mut rx) => {
+                    State::RxStream(rx) => {
                         // TODO: consider wraparound from 0x7fff
                         if stream.frame_number < rx.index {
                             let mut lich = LichCollection::new();
@@ -181,7 +181,7 @@ impl SoftTnc {
                             }
                         }
                     }
-                    State::RxAcquiringStream(ref mut rx) => {
+                    State::RxAcquiringStream(rx) => {
                         rx.lich.set_segment(stream.lich_idx, stream.lich_part);
                         if let Some(maybe_lsf) = rx.lich.try_assemble() {
                             let lsf = LsfFrame(maybe_lsf);
diff --git a/tools/m17rt-demod/Cargo.toml b/tools/m17rt-demod/Cargo.toml
index b4c091d..6e60d4a 100644
--- a/tools/m17rt-demod/Cargo.toml
+++ b/tools/m17rt-demod/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "m17rt-demod"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 authors = ["Thomas Karpiniec <tom.karpiniec@outlook.com"]
 publish = false
@@ -11,6 +11,5 @@ m17core = { path = "../../m17core" }
 m17app = { path = "../../m17app" }
 m17codec2 = { path = "../../m17codec2" }
 
-cpal = "0.15.3"
 env_logger = "0.11.6"
 log = "0.4.22"
diff --git a/tools/m17rt-mod/Cargo.toml b/tools/m17rt-mod/Cargo.toml
index a552a25..2733fba 100644
--- a/tools/m17rt-mod/Cargo.toml
+++ b/tools/m17rt-mod/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "m17rt-mod"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 authors = ["Thomas Karpiniec <tom.karpiniec@outlook.com"]
 publish = false
diff --git a/tools/m17rt-rxpacket/Cargo.toml b/tools/m17rt-rxpacket/Cargo.toml
index 2cab9a5..d53b752 100644
--- a/tools/m17rt-rxpacket/Cargo.toml
+++ b/tools/m17rt-rxpacket/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "m17rt-rxpacket"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 authors = ["Thomas Karpiniec <tom.karpiniec@outlook.com"]
 publish = false
diff --git a/tools/m17rt-soundcards/Cargo.toml b/tools/m17rt-soundcards/Cargo.toml
index 02831ef..ea74d99 100644
--- a/tools/m17rt-soundcards/Cargo.toml
+++ b/tools/m17rt-soundcards/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "m17rt-soundcards"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 authors = ["Thomas Karpiniec <tom.karpiniec@outlook.com"]
 publish = false
diff --git a/tools/m17rt-txpacket/Cargo.toml b/tools/m17rt-txpacket/Cargo.toml
index 4f0283c..71c0ad5 100644
--- a/tools/m17rt-txpacket/Cargo.toml
+++ b/tools/m17rt-txpacket/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "m17rt-txpacket"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 authors = ["Thomas Karpiniec <tom.karpiniec@outlook.com"]
 publish = false
-- 
2.39.5