From dcb7770acb5867c704c66a38432507bf643b2541 Mon Sep 17 00:00:00 2001
From: Cameron Garnham <me@da2ce7.com>
Date: Sat, 24 Aug 2024 17:58:11 +0200
Subject: [PATCH 1/3] chore: update contrib bencode

---
 Cargo.lock                                   |  12 +-
 contrib/bencode/Cargo.toml                   |   6 +-
 contrib/bencode/src/access/convert.rs        |  78 ++++------
 contrib/bencode/src/access/dict.rs           |   6 +-
 contrib/bencode/src/access/list.rs           |   8 --
 contrib/bencode/src/error.rs                 | 143 ++++++-------------
 contrib/bencode/src/lib.rs                   |   6 +-
 contrib/bencode/src/mutable/encode.rs        |   2 +
 contrib/bencode/src/reference/bencode_ref.rs |   7 +-
 contrib/bencode/src/reference/decode.rs      |  81 ++++-------
 contrib/bencode/{test => tests}/mod.rs       |   0
 11 files changed, 117 insertions(+), 232 deletions(-)
 rename contrib/bencode/{test => tests}/mod.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 504a5bb17..057e1f5db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1274,16 +1274,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "backtrace",
- "version_check",
-]
-
 [[package]]
 name = "event-listener"
 version = "2.5.3"
@@ -4021,7 +4011,7 @@ name = "torrust-tracker-contrib-bencode"
 version = "3.0.0-beta-develop"
 dependencies = [
  "criterion",
- "error-chain",
+ "thiserror",
 ]
 
 [[package]]
diff --git a/contrib/bencode/Cargo.toml b/contrib/bencode/Cargo.toml
index f7bab0585..e25a9b64f 100644
--- a/contrib/bencode/Cargo.toml
+++ b/contrib/bencode/Cargo.toml
@@ -16,15 +16,11 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
-error-chain = "0"
+thiserror = "1"
 
 [dev-dependencies]
 criterion = "0"
 
-[[test]]
-name = "test"
-path = "test/mod.rs"
-
 [[bench]]
 harness = false
 name = "bencode_benchmark"
diff --git a/contrib/bencode/src/access/convert.rs b/contrib/bencode/src/access/convert.rs
index 42b04f267..b2eb41d15 100644
--- a/contrib/bencode/src/access/convert.rs
+++ b/contrib/bencode/src/access/convert.rs
@@ -2,7 +2,7 @@
 use crate::access::bencode::{BRefAccess, BRefAccessExt};
 use crate::access::dict::BDictAccess;
 use crate::access::list::BListAccess;
-use crate::{BencodeConvertError, BencodeConvertErrorKind};
+use crate::BencodeConvertError;
 
 /// Trait for extended casting of bencode objects and converting conversion errors into application specific errors.
 pub trait BConvertExt: BConvert {
@@ -12,12 +12,10 @@ pub trait BConvertExt: BConvert {
         B: BRefAccessExt<'a>,
         E: AsRef<[u8]>,
     {
-        bencode.bytes_ext().ok_or(
-            self.handle_error(BencodeConvertError::from_kind(BencodeConvertErrorKind::WrongType {
-                key: error_key.as_ref().to_owned(),
-                expected_type: "Bytes".to_owned(),
-            })),
-        )
+        bencode.bytes_ext().ok_or(self.handle_error(BencodeConvertError::WrongType {
+            key: error_key.as_ref().to_owned(),
+            expected_type: "Bytes".to_owned(),
+        }))
     }
 
     /// See `BConvert::convert_str`.
@@ -26,12 +24,10 @@ pub trait BConvertExt: BConvert {
         B: BRefAccessExt<'a>,
         E: AsRef<[u8]>,
     {
-        bencode.str_ext().ok_or(
-            self.handle_error(BencodeConvertError::from_kind(BencodeConvertErrorKind::WrongType {
-                key: error_key.as_ref().to_owned(),
-                expected_type: "UTF-8 Bytes".to_owned(),
-            })),
-        )
+        bencode.str_ext().ok_or(self.handle_error(BencodeConvertError::WrongType {
+            key: error_key.as_ref().to_owned(),
+            expected_type: "UTF-8 Bytes".to_owned(),
+        }))
     }
 
     /// See `BConvert::lookup_and_convert_bytes`.
@@ -77,12 +73,10 @@ pub trait BConvert {
         B: BRefAccess,
         E: AsRef<[u8]>,
     {
-        bencode.int().ok_or(
-            self.handle_error(BencodeConvertError::from_kind(BencodeConvertErrorKind::WrongType {
-                key: error_key.as_ref().to_owned(),
-                expected_type: "Integer".to_owned(),
-            })),
-        )
+        bencode.int().ok_or(self.handle_error(BencodeConvertError::WrongType {
+            key: error_key.as_ref().to_owned(),
+            expected_type: "Integer".to_owned(),
+        }))
     }
 
     /// Attempt to convert the given bencode value into bytes.
@@ -93,12 +87,10 @@ pub trait BConvert {
         B: BRefAccess,
         E: AsRef<[u8]>,
     {
-        bencode.bytes().ok_or(
-            self.handle_error(BencodeConvertError::from_kind(BencodeConvertErrorKind::WrongType {
-                key: error_key.as_ref().to_owned(),
-                expected_type: "Bytes".to_owned(),
-            })),
-        )
+        bencode.bytes().ok_or(self.handle_error(BencodeConvertError::WrongType {
+            key: error_key.as_ref().to_owned(),
+            expected_type: "Bytes".to_owned(),
+        }))
     }
 
     /// Attempt to convert the given bencode value into a UTF-8 string.
@@ -109,12 +101,10 @@ pub trait BConvert {
         B: BRefAccess,
         E: AsRef<[u8]>,
     {
-        bencode.str().ok_or(
-            self.handle_error(BencodeConvertError::from_kind(BencodeConvertErrorKind::WrongType {
-                key: error_key.as_ref().to_owned(),
-                expected_type: "UTF-8 Bytes".to_owned(),
-            })),
-        )
+        bencode.str().ok_or(self.handle_error(BencodeConvertError::WrongType {
+            key: error_key.as_ref().to_owned(),
+            expected_type: "UTF-8 Bytes".to_owned(),
+        }))
     }
 
     /// Attempt to convert the given bencode value into a list.
@@ -125,12 +115,10 @@ pub trait BConvert {
         B: BRefAccess,
         E: AsRef<[u8]>,
     {
-        bencode.list().ok_or(
-            self.handle_error(BencodeConvertError::from_kind(BencodeConvertErrorKind::WrongType {
-                key: error_key.as_ref().to_owned(),
-                expected_type: "List".to_owned(),
-            })),
-        )
+        bencode.list().ok_or(self.handle_error(BencodeConvertError::WrongType {
+            key: error_key.as_ref().to_owned(),
+            expected_type: "List".to_owned(),
+        }))
     }
 
     /// Attempt to convert the given bencode value into a dictionary.
@@ -141,12 +129,10 @@ pub trait BConvert {
         B: BRefAccess,
         E: AsRef<[u8]>,
     {
-        bencode.dict().ok_or(
-            self.handle_error(BencodeConvertError::from_kind(BencodeConvertErrorKind::WrongType {
-                key: error_key.as_ref().to_owned(),
-                expected_type: "Dictionary".to_owned(),
-            })),
-        )
+        bencode.dict().ok_or(self.handle_error(BencodeConvertError::WrongType {
+            key: error_key.as_ref().to_owned(),
+            expected_type: "Dictionary".to_owned(),
+        }))
     }
 
     /// Look up a value in a dictionary of bencoded values using the given key.
@@ -159,11 +145,7 @@ pub trait BConvert {
 
         match dictionary.lookup(key_ref) {
             Some(n) => Ok(n),
-            None => Err(
-                self.handle_error(BencodeConvertError::from_kind(BencodeConvertErrorKind::MissingKey {
-                    key: key_ref.to_owned(),
-                })),
-            ),
+            None => Err(self.handle_error(BencodeConvertError::MissingKey { key: key_ref.to_owned() })),
         }
     }
 
diff --git a/contrib/bencode/src/access/dict.rs b/contrib/bencode/src/access/dict.rs
index 7efe93fc3..a3e56d1bb 100644
--- a/contrib/bencode/src/access/dict.rs
+++ b/contrib/bencode/src/access/dict.rs
@@ -21,8 +21,7 @@ pub trait BDictAccess<K, V> {
 
 impl<'a, V> BDictAccess<&'a [u8], V> for BTreeMap<&'a [u8], V> {
     fn to_list(&self) -> Vec<(&&'a [u8], &V)> {
-        #[allow(clippy::map_identity)]
-        self.iter().map(|(k, v)| (k, v)).collect()
+        self.iter().collect()
     }
 
     fn lookup(&self, key: &[u8]) -> Option<&V> {
@@ -44,8 +43,7 @@ impl<'a, V> BDictAccess<&'a [u8], V> for BTreeMap<&'a [u8], V> {
 
 impl<'a, V> BDictAccess<Cow<'a, [u8]>, V> for BTreeMap<Cow<'a, [u8]>, V> {
     fn to_list(&self) -> Vec<(&Cow<'a, [u8]>, &V)> {
-        #[allow(clippy::map_identity)]
-        self.iter().map(|(k, v)| (k, v)).collect()
+        self.iter().collect()
     }
 
     fn lookup(&self, key: &[u8]) -> Option<&V> {
diff --git a/contrib/bencode/src/access/list.rs b/contrib/bencode/src/access/list.rs
index c6d1fc407..840bffa1e 100644
--- a/contrib/bencode/src/access/list.rs
+++ b/contrib/bencode/src/access/list.rs
@@ -45,14 +45,6 @@ impl<'a, V: 'a> IndexMut<usize> for &'a mut dyn BListAccess<V> {
     }
 }
 
-impl<'a, V: 'a> dyn BListAccess<V> {
-    pub fn iter(&'a self) -> impl Iterator<Item = &'a V> {
-        self.into_iter()
-    }
-}
-
-#[allow(unknown_lints)]
-#[allow(clippy::into_iter_without_iter)]
 impl<'a, V: 'a> IntoIterator for &'a dyn BListAccess<V> {
     type Item = &'a V;
     type IntoIter = BListIter<'a, V>;
diff --git a/contrib/bencode/src/error.rs b/contrib/bencode/src/error.rs
index 54c589e3e..6e661a068 100644
--- a/contrib/bencode/src/error.rs
+++ b/contrib/bencode/src/error.rs
@@ -1,103 +1,52 @@
-#![allow(unknown_lints)]
-#![allow(clippy::iter_without_into_iter)]
-use error_chain::error_chain;
+use thiserror::Error;
 
-error_chain! {
-    types {
-        BencodeParseError, BencodeParseErrorKind, BencodeParseResultExt, BencodeParseResult;
-    }
+#[allow(clippy::module_name_repetitions)]
+#[derive(Error, Debug)]
+pub enum BencodeParseError {
+    #[error("Incomplete Number Of Bytes At {pos}")]
+    BytesEmpty { pos: usize },
 
-    errors {
-        BytesEmpty {
-            pos: usize
-         } {
-            description("Incomplete Number Of Bytes")
-            display("Incomplete Number Of Bytes At {:?}", pos)
-        }
-        InvalidByte {
-            pos: usize
-         } {
-            description("Invalid Byte Found")
-            display("Invalid Byte Found At {:?}", pos)
-        }
-        InvalidIntNoDelimiter {
-            pos: usize
-         } {
-            description("Invalid Integer Found With No Delimiter")
-            display("Invalid Integer Found With No Delimiter At {:?}", pos)
-        }
-        InvalidIntNegativeZero {
-            pos: usize
-         } {
-            description("Invalid Integer Found As Negative Zero")
-            display("Invalid Integer Found As Negative Zero At {:?}", pos)
-        }
-        InvalidIntZeroPadding {
-            pos: usize
-         } {
-            description("Invalid Integer Found With Zero Padding")
-            display("Invalid Integer Found With Zero Padding At {:?}", pos)
-        }
-        InvalidIntParseError {
-            pos: usize
-         } {
-            description("Invalid Integer Found To Fail Parsing")
-            display("Invalid Integer Found To Fail Parsing At {:?}", pos)
-        }
-        InvalidKeyOrdering {
-            pos: usize,
-            key: Vec<u8>
-         } {
-            description("Invalid Dictionary Key Ordering Found")
-            display("Invalid Dictionary Key Ordering Found At {:?} For Key {:?}", pos, key)
-        }
-        InvalidKeyDuplicates {
-            pos: usize,
-            key: Vec<u8>
-         } {
-            description("Invalid Dictionary Duplicate Keys Found")
-            display("Invalid Dictionary Key Found At {:?} For Key {:?}", pos, key)
-        }
-        InvalidLengthNegative {
-            pos: usize
-         } {
-            description("Invalid Byte Length Found As Negative")
-            display("Invalid Byte Length Found As Negative At {:?}", pos)
-        }
-        InvalidLengthOverflow {
-            pos: usize
-         } {
-            description("Invalid Byte Length Found To Overflow Buffer Length")
-            display("Invalid Byte Length Found To Overflow Buffer Length At {:?}", pos)
-        }
-        InvalidRecursionExceeded {
-            pos: usize,
-            max: usize
-        } {
-            description("Invalid Recursion Limit Exceeded")
-            display("Invalid Recursion Limit Exceeded At {:?} For Limit {:?}", pos, max)
-        }
-    }
+    #[error("Invalid Byte Found At {pos}")]
+    InvalidByte { pos: usize },
+
+    #[error("Invalid Integer Found With No Delimiter At {pos}")]
+    InvalidIntNoDelimiter { pos: usize },
+
+    #[error("Invalid Integer Found As Negative Zero At {pos}")]
+    InvalidIntNegativeZero { pos: usize },
+
+    #[error("Invalid Integer Found With Zero Padding At {pos}")]
+    InvalidIntZeroPadding { pos: usize },
+
+    #[error("Invalid Integer Found To Fail Parsing At {pos}")]
+    InvalidIntParseError { pos: usize },
+
+    #[error("Invalid Dictionary Key Ordering Found At {pos} For Key {key:?}")]
+    InvalidKeyOrdering { pos: usize, key: Vec<u8> },
+
+    #[error("Invalid Dictionary Key Found At {pos} For Key {key:?}")]
+    InvalidKeyDuplicates { pos: usize, key: Vec<u8> },
+
+    #[error("Invalid Byte Length Found As Negative At {pos}")]
+    InvalidLengthNegative { pos: usize },
+
+    #[error("Invalid Byte Length Found To Overflow Buffer Length At {pos}")]
+    InvalidLengthOverflow { pos: usize },
+
+    #[error("Invalid Recursion Limit Exceeded At {pos} For Limit {max}")]
+    InvalidRecursionExceeded { pos: usize, max: usize },
 }
 
-error_chain! {
-    types {
-        BencodeConvertError, BencodeConvertErrorKind, BencodeConvertResultExt, BencodeConvertResult;
-    }
+pub type BencodeParseResult<T> = Result<T, BencodeParseError>;
 
-    errors {
-        MissingKey {
-            key: Vec<u8>
-         } {
-            description("Missing Key In Bencode")
-            display("Missing Key In Bencode For {:?}", key)
-        }
-        WrongType {
-            key: Vec<u8>,
-            expected_type: String
-         } {
-            description("Wrong Type In Bencode")
-            display("Wrong Type In Bencode For {:?} Expected Type {}", key, expected_type)
-        }
-    }
+#[allow(clippy::module_name_repetitions)]
+#[derive(Error, Debug)]
+pub enum BencodeConvertError {
+    #[error("Missing Key In Bencode For {key:?}")]
+    MissingKey { key: Vec<u8> },
+
+    #[error("Wrong Type In Bencode For {key:?} Expected Type {expected_type}")]
+    WrongType { key: Vec<u8>, expected_type: String },
 }
+
+pub type BencodeConvertResult<T> = Result<T, BencodeConvertError>;
diff --git a/contrib/bencode/src/lib.rs b/contrib/bencode/src/lib.rs
index 78e113b66..09aaa6867 100644
--- a/contrib/bencode/src/lib.rs
+++ b/contrib/bencode/src/lib.rs
@@ -7,7 +7,6 @@
 //! ```rust
 //!     extern crate bencode;
 //!
-//!     use std::default::Default;
 //!     use bencode::{BencodeRef, BRefAccess, BDecodeOpt};
 //!
 //!     fn main() {
@@ -63,10 +62,7 @@ pub use crate::access::bencode::{BMutAccess, BRefAccess, MutKind, RefKind};
 pub use crate::access::convert::BConvert;
 pub use crate::access::dict::BDictAccess;
 pub use crate::access::list::BListAccess;
-pub use crate::error::{
-    BencodeConvertError, BencodeConvertErrorKind, BencodeConvertResult, BencodeParseError, BencodeParseErrorKind,
-    BencodeParseResult,
-};
+pub use crate::error::{BencodeConvertError, BencodeConvertResult, BencodeParseError, BencodeParseResult};
 pub use crate::mutable::bencode_mut::BencodeMut;
 pub use crate::reference::bencode_ref::BencodeRef;
 pub use crate::reference::decode_opt::BDecodeOpt;
diff --git a/contrib/bencode/src/mutable/encode.rs b/contrib/bencode/src/mutable/encode.rs
index 25c91b41d..811c35816 100644
--- a/contrib/bencode/src/mutable/encode.rs
+++ b/contrib/bencode/src/mutable/encode.rs
@@ -1,3 +1,5 @@
+use std::iter::Extend;
+
 use crate::access::bencode::{BRefAccess, RefKind};
 use crate::access::dict::BDictAccess;
 use crate::access::list::BListAccess;
diff --git a/contrib/bencode/src/reference/bencode_ref.rs b/contrib/bencode/src/reference/bencode_ref.rs
index a6f2c15bc..73aaad039 100644
--- a/contrib/bencode/src/reference/bencode_ref.rs
+++ b/contrib/bencode/src/reference/bencode_ref.rs
@@ -4,7 +4,7 @@ use std::str;
 use crate::access::bencode::{BRefAccess, BRefAccessExt, RefKind};
 use crate::access::dict::BDictAccess;
 use crate::access::list::BListAccess;
-use crate::error::{BencodeParseError, BencodeParseErrorKind, BencodeParseResult};
+use crate::error::{BencodeParseError, BencodeParseResult};
 use crate::reference::decode;
 use crate::reference::decode_opt::BDecodeOpt;
 
@@ -41,9 +41,7 @@ impl<'a> BencodeRef<'a> {
         let (bencode, end_pos) = decode::decode(bytes, 0, opts, 0)?;
 
         if end_pos != bytes.len() && opts.enforce_full_decode() {
-            return Err(BencodeParseError::from_kind(BencodeParseErrorKind::BytesEmpty {
-                pos: end_pos,
-            }));
+            return Err(BencodeParseError::BytesEmpty { pos: end_pos });
         }
 
         Ok(bencode)
@@ -125,6 +123,7 @@ impl<'a> BRefAccessExt<'a> for BencodeRef<'a> {
 
 #[cfg(test)]
 mod tests {
+
     use crate::access::bencode::BRefAccess;
     use crate::reference::bencode_ref::BencodeRef;
     use crate::reference::decode_opt::BDecodeOpt;
diff --git a/contrib/bencode/src/reference/decode.rs b/contrib/bencode/src/reference/decode.rs
index d35d1b597..97c5cf1ff 100644
--- a/contrib/bencode/src/reference/decode.rs
+++ b/contrib/bencode/src/reference/decode.rs
@@ -1,16 +1,14 @@
 use std::collections::btree_map::Entry;
 use std::collections::BTreeMap;
-use std::str::{self};
+use std::str;
 
-use crate::error::{BencodeParseError, BencodeParseErrorKind, BencodeParseResult};
+use crate::error::{BencodeParseError, BencodeParseResult};
 use crate::reference::bencode_ref::{BencodeRef, Inner};
 use crate::reference::decode_opt::BDecodeOpt;
 
 pub fn decode(bytes: &[u8], pos: usize, opts: BDecodeOpt, depth: usize) -> BencodeParseResult<(BencodeRef<'_>, usize)> {
     if depth >= opts.max_recursion() {
-        return Err(BencodeParseError::from_kind(
-            BencodeParseErrorKind::InvalidRecursionExceeded { pos, max: depth },
-        ));
+        return Err(BencodeParseError::InvalidRecursionExceeded { pos, max: depth });
     }
     let curr_byte = peek_byte(bytes, pos)?;
 
@@ -32,7 +30,7 @@ pub fn decode(bytes: &[u8], pos: usize, opts: BDecodeOpt, depth: usize) -> Benco
             // Include the length digit, don't increment position
             Ok((Inner::Bytes(bencode, &bytes[pos..next_pos]).into(), next_pos))
         }
-        _ => Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidByte { pos })),
+        _ => Err(BencodeParseError::InvalidByte { pos }),
     }
 }
 
@@ -40,32 +38,24 @@ fn decode_int(bytes: &[u8], pos: usize, delim: u8) -> BencodeParseResult<(i64, u
     let (_, begin_decode) = bytes.split_at(pos);
 
     let Some(relative_end_pos) = begin_decode.iter().position(|n| *n == delim) else {
-        return Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidIntNoDelimiter {
-            pos,
-        }));
+        return Err(BencodeParseError::InvalidIntNoDelimiter { pos });
     };
     let int_byte_slice = &begin_decode[..relative_end_pos];
 
     if int_byte_slice.len() > 1 {
         // Negative zero is not allowed (this would not be caught when converting)
         if int_byte_slice[0] == b'-' && int_byte_slice[1] == b'0' {
-            return Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidIntNegativeZero {
-                pos,
-            }));
+            return Err(BencodeParseError::InvalidIntNegativeZero { pos });
         }
 
         // Zero padding is illegal, and unspecified for key lengths (we disallow both)
         if int_byte_slice[0] == b'0' {
-            return Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidIntZeroPadding {
-                pos,
-            }));
+            return Err(BencodeParseError::InvalidIntZeroPadding { pos });
         }
     }
 
     let Ok(int_str) = str::from_utf8(int_byte_slice) else {
-        return Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidIntParseError {
-            pos,
-        }));
+        return Err(BencodeParseError::InvalidIntParseError { pos });
     };
 
     // Position of end of integer type, next byte is the start of the next value
@@ -73,31 +63,24 @@ fn decode_int(bytes: &[u8], pos: usize, delim: u8) -> BencodeParseResult<(i64, u
     let next_pos = absolute_end_pos + 1;
     match int_str.parse::<i64>() {
         Ok(n) => Ok((n, next_pos)),
-        Err(_) => Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidIntParseError {
-            pos,
-        })),
+        Err(_) => Err(BencodeParseError::InvalidIntParseError { pos }),
     }
 }
 
+use std::convert::TryFrom;
+
 fn decode_bytes(bytes: &[u8], pos: usize) -> BencodeParseResult<(&[u8], usize)> {
     let (num_bytes, start_pos) = decode_int(bytes, pos, crate::BYTE_LEN_END)?;
 
     if num_bytes < 0 {
-        return Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidLengthNegative {
-            pos,
-        }));
+        return Err(BencodeParseError::InvalidLengthNegative { pos });
     }
 
-    // Should be safe to cast to usize (TODO: Check if cast would overflow to provide
-    // a more helpful error message, otherwise, parsing will probably fail with an
-    // unrelated message).
-    let num_bytes =
-        usize::try_from(num_bytes).map_err(|_| BencodeParseErrorKind::Msg(format!("input length is too long: {num_bytes}")))?;
+    // Use usize::try_from to handle potential overflow
+    let num_bytes = usize::try_from(num_bytes).map_err(|_| BencodeParseError::InvalidLengthOverflow { pos })?;
 
     if num_bytes > bytes[start_pos..].len() {
-        return Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidLengthOverflow {
-            pos,
-        }));
+        return Err(BencodeParseError::InvalidLengthOverflow { pos });
     }
 
     let next_pos = start_pos + num_bytes;
@@ -140,10 +123,10 @@ fn decode_dict(
         // Spec says that the keys must be in alphabetical order
         match (bencode_dict.keys().last(), opts.check_key_sort()) {
             (Some(last_key), true) if key_bytes < *last_key => {
-                return Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidKeyOrdering {
+                return Err(BencodeParseError::InvalidKeyOrdering {
                     pos: curr_pos,
                     key: key_bytes.to_vec(),
-                }))
+                })
             }
             _ => (),
         };
@@ -153,10 +136,10 @@ fn decode_dict(
         match bencode_dict.entry(key_bytes) {
             Entry::Vacant(n) => n.insert(value),
             Entry::Occupied(_) => {
-                return Err(BencodeParseError::from_kind(BencodeParseErrorKind::InvalidKeyDuplicates {
+                return Err(BencodeParseError::InvalidKeyDuplicates {
                     pos: curr_pos,
                     key: key_bytes.to_vec(),
-                }))
+                })
             }
         };
 
@@ -169,14 +152,12 @@ fn decode_dict(
 }
 
 fn peek_byte(bytes: &[u8], pos: usize) -> BencodeParseResult<u8> {
-    bytes
-        .get(pos)
-        .copied()
-        .ok_or_else(|| BencodeParseError::from_kind(BencodeParseErrorKind::BytesEmpty { pos }))
+    bytes.get(pos).copied().ok_or(BencodeParseError::BytesEmpty { pos })
 }
 
 #[cfg(test)]
 mod tests {
+
     use crate::access::bencode::BRefAccess;
     use crate::reference::bencode_ref::BencodeRef;
     use crate::reference::decode_opt::BDecodeOpt;
@@ -327,13 +308,13 @@ mod tests {
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(InvalidByte { pos: 0 }"]
+    #[should_panic = "InvalidByte { pos: 0 }"]
     fn negative_decode_bytes_neg_len() {
         BencodeRef::decode(BYTES_NEG_LEN, BDecodeOpt::default()).unwrap();
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(BytesEmpty { pos: 20 }"]
+    #[should_panic = "BytesEmpty { pos: 20 }"]
     fn negative_decode_bytes_extra() {
         BencodeRef::decode(BYTES_EXTRA, BDecodeOpt::default()).unwrap();
     }
@@ -346,49 +327,49 @@ mod tests {
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(InvalidIntParseError { pos: 1 }"]
+    #[should_panic = "InvalidIntParseError { pos: 1 }"]
     fn negative_decode_int_nan() {
         super::decode_int(INT_NAN, 1, crate::BEN_END).unwrap();
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(InvalidIntZeroPadding { pos: 1 }"]
+    #[should_panic = "InvalidIntZeroPadding { pos: 1 }"]
     fn negative_decode_int_leading_zero() {
         super::decode_int(INT_LEADING_ZERO, 1, crate::BEN_END).unwrap();
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(InvalidIntZeroPadding { pos: 1 }"]
+    #[should_panic = "InvalidIntZeroPadding { pos: 1 }"]
     fn negative_decode_int_double_zero() {
         super::decode_int(INT_DOUBLE_ZERO, 1, crate::BEN_END).unwrap();
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(InvalidIntNegativeZero { pos: 1 }"]
+    #[should_panic = "InvalidIntNegativeZero { pos: 1 }"]
     fn negative_decode_int_negative_zero() {
         super::decode_int(INT_NEGATIVE_ZERO, 1, crate::BEN_END).unwrap();
     }
 
     #[test]
-    #[should_panic = " BencodeParseError(InvalidIntParseError { pos: 1 }"]
+    #[should_panic = " InvalidIntParseError { pos: 1 }"]
     fn negative_decode_int_double_negative() {
         super::decode_int(INT_DOUBLE_NEGATIVE, 1, crate::BEN_END).unwrap();
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(InvalidKeyOrdering { pos: 15, key: [97, 95, 107, 101, 121] }"]
+    #[should_panic = "InvalidKeyOrdering { pos: 15, key: [97, 95, 107, 101, 121] }"]
     fn negative_decode_dict_unordered_keys() {
         BencodeRef::decode(DICT_UNORDERED_KEYS, BDecodeOpt::new(5, true, true)).unwrap();
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(InvalidKeyDuplicates { pos: 18, key: [97, 95, 107, 101, 121] }"]
+    #[should_panic = "InvalidKeyDuplicates { pos: 18, key: [97, 95, 107, 101, 121] }"]
     fn negative_decode_dict_dup_keys_same_data() {
         BencodeRef::decode(DICT_DUP_KEYS_SAME_DATA, BDecodeOpt::default()).unwrap();
     }
 
     #[test]
-    #[should_panic = "BencodeParseError(InvalidKeyDuplicates { pos: 18, key: [97, 95, 107, 101, 121] }"]
+    #[should_panic = "InvalidKeyDuplicates { pos: 18, key: [97, 95, 107, 101, 121] }"]
     fn negative_decode_dict_dup_keys_diff_data() {
         BencodeRef::decode(DICT_DUP_KEYS_DIFF_DATA, BDecodeOpt::default()).unwrap();
     }
diff --git a/contrib/bencode/test/mod.rs b/contrib/bencode/tests/mod.rs
similarity index 100%
rename from contrib/bencode/test/mod.rs
rename to contrib/bencode/tests/mod.rs

From c5a724e9da1e670edb775a4581ac3da92c8ebb44 Mon Sep 17 00:00:00 2001
From: Cameron Garnham <me@da2ce7.com>
Date: Sat, 24 Aug 2024 18:19:10 +0200
Subject: [PATCH 2/3] chore: update deps

``` sh
cargo update
    Updating crates.io index
     Locking 12 packages to latest compatible versions
    Updating bindgen v0.70.0 -> v0.70.1
    Updating cc v1.1.13 -> v1.1.14
    Updating derive_utils v0.14.1 -> v0.14.2
    Updating fastrand v2.1.0 -> v2.1.1
    Updating flate2 v1.0.32 -> v1.0.33
    Updating libz-sys v1.1.19 -> v1.1.20
    Updating quote v1.0.36 -> v1.0.37
    Updating serde v1.0.208 -> v1.0.209
    Updating serde_derive v1.0.208 -> v1.0.209
    Updating serde_json v1.0.125 -> v1.0.127
    Updating syn v2.0.75 -> v2.0.76
    Updating system-configuration v0.6.0 -> v0.6.1
```
---
 Cargo.lock | 128 ++++++++++++++++++++++++++---------------------------
 Cargo.toml |   2 +-
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 057e1f5db..740f185bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -247,7 +247,7 @@ checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
 dependencies = [
  "async-task",
  "concurrent-queue",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "futures-lite 2.3.0",
  "slab",
 ]
@@ -368,7 +368,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -518,7 +518,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -610,15 +610,15 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.75",
+ "syn 2.0.76",
  "which",
 ]
 
 [[package]]
 name = "bindgen"
-version = "0.70.0"
+version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0127a1da21afb5adaae26910922c3f7afd3d329ba1a1b98a0884cab4907a251"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
@@ -629,7 +629,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -698,7 +698,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "syn_derive",
 ]
 
@@ -810,9 +810,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.13"
+version = "1.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
 dependencies = [
  "jobserver",
  "libc",
@@ -922,7 +922,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1149,7 +1149,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1160,7 +1160,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1197,18 +1197,18 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
 name = "derive_utils"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926"
+checksum = "65f152f4b8559c4da5d574bafc7af85454d706b4c5fe8b530d508cacbb6807ea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1324,9 +1324,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "figment"
@@ -1346,9 +1346,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.32"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
  "libz-sys",
@@ -1426,7 +1426,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e"
 dependencies = [
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1438,7 +1438,7 @@ dependencies = [
  "frunk_core",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1450,7 +1450,7 @@ dependencies = [
  "frunk_core",
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1534,7 +1534,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "futures-core",
  "futures-io",
  "parking",
@@ -1549,7 +1549,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2081,9 +2081,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.19"
+version = "1.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
 dependencies = [
  "cc",
  "pkg-config",
@@ -2225,7 +2225,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2275,7 +2275,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "termcolor",
  "thiserror",
 ]
@@ -2288,7 +2288,7 @@ checksum = "478b0ff3f7d67b79da2b96f56f334431aef65e15ba4b29dd74a4236e29582bdc"
 dependencies = [
  "base64 0.21.7",
  "bigdecimal",
- "bindgen 0.70.0",
+ "bindgen 0.70.1",
  "bitflags 2.6.0",
  "bitvec",
  "btoi",
@@ -2474,7 +2474,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2556,7 +2556,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2630,7 +2630,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2652,7 +2652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
 dependencies = [
  "atomic-waker",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "futures-io",
 ]
 
@@ -2764,12 +2764,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
+checksum = "a909e6e8053fa1a5ad670f5816c7d93029ee1fa8898718490544a6b0d5d38b3e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -2822,7 +2822,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "version_check",
  "yansi",
 ]
@@ -2860,9 +2860,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -3130,7 +3130,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.75",
+ "syn 2.0.76",
  "unicode-ident",
 ]
 
@@ -3342,9 +3342,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.208"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
  "serde_derive",
 ]
@@ -3370,13 +3370,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.208"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -3394,9 +3394,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.125"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
  "indexmap 2.4.0",
  "itoa",
@@ -3423,7 +3423,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -3474,7 +3474,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -3617,9 +3617,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.75"
+version = "2.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3635,7 +3635,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -3655,9 +3655,9 @@ dependencies = [
 
 [[package]]
 name = "system-configuration"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.6.0",
  "core-foundation",
@@ -3704,7 +3704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
  "once_cell",
  "rustix 0.38.34",
  "windows-sys 0.59.0",
@@ -3742,7 +3742,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -3836,7 +3836,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -4156,7 +4156,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -4371,7 +4371,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "wasm-bindgen-shared",
 ]
 
@@ -4405,7 +4405,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4707,7 +4707,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -4727,7 +4727,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.75",
+ "syn 2.0.76",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 43453cb5a..e0774e237 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ serde_bencode = "0"
 serde_bytes = "0"
 serde_json = { version = "1", features = ["preserve_order"] }
 serde_repr = "0"
-serde_with = { version = "3.9.0", features = ["json"] }
+serde_with = { version = "3", features = ["json"] }
 thiserror = "1"
 tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "signal", "sync"] }
 torrust-tracker-clock = { version = "3.0.0-beta-develop", path = "packages/clock" }

From 2c4bdab2c92ed30193024366b9915513213cf105 Mon Sep 17 00:00:00 2001
From: Cameron Garnham <me@da2ce7.com>
Date: Sat, 24 Aug 2024 18:31:25 +0200
Subject: [PATCH 3/3] chore: update to v1 of derive more

---
 Cargo.lock                        | 28 ++++++++++++++++++----------
 Cargo.toml                        |  2 +-
 packages/configuration/Cargo.toml |  2 +-
 packages/configuration/src/lib.rs |  2 +-
 packages/primitives/Cargo.toml    |  2 +-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 740f185bc..0e3401278 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -968,12 +968,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1189,15 +1183,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 = "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 = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
  "syn 2.0.76",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -4260,6 +4262,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
diff --git a/Cargo.toml b/Cargo.toml
index e0774e237..1a875a192 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ chrono = { version = "0", default-features = false, features = ["clock"] }
 clap = { version = "4", features = ["derive", "env"] }
 crossbeam-skiplist = "0"
 dashmap = "6"
-derive_more = "0"
+derive_more = { version = "1", features = ["as_ref", "constructor", "from"] }
 figment = "0"
 futures = "0"
 futures-util = "0"
diff --git a/packages/configuration/Cargo.toml b/packages/configuration/Cargo.toml
index 0a4cfea23..4f217e1b6 100644
--- a/packages/configuration/Cargo.toml
+++ b/packages/configuration/Cargo.toml
@@ -16,7 +16,7 @@ version.workspace = true
 
 [dependencies]
 camino = { version = "1", features = ["serde", "serde1"] }
-derive_more = "0"
+derive_more = { version = "1", features = ["constructor", "display"] }
 figment = { version = "0", features = ["env", "test", "toml"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["preserve_order"] }
diff --git a/packages/configuration/src/lib.rs b/packages/configuration/src/lib.rs
index bdbe419ca..1ab3479fa 100644
--- a/packages/configuration/src/lib.rs
+++ b/packages/configuration/src/lib.rs
@@ -51,7 +51,7 @@ pub const LATEST_VERSION: &str = "2.0.0";
 
 /// Info about the configuration specification.
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Display, Clone)]
-#[display(fmt = "Metadata(app: {app}, purpose: {purpose}, schema_version: {schema_version})")]
+#[display("Metadata(app: {app}, purpose: {purpose}, schema_version: {schema_version})")]
 pub struct Metadata {
     /// The application this configuration is valid for.
     #[serde(default = "Metadata::default_app")]
diff --git a/packages/primitives/Cargo.toml b/packages/primitives/Cargo.toml
index 05981b3a8..02a53e3b7 100644
--- a/packages/primitives/Cargo.toml
+++ b/packages/primitives/Cargo.toml
@@ -17,7 +17,7 @@ version.workspace = true
 [dependencies]
 aquatic_udp_protocol = "0"
 binascii = "0"
-derive_more = "0"
+derive_more = { version = "1", features = ["constructor"] }
 serde = { version = "1", features = ["derive"] }
 tdyne-peer-id = "1"
 tdyne-peer-id-registry = "0"