diff --git a/lib/c-api/src/wasm_c_api/wasi/mod.rs b/lib/c-api/src/wasm_c_api/wasi/mod.rs index 92f9f403a..7d2d02d9e 100644 --- a/lib/c-api/src/wasm_c_api/wasi/mod.rs +++ b/lib/c-api/src/wasm_c_api/wasi/mod.rs @@ -23,8 +23,8 @@ use std::{ sync::MutexGuard, }; use wasmer_wasi::{ - get_wasi_version, FsError, VirtualFile, WasiFile, WasiFunctionEnv, WasiPipe, WasiState, - WasiStateBuilder, WasiVersion, WasiPipePair, + get_wasi_version, FsError, VirtualFile, WasiFile, WasiFunctionEnv, WasiPipe, WasiPipePair, + WasiState, WasiStateBuilder, WasiVersion, }; /// Function callback that takes: @@ -364,7 +364,7 @@ unsafe extern "C" fn wasi_console_out_seek_memory( } } -unsafe extern "C" fn wasi_console_out_delete_memory(ptr: *const c_void /* = *WasiPipe */) -> i64 { +unsafe extern "C" fn wasi_console_out_delete_memory(ptr: *const c_void, /* = *WasiPipe */) -> i64 { let ptr = ptr as *const WasiPipePair; let _: WasiPipePair = std::mem::transmute_copy(&*ptr); // dropped here, destructors run here 0 @@ -377,10 +377,7 @@ pub unsafe extern "C" fn wasi_pipe_new() -> *mut wasi_console_out_t { use std::mem::ManuallyDrop; let (send, recv) = WasiPipe::new(); - let pair = WasiPipePair { - send, - recv, - }; + let pair = WasiPipePair { send, recv }; let mut data = ManuallyDrop::new(pair); let ptr: &mut WasiPipePair = &mut data; diff --git a/lib/wasi/src/lib.rs b/lib/wasi/src/lib.rs index f06dd29de..65664efd0 100644 --- a/lib/wasi/src/lib.rs +++ b/lib/wasi/src/lib.rs @@ -43,8 +43,8 @@ mod utils; use crate::syscalls::*; pub use crate::state::{ - Fd, Stderr, Stdin, Stdout, WasiFs, WasiInodes, WasiState, WasiStateBuilder, - WasiStateCreationError, ALL_RIGHTS, VIRTUAL_ROOT_FD, WasiPipe, WasiPipePair, + Fd, Stderr, Stdin, Stdout, WasiFs, WasiInodes, WasiPipe, WasiPipePair, WasiState, + WasiStateBuilder, WasiStateCreationError, ALL_RIGHTS, VIRTUAL_ROOT_FD, }; pub use crate::syscalls::types; #[cfg(feature = "wasix")] diff --git a/lib/wasi/src/state/pipe.rs b/lib/wasi/src/state/pipe.rs index 681e14557..e474fc86b 100644 --- a/lib/wasi/src/state/pipe.rs +++ b/lib/wasi/src/state/pipe.rs @@ -88,7 +88,10 @@ impl WasiPipe { read_buffer: None, }; - WasiPipePair { send: pipe1, recv: pipe2 } + WasiPipePair { + send: pipe1, + recv: pipe2, + } } pub fn recv( diff --git a/tests/lib/wast/src/wasi_wast.rs b/tests/lib/wast/src/wasi_wast.rs index 40f72ca7e..f899402e8 100644 --- a/tests/lib/wast/src/wasi_wast.rs +++ b/tests/lib/wast/src/wasi_wast.rs @@ -8,8 +8,8 @@ use wasmer::{Imports, Instance, Module, Store}; use wasmer_vfs::{host_fs, mem_fs, FileSystem}; use wasmer_wasi::types::{__wasi_filesize_t, __wasi_timestamp_t}; use wasmer_wasi::{ - generate_import_object_from_env, get_wasi_version, FsError, WasiPipe, VirtualFile, WasiEnv, - WasiFunctionEnv, WasiState, WasiVersion, + generate_import_object_from_env, get_wasi_version, FsError, VirtualFile, WasiEnv, + WasiFunctionEnv, WasiPipe, WasiState, WasiVersion, }; use wast::parser::{self, Parse, ParseBuffer, Parser};