From 270436affa03b54f0db531b506379f86c5b3f81a Mon Sep 17 00:00:00 2001
From: Ryan Summers <ryan.summers@vertigo-designs.com>
Date: Fri, 5 Jul 2024 13:27:39 +0200
Subject: [PATCH] Simplifying trait, sealing implementations

---
 src/device.rs | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/device.rs b/src/device.rs
index 15cb749..ba957d2 100644
--- a/src/device.rs
+++ b/src/device.rs
@@ -23,13 +23,16 @@ impl<E> From<E> for ResetError<E> {
     }
 }
 
-pub trait State {
-    type Host: Host;
+mod private {
+    pub trait Sealed {}
 
+    impl<'a, T: Sealed> Sealed for &'a mut T {}
+}
+
+pub trait State: private::Sealed {
     fn socket(&mut self) -> Option<Socket>;
     fn release_socket(&mut self, socket: Socket);
     fn any_allocated(&self) -> bool;
-    fn host(&self) -> &Self::Host;
 }
 
 #[derive(Debug)]
@@ -48,9 +51,9 @@ impl<HostImpl: Host> DeviceState<HostImpl> {
     }
 }
 
-impl<HostImpl: Host> State for DeviceState<HostImpl> {
-    type Host = HostImpl;
+impl<HostImpl: Host> private::Sealed for DeviceState<HostImpl> {}
 
+impl<HostImpl: Host> State for DeviceState<HostImpl> {
     fn socket(&mut self) -> Option<Socket> {
         for index in 0..8 {
             if self.sockets.get_bit(index) {
@@ -65,18 +68,12 @@ impl<HostImpl: Host> State for DeviceState<HostImpl> {
         self.sockets.set_bit(socket.index.into(), true);
     }
 
-    fn host(&self) -> &Self::Host {
-        &self.host
-    }
-
     fn any_allocated(&self) -> bool {
         self.sockets != 0xFF
     }
 }
 
 impl<'a, T: State> State for &'a mut T {
-    type Host = T::Host;
-
     fn socket(&mut self) -> Option<Socket> {
         T::socket(self)
     }
@@ -85,10 +82,6 @@ impl<'a, T: State> State for &'a mut T {
         T::release_socket(self, socket)
     }
 
-    fn host(&self) -> &Self::Host {
-        T::host(self)
-    }
-
     fn any_allocated(&self) -> bool {
         T::any_allocated(self)
     }