Skip to content

Commit

Permalink
fix: format.
Browse files Browse the repository at this point in the history
  • Loading branch information
Joinhack committed Mar 31, 2024
1 parent 48af70e commit 38de01b
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions crates/blockless-drivers/src/wasi/socket.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
use std::sync::Arc;

use wasi_common::{
file::{
FileAccessMode,
FileEntry
},
sync::net::Socket,
WasiCtx,
WasiFile
file::{FileAccessMode, FileEntry},
sync::net::Socket,
WasiCtx, WasiFile,
};

use crate::BlocklessSocketErrorKind;
use wiggle::GuestPtr;
use std::net::{TcpStream, TcpListener};
use log::error;
use std::net::{TcpListener, TcpStream};
use wiggle::GuestPtr;

wiggle::from_witx!({
witx: ["$BLOCKLESS_DRIVERS_ROOT/witx/blockless_socket.witx"],
Expand All @@ -23,12 +19,13 @@ wiggle::from_witx!({
});

impl types::UserErrorConversion for WasiCtx {

fn socket_error_from_blockless_socket_error_kind(&mut self,e:self::BlocklessSocketErrorKind) -> wiggle::anyhow::Result<types::SocketError> {
fn socket_error_from_blockless_socket_error_kind(
&mut self,
e: self::BlocklessSocketErrorKind,
) -> wiggle::anyhow::Result<types::SocketError> {
e.try_into()
.map_err(|e| wiggle::anyhow::anyhow!(format!("{:?}", e)))
}

}

impl wiggle::GuestErrorType for types::SocketError {
Expand Down Expand Up @@ -83,10 +80,11 @@ impl blockless_socket::BlocklessSocket for WasiCtx {
&mut self,
bind: &GuestPtr<'a, str>,
) -> Result<types::SocketHandle, BlocklessSocketErrorKind> {
let addr = bind.as_str()
let addr = bind
.as_str()
.map_err(|_| BlocklessSocketErrorKind::ParameterError)?
.unwrap();
let mode = FileAccessMode::READ|FileAccessMode::WRITE;
let mode = FileAccessMode::READ | FileAccessMode::WRITE;
match tcp_bind(&addr)
.await
.map(|f| Arc::new(FileEntry::new(f, mode)))
Expand All @@ -104,10 +102,11 @@ impl blockless_socket::BlocklessSocket for WasiCtx {
&mut self,
target: &GuestPtr<'a, str>,
) -> Result<types::SocketHandle, BlocklessSocketErrorKind> {
let addr = target.as_str()
let addr = target
.as_str()
.map_err(|_| BlocklessSocketErrorKind::ParameterError)?
.unwrap();
let mode = FileAccessMode::READ|FileAccessMode::WRITE;
let mode = FileAccessMode::READ | FileAccessMode::WRITE;
match tcp_connect(&addr)
.await
.map(|f| Arc::new(FileEntry::new(f, mode)))
Expand All @@ -120,5 +119,4 @@ impl blockless_socket::BlocklessSocket for WasiCtx {
Err(e) => Err(e),
}
}

}
}

0 comments on commit 38de01b

Please sign in to comment.