Updated dependencies and switched to 2024 edition

Author: G2-Games

.cargo/config.toml

@@ -1,5 +1,5 @@
 [target.'cfg(target_family = "wasm")']
-rustflags = ["--cfg=web_sys_unstable_apis"]
+rustflags = ["--cfg=web_sys_unstable_apis", "--cfg=getrandom_backend=\"wasm_js\""]
 
 # Enable for testing WASM-only stuff
 [build]

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "minidisc"
 version = "0.1.3"
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/G2-Games/minidisc-rs/"
 repository = "https://github.com/G2-Games/minidisc-rs/"
 documentation = "https://docs.rs/cross_usb"
@@ -28,30 +28,29 @@ targets = [
 crate-type = ["cdylib", "rlib"]
 
 [dev-dependencies]
-tokio-test = "0.4.3"
+tokio-test = "0.4"
 
 [dependencies]
-diacritics = "0.2.0"
-encoding_rs = "0.8.33"
-nofmt = "1.0.0"
-once_cell = "1.18.0"
-unicode-normalization = "0.1.22"
-regex = "1.10"
+diacritics = "0.2"
+encoding_rs = "0.8"
+nofmt = "1.0"
+unicode-normalization = "0.1"
+regex = "1.11"
 cross_usb = "0.4"
-num-derive = "0.4.2"
-num-traits = "0.2.14"
-rand = "0.8.5"
-getrandom = { version = "0.2", features = ["js"] }
+num-derive = "0.4"
+num-traits = "0.2"
+rand = "0.9"
+getrandom = { version = "0.3", features = ["wasm_js"] }
 des = "0.8"
 cbc = "0.1"
 ecb = "0.1"
-tokio = { version = "1.36", features = ["full", "sync"] }
-g2-unicode-jp = "0.4.1"
-thiserror = "1.0.57"
-phf = { version = "0.11.2", features = ["phf_macros", "macros"] }
-byteorder = "1.5.0"
-log = "0.4.22"
+tokio = { version = "1.36", features = ["sync"] }
+g2-unicode-jp = "0.4"
+thiserror = "2.0"
+phf = { version = "0.12", features = ["phf_macros", "macros"] }
+byteorder = "1.5"
+log = "0.4"
 
 [target.'cfg(target_family = "wasm")'.dependencies]
 gloo = { version = "0.11.0", features = ["futures", "worker"] }
-futures = "0.3.30"
+futures = "0.3"

src/main.rs

@@ -1,7 +1,7 @@
 #![cfg_attr(debug_assertions, allow(dead_code))]
+use std::sync::LazyLock;
 use std::time::Duration;
 
-use once_cell::sync::Lazy;
 use thiserror::Error;
 
 // USB stuff
@@ -67,7 +67,7 @@ pub static DEVICE_IDS: &[DeviceId] = &[
 }
 
 /// Device IDs for use with [cross_usb]
-pub static DEVICE_IDS_CROSSUSB: Lazy<Box<[cross_usb::DeviceFilter]>> = Lazy::new(|| {
+pub static DEVICE_IDS_CROSSUSB: LazyLock<Box<[cross_usb::DeviceFilter]>> = LazyLock::new(|| {
     DEVICE_IDS
         .iter()
         .map(|d| {

src/netmd/base.rs

@@ -36,7 +36,7 @@ impl Encryptor {
 
             // Create the random key
             let mut random_key = [0u8; 8];
-            rand::thread_rng().fill_bytes(&mut random_key);
+            rand::rng().fill_bytes(&mut random_key);
 
             // Encrypt it with the kek
             let mut encrypted_random_key = random_key;
@@ -101,7 +101,7 @@ impl Encryptor {
 
         // Create the random key
         let mut random_key = [0u8; 8];
-        rand::thread_rng().fill_bytes(&mut random_key);
+        rand::rng().fill_bytes(&mut random_key);
 
         // Encrypt it with the kek
         let mut encrypted_random_key = random_key;

src/netmd/encryption.rs

@@ -1958,7 +1958,7 @@ impl<'a> MDSession<'a> {
             )
             .await?;
         let mut nonce = vec![0u8; 8];
-        rand::thread_rng().fill_bytes(&mut nonce);
+        rand::rng().fill_bytes(&mut nonce);
 
         let mut devnonce = self.md.session_key_exchange(nonce.clone()).await?;
         nonce.append(&mut devnonce);