Update crates to 2024 edition

diff --git a/m17app/Cargo.toml b/m17app/Cargo.toml
index 4c2817f0b3b14714a490443ba5bc73a8ded9a142..5a0e621afe534e91a2849f3a1a248cdf72a0e983 100644 (file)
--- 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 29f83237fec5ae94cbf251040cdab244af2ae606..e7ef25fbe377e5eca46b52780bf97a0395617af7 100644 (file)
--- 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 42fab9461e86b12dcc35fb56e946647165868f20..75f1c0c5bd55300cc72c54432b13da42d4a322c5 100644 (file)
--- 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 93f14203e956ee8ca3f517b281c646a98323082e..7e01e8348232d6c9a3370d7d1574d018a4a13d71 100644 (file)
--- 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 b4c091d51f5358e4cd2f37c9c8a589e626197ca4..6e60d4a53cf30720f442fba58efbc0791c2d387c 100644 (file)
--- 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 a552a253ddc1bca621bc5eaf79f7059d592b14a4..2733fba5f2ec1a2899263c5f3cfa3fa089811ed7 100644 (file)
--- 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 2cab9a56b144f344885a2ebd7c3378e6cfa3e389..d53b7524dc5e0cea9595b073621e2aed53c6e401 100644 (file)
--- 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 02831ef5ffcccf16cb064c80d32d7588632e626d..ea74d99ca364ded6db0b807d0172dd0dcbcc81ae 100644 (file)
--- 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 4f0283c9288162b7c3c3892f7c3b48d84a73a4e4..71c0ad5de0e8819ba45f400f3d489dd79fdb8dab 100644 (file)
--- 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