relax-trait-bounds (#56)

al8n · Dec 23, 2024 · 92fb870 · 92fb870
1 parent f44378d
commit 92fb870
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 133 deletions.
diff --git a/.github/workflows/python.yml.bk b/.github/workflows/python.yml.bk
diff --git a/core/src/state.rs b/core/src/state.rs
@@ -136,7 +136,6 @@ impl<T, D> Memberlist<T, D>
 where
   D: Delegate<Id = T::Id, Address = <T::Resolver as AddressResolver>::ResolvedAddress>,
   T: Transport,
-  T::Id: Send + Sync + 'static,
 {
   /// Does a complete state exchange with a specific node.
   pub(crate) async fn push_pull_node(
@@ -578,7 +577,6 @@ enum StateMessage<T: Transport> {
 impl<T> StateMessage<T>
 where
   T: Transport,
-  T::Id: Send + Sync + 'static,
 {
   async fn run<D>(self, s: &Memberlist<T, D>)
   where

diff --git a/core/src/suspicion.rs b/core/src/suspicion.rs
@@ -46,7 +46,6 @@ where
 impl<T, D> Suspicioner<T, D>
 where
   T: Transport,
-  T::Id: Send + Sync + 'static,
   D: Delegate<Id = T::Id, Address = <T::Resolver as AddressResolver>::ResolvedAddress>,
 {
   pub(crate) fn new(
@@ -138,7 +137,6 @@ where
 impl<T, D> Suspicion<T, D>
 where
   T: Transport,
-  T::Id: Send + Sync + 'static,
   D: Delegate<Id = T::Id, Address = <T::Resolver as AddressResolver>::ResolvedAddress>,
 {
   /// Returns a after_func started with the max time, and that will drive
@@ -180,7 +178,6 @@ where
 impl<T, D> Suspicion<T, D>
 where
   T: Transport,
-  T::Id: Send + Sync + 'static,
   D: Delegate<Id = T::Id, Address = <T::Resolver as AddressResolver>::ResolvedAddress>,
 {
   /// Confirm registers that a possibly new peer has also determined the given

diff --git a/core/src/transport.rs b/core/src/transport.rs
@@ -273,7 +273,7 @@ pub trait Transport: Sized + Send + Sync + 'static {
   /// The error type for the transport
   type Error: TransportError;
   /// The id type used to identify nodes
-  type Id: Id + Send + Sync + 'static;
+  type Id: Id;
   /// The address resolver used to resolve addresses
   type Resolver: AddressResolver<Runtime = Self::Runtime>;
   /// The promised stream used to send and receive messages

diff --git a/core/src/transport/lpe.rs b/core/src/transport/lpe.rs
@@ -47,10 +47,8 @@ impl<I, A> core::fmt::Display for Lpe<I, A> {
 
 impl<I, A> Wire for Lpe<I, A>
 where
-  I: Transformable + core::fmt::Debug + Send + Sync + 'static,
-  I::Error: Send + Sync + 'static,
-  A: Transformable + core::fmt::Debug + Send + Sync + 'static,
-  A::Error: Send + Sync + 'static,
+  I: Transformable + core::fmt::Debug,
+  A: Transformable + core::fmt::Debug,
 {
   type Error = MessageTransformError<I, A>;
   type Id = I;

diff --git a/types/src/message.rs b/types/src/message.rs
@@ -186,10 +186,8 @@ const INLINED_BYTES_SIZE: usize = 64;
 
 impl<I, A> Transformable for Message<I, A>
 where
-  I: Transformable + core::fmt::Debug + 'static,
-  I::Error: Send + Sync + 'static,
-  A: Transformable + core::fmt::Debug + 'static,
-  A::Error: Send + Sync + 'static,
+  I: Transformable + core::fmt::Debug,
+  A: Transformable + core::fmt::Debug,
 {
   type Error = MessageTransformError<I, A>;