Shorten ByteBuf trait bounds everywhere

crates/buffers/src/lib.rs

@@ -3,8 +3,10 @@
 //
 // Not useful outside of librqbit.
 
+use std::borrow::Borrow;
+
 use bytes::Bytes;
-use serde::{Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, Serialize};
 
 use clone_to_owned::CloneToOwned;
 
@@ -15,7 +17,9 @@ pub struct ByteBufOwned(pub bytes::Bytes);
 #[serde(transparent)]
 pub struct ByteBuf<'a>(pub &'a [u8]);
 
-pub trait ByteBufT {
+pub trait ByteBufT:
+    AsRef<[u8]> + std::hash::Hash + Serialize + Eq + core::fmt::Debug + CloneToOwned + Borrow<[u8]>
+{
     fn as_slice(&self) -> &[u8];
 }
 

crates/librqbit/src/torrent_state/live/mod.rs

@@ -1682,7 +1682,10 @@ impl PeerHandler {
         msg.added_peers().for_each(|peer| {
             self.state
                 .add_peer_if_not_seen(peer.addr)
-                .inspect_err(|error| warn!(?peer, ?error, "failed to add peer"))
+                .map_err(|error| {
+                    warn!(?peer, ?error, "failed to add peer");
+                    error
+                })
                 .ok();
         });
     }

crates/peer_binary_protocol/src/extended/handshake.rs

@@ -1,19 +1,18 @@
-use std::{
-    collections::HashMap,
-    net::IpAddr,
-};
+use std::{collections::HashMap, net::IpAddr};
 
-use buffers::ByteBuf;
+use buffers::{ByteBuf, ByteBufT};
 use bytes::Bytes;
 use clone_to_owned::CloneToOwned;
 use serde::{Deserialize, Deserializer, Serialize};
 
-use crate::{EXTENDED_UT_METADATA_KEY, EXTENDED_UT_PEX_KEY, MY_EXTENDED_UT_METADATA, MY_EXTENDED_UT_PEX};
+use crate::{
+    EXTENDED_UT_METADATA_KEY, EXTENDED_UT_PEX_KEY, MY_EXTENDED_UT_METADATA, MY_EXTENDED_UT_PEX,
+};
 
 use super::PeerExtendedMessageIds;
 
 #[derive(Deserialize, Serialize, Debug, Default)]
-pub struct ExtendedHandshake<ByteBuf: Eq + std::hash::Hash> {
+pub struct ExtendedHandshake<ByteBuf: ByteBufT> {
     #[serde(bound(deserialize = "ByteBuf: From<&'de [u8]>"))]
     pub m: HashMap<ByteBuf, u8>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -50,7 +49,7 @@ impl ExtendedHandshake<ByteBuf<'static>> {
 
 impl<'a, ByteBuf> ExtendedHandshake<ByteBuf>
 where
-    ByteBuf: Eq + std::hash::Hash + std::borrow::Borrow<[u8]>,
+    ByteBuf: ByteBufT,
 {
     fn get_msgid(&self, msg_type: &'a [u8]) -> Option<u8> {
         self.m.get(msg_type).copied()
@@ -74,8 +73,8 @@ where
 
 impl<ByteBuf> CloneToOwned for ExtendedHandshake<ByteBuf>
 where
-    ByteBuf: CloneToOwned + Eq + std::hash::Hash,
-    <ByteBuf as CloneToOwned>::Target: Eq + std::hash::Hash,
+    ByteBuf: ByteBufT,
+    <ByteBuf as CloneToOwned>::Target: ByteBufT,
 {
     type Target = ExtendedHandshake<<ByteBuf as CloneToOwned>::Target>;
 

crates/peer_binary_protocol/src/extended/mod.rs

@@ -1,9 +1,10 @@
 use bencode::bencode_serialize_to_writer;
 use bencode::from_bytes;
 use bencode::BencodeValue;
+use buffers::ByteBufT;
 use bytes::Bytes;
 use clone_to_owned::CloneToOwned;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use ut_pex::UtPex;
 
 use crate::MY_EXTENDED_UT_PEX;
@@ -25,7 +26,7 @@ pub struct PeerExtendedMessageIds {
 }
 
 #[derive(Debug)]
-pub enum ExtendedMessage<ByteBuf: std::hash::Hash + Eq + AsRef<[u8]>> {
+pub enum ExtendedMessage<ByteBuf: ByteBufT> {
     Handshake(ExtendedHandshake<ByteBuf>),
     UtMetadata(UtMetadata<ByteBuf>),
     UtPex(UtPex<ByteBuf>),
@@ -34,8 +35,8 @@ pub enum ExtendedMessage<ByteBuf: std::hash::Hash + Eq + AsRef<[u8]>> {
 
 impl<ByteBuf> CloneToOwned for ExtendedMessage<ByteBuf>
 where
-    ByteBuf: CloneToOwned + std::hash::Hash + Eq + AsRef<[u8]>,
-    <ByteBuf as CloneToOwned>::Target: std::hash::Hash + Eq + AsRef<[u8]>,
+    ByteBuf: ByteBufT,
+    <ByteBuf as CloneToOwned>::Target: ByteBufT,
 {
     type Target = ExtendedMessage<<ByteBuf as CloneToOwned>::Target>;
 
@@ -53,7 +54,7 @@ where
     }
 }
 
-impl<'a, ByteBuf: 'a + std::hash::Hash + Eq + Serialize + AsRef<[u8]>> ExtendedMessage<ByteBuf> {
+impl<ByteBuf: ByteBufT> ExtendedMessage<ByteBuf> {
     pub fn serialize(
         &self,
         out: &mut Vec<u8>,
@@ -93,9 +94,9 @@ impl<'a, ByteBuf: 'a + std::hash::Hash + Eq + Serialize + AsRef<[u8]>> ExtendedM
         Ok(())
     }
 
-    pub fn deserialize(mut buf: &'a [u8]) -> Result<Self, MessageDeserializeError>
+    pub fn deserialize<'a>(mut buf: &'a [u8]) -> Result<Self, MessageDeserializeError>
     where
-        ByteBuf: Deserialize<'a> + From<&'a [u8]> + AsRef<[u8]>,
+        ByteBuf: Deserialize<'a> + From<&'a [u8]>,
     {
         let emsg_id = buf.first().copied().ok_or_else(|| {
             MessageDeserializeError::Other(anyhow::anyhow!(

crates/peer_binary_protocol/src/extended/ut_metadata.rs

@@ -1,5 +1,6 @@
 use bencode::bencode_serialize_to_writer;
 use bencode::BencodeDeserializer;
+use buffers::ByteBufT;
 use bytes::Bytes;
 use clone_to_owned::CloneToOwned;
 use serde::Deserialize;
@@ -39,7 +40,7 @@ impl<ByteBuf: CloneToOwned> CloneToOwned for UtMetadata<ByteBuf> {
     }
 }
 
-impl<'a, ByteBuf: 'a> UtMetadata<ByteBuf> {
+impl<ByteBuf: ByteBufT> UtMetadata<ByteBuf> {
     pub fn serialize(&self, buf: &mut Vec<u8>)
     where
         ByteBuf: AsRef<[u8]>,
@@ -83,7 +84,7 @@ impl<'a, ByteBuf: 'a> UtMetadata<ByteBuf> {
             }
         }
     }
-    pub fn deserialize(buf: &'a [u8]) -> Result<Self, MessageDeserializeError>
+    pub fn deserialize<'a>(buf: &'a [u8]) -> Result<Self, MessageDeserializeError>
     where
         ByteBuf: From<&'a [u8]>,
     {

crates/peer_binary_protocol/src/lib.rs

@@ -5,7 +5,7 @@
 pub mod extended;
 
 use bincode::Options;
-use buffers::{ByteBuf, ByteBufOwned};
+use buffers::{ByteBuf, ByteBufOwned, ByteBufT};
 use byteorder::{ByteOrder, BE};
 use bytes::Bytes;
 use clone_to_owned::CloneToOwned;
@@ -186,7 +186,7 @@ impl From<anyhow::Error> for MessageDeserializeError {
 }
 
 #[derive(Debug)]
-pub enum Message<ByteBuf: std::hash::Hash + Eq + AsRef<[u8]>> {
+pub enum Message<ByteBuf: ByteBufT> {
     Request(Request),
     Cancel(Request),
     Bitfield(ByteBuf),
@@ -212,8 +212,8 @@ pub struct Bitfield<'a> {
 
 impl<ByteBuf> CloneToOwned for Message<ByteBuf>
 where
-    ByteBuf: CloneToOwned + std::hash::Hash + Eq + AsRef<[u8]>,
-    <ByteBuf as CloneToOwned>::Target: std::hash::Hash + Eq + AsRef<[u8]>,
+    ByteBuf: ByteBufT,
+    <ByteBuf as CloneToOwned>::Target: ByteBufT,
 {
     type Target = Message<<ByteBuf as CloneToOwned>::Target>;
 
@@ -257,7 +257,7 @@ impl<'a> std::fmt::Debug for Bitfield<'a> {
 
 impl<ByteBuf> Message<ByteBuf>
 where
-    ByteBuf: AsRef<[u8]> + std::hash::Hash + Eq + Serialize,
+    ByteBuf: ByteBufT,
 {
     pub fn len_prefix_and_msg_id(&self) -> (u32, u8) {
         match self {