tuxmain/w5100-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplifying trait, sealing implementations

Browse source
This commit is contained in:
Ryan Summers 2024-07-05 13:27:39 +02:00 • committed by kellerkindt
commit 270436affa
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/device.rs
View file

@ -23,13 +23,16 @@ impl<E> From<E> for ResetError<E> {
} }
} }
pub trait State { mod private {
type Host: Host; pub trait Sealed {}
impl<'a, T: Sealed> Sealed for &'a mut T {}
}
pub trait State: private::Sealed {
fn socket(&mut self) -> Option<Socket>; fn socket(&mut self) -> Option<Socket>;
fn release_socket(&mut self, socket: Socket); fn release_socket(&mut self, socket: Socket);
fn any_allocated(&self) -> bool; fn any_allocated(&self) -> bool;
fn host(&self) -> &Self::Host;
} }
#[derive(Debug)] #[derive(Debug)]
@ -48,9 +51,9 @@ impl<HostImpl: Host> DeviceState<HostImpl> {
} }
} }
impl<HostImpl: Host> State for DeviceState<HostImpl> { impl<HostImpl: Host> private::Sealed for DeviceState<HostImpl> {}
type Host = HostImpl;
impl<HostImpl: Host> State for DeviceState<HostImpl> {
fn socket(&mut self) -> Option<Socket> { fn socket(&mut self) -> Option<Socket> {
for index in 0..8 { for index in 0..8 {
if self.sockets.get_bit(index) { 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); self.sockets.set_bit(socket.index.into(), true);
} }
fn host(&self) -> &Self::Host {
&self.host
}
fn any_allocated(&self) -> bool { fn any_allocated(&self) -> bool {
self.sockets != 0xFF self.sockets != 0xFF
} }
} }
impl<'a, T: State> State for &'a mut T { impl<'a, T: State> State for &'a mut T {
type Host = T::Host;
fn socket(&mut self) -> Option<Socket> { fn socket(&mut self) -> Option<Socket> {
T::socket(self) T::socket(self)
} }
@ -85,10 +82,6 @@ impl<'a, T: State> State for &'a mut T {
T::release_socket(self, socket) T::release_socket(self, socket)
} }
fn host(&self) -> &Self::Host {
T::host(self)
}
fn any_allocated(&self) -> bool { fn any_allocated(&self) -> bool {
T::any_allocated(self) T::any_allocated(self)
} }