From 7d263b0876a9cb02077ade6a361bfe21b9ccaa72 Mon Sep 17 00:00:00 2001
From: Hailey Somerville <hailey@hails.org>
Date: Sat, 14 Sep 2024 14:30:26 +1000
Subject: [PATCH] update derive_more

---
 Cargo.lock               | 22 ++++++++++++----------
 Cargo.toml               |  2 +-
 bark-protocol/src/lib.rs |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c821648..345e227 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -389,12 +389,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -443,15 +437,23 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
  "syn 2.0.77",
+ "unicode-xid",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 6bfe00f..59719de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ bark-protocol = { path = "bark-protocol" }
 
 bitflags = { version = "2.4", features = ["bytemuck"] }
 bytemuck = { version = "1.14", features = ["derive", "must_cast"] }
-derive_more = { version = "0.99" }
+derive_more = { version = "1.0", features = ["into", "display"] }
 heapless = "0.7"
 log = "0.4"
 thiserror = "1.0"
diff --git a/bark-protocol/src/lib.rs b/bark-protocol/src/lib.rs
index 4947652..01b1ae2 100644
--- a/bark-protocol/src/lib.rs
+++ b/bark-protocol/src/lib.rs
@@ -13,11 +13,11 @@ pub const FRAMES_PER_PACKET: usize = 120; // 2.5ms at 48khz, compatible with opu
 pub const SAMPLES_PER_PACKET: usize = CHANNELS.0 as usize * FRAMES_PER_PACKET;
 
 #[derive(Copy, Clone, Debug, Into)]
-#[into(types(u64, u128, i64, f64))]
+#[into(u64, u128, i64, f64)]
 pub struct SampleRate(pub u32);
 
 #[derive(Copy, Clone, Debug, Into)]
-#[into(types(usize, u32, u64))]
+#[into(usize, u32, u64)]
 pub struct ChannelCount(pub u16);
 
 impl From<SampleRate> for usize {