refactor(socket): implement ObjectInterface without intermediate methods

Author: mkroening

src/fd/socket/tcp.rs

@@ -110,7 +110,10 @@ impl Socket {
 		})
 		.await
 	}
+}
 
+#[async_trait]
+impl ObjectInterface for Socket {
 	async fn poll(&self, event: PollEvent) -> io::Result<PollEvent> {
 		future::poll_fn(|cx| {
 			self.with(|socket| match socket.state() {
@@ -475,64 +478,3 @@ impl Drop for Socket {
 		}
 	}
 }
-
-#[async_trait]
-impl ObjectInterface for Socket {
-	async fn poll(&self, event: PollEvent) -> io::Result<PollEvent> {
-		self.poll(event).await
-	}
-
-	async fn read(&self, buffer: &mut [u8]) -> io::Result<usize> {
-		self.read(buffer).await
-	}
-
-	async fn write(&self, buffer: &[u8]) -> io::Result<usize> {
-		self.write(buffer).await
-	}
-
-	async fn bind(&mut self, endpoint: ListenEndpoint) -> io::Result<()> {
-		self.bind(endpoint).await
-	}
-
-	async fn connect(&mut self, endpoint: Endpoint) -> io::Result<()> {
-		self.connect(endpoint).await
-	}
-
-	async fn accept(
-		&mut self,
-	) -> io::Result<(Arc<async_lock::RwLock<dyn ObjectInterface>>, Endpoint)> {
-		self.accept().await
-	}
-
-	async fn getpeername(&self) -> io::Result<Option<Endpoint>> {
-		self.getpeername().await
-	}
-
-	async fn getsockname(&self) -> io::Result<Option<Endpoint>> {
-		self.getsockname().await
-	}
-
-	async fn listen(&mut self, backlog: i32) -> io::Result<()> {
-		self.listen(backlog).await
-	}
-
-	async fn setsockopt(&self, opt: SocketOption, optval: bool) -> io::Result<()> {
-		self.setsockopt(opt, optval).await
-	}
-
-	async fn getsockopt(&self, opt: SocketOption) -> io::Result<bool> {
-		self.getsockopt(opt).await
-	}
-
-	async fn shutdown(&self, how: i32) -> io::Result<()> {
-		self.shutdown(how).await
-	}
-
-	async fn status_flags(&self) -> io::Result<fd::StatusFlags> {
-		self.status_flags().await
-	}
-
-	async fn set_status_flags(&mut self, status_flags: fd::StatusFlags) -> io::Result<()> {
-		self.set_status_flags(status_flags).await
-	}
-}

src/fd/socket/udp.rs

@@ -74,7 +74,10 @@ impl Socket {
 		})
 		.await
 	}
+}
 
+#[async_trait]
+impl ObjectInterface for Socket {
 	async fn poll(&self, event: PollEvent) -> io::Result<PollEvent> {
 		future::poll_fn(|cx| {
 			self.with(|socket| {
@@ -251,46 +254,3 @@ impl Drop for Socket {
 		NIC.lock().as_nic_mut().unwrap().destroy_socket(self.handle);
 	}
 }
-
-#[async_trait]
-impl ObjectInterface for Socket {
-	async fn poll(&self, event: PollEvent) -> io::Result<PollEvent> {
-		self.poll(event).await
-	}
-
-	async fn bind(&mut self, endpoint: ListenEndpoint) -> io::Result<()> {
-		self.bind(endpoint).await
-	}
-
-	async fn connect(&mut self, endpoint: Endpoint) -> io::Result<()> {
-		self.connect(endpoint).await
-	}
-
-	async fn sendto(&self, buffer: &[u8], endpoint: Endpoint) -> io::Result<usize> {
-		self.sendto(buffer, endpoint).await
-	}
-
-	async fn recvfrom(&self, buffer: &mut [MaybeUninit<u8>]) -> io::Result<(usize, Endpoint)> {
-		self.recvfrom(buffer).await
-	}
-
-	async fn read(&self, buffer: &mut [u8]) -> io::Result<usize> {
-		self.read(buffer).await
-	}
-
-	async fn write(&self, buf: &[u8]) -> io::Result<usize> {
-		self.write(buf).await
-	}
-
-	async fn getsockname(&self) -> io::Result<Option<Endpoint>> {
-		self.getsockname().await
-	}
-
-	async fn status_flags(&self) -> io::Result<fd::StatusFlags> {
-		self.status_flags().await
-	}
-
-	async fn set_status_flags(&mut self, status_flags: fd::StatusFlags) -> io::Result<()> {
-		self.set_status_flags(status_flags).await
-	}
-}

src/fd/socket/vsock.rs

@@ -68,7 +68,10 @@ impl Socket {
 			is_nonblocking: false,
 		}
 	}
+}
 
+#[async_trait]
+impl ObjectInterface for Socket {
 	async fn poll(&self, event: PollEvent) -> io::Result<PollEvent> {
 		future::poll_fn(|cx| {
 			let mut guard = VSOCK_MAP.lock();
@@ -424,56 +427,3 @@ impl Drop for Socket {
 		guard.remove_socket(self.port);
 	}
 }
-
-#[async_trait]
-impl ObjectInterface for Socket {
-	async fn poll(&self, event: PollEvent) -> io::Result<PollEvent> {
-		self.poll(event).await
-	}
-
-	async fn read(&self, buffer: &mut [u8]) -> io::Result<usize> {
-		self.read(buffer).await
-	}
-
-	async fn write(&self, buffer: &[u8]) -> io::Result<usize> {
-		self.write(buffer).await
-	}
-
-	async fn bind(&mut self, endpoint: ListenEndpoint) -> io::Result<()> {
-		self.bind(endpoint).await
-	}
-
-	async fn connect(&mut self, endpoint: Endpoint) -> io::Result<()> {
-		self.connect(endpoint).await
-	}
-
-	async fn accept(
-		&mut self,
-	) -> io::Result<(Arc<async_lock::RwLock<dyn ObjectInterface>>, Endpoint)> {
-		self.accept().await
-	}
-
-	async fn getpeername(&self) -> io::Result<Option<Endpoint>> {
-		self.getpeername().await
-	}
-
-	async fn getsockname(&self) -> io::Result<Option<Endpoint>> {
-		self.getsockname().await
-	}
-
-	async fn listen(&mut self, backlog: i32) -> io::Result<()> {
-		self.listen(backlog).await
-	}
-
-	async fn shutdown(&self, how: i32) -> io::Result<()> {
-		self.shutdown(how).await
-	}
-
-	async fn status_flags(&self) -> io::Result<fd::StatusFlags> {
-		self.status_flags().await
-	}
-
-	async fn set_status_flags(&mut self, status_flags: fd::StatusFlags) -> io::Result<()> {
-		self.set_status_flags(status_flags).await
-	}
-}