Skip to content

Commit 8f2966a

Browse files
kateinoigakukunkateinoigakukun
committed
cargo fmt --all
1 parent a95934b commit 8f2966a

File tree

5 files changed

+53
-76
lines changed

5 files changed

+53
-76
lines changed

‎crates/wasi-vfs-cli/src/lib.rs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ impl App {
6666
} => {
6767
let wasm_bytes = std::fs::read(&input)?;
6868
if !map_dirs.is_empty() {
69-
eprintln!("warning: --mapdir GUIEST_DIR::HOST_DIR is deprecated, use --dir HOST_DIR::GUEST_DIR instead");
69+
eprintln!(
70+
"warning: --mapdir GUIEST_DIR::HOST_DIR is deprecated, use --dir HOST_DIR::GUEST_DIR instead"
71+
);
7072
}
7173

7274
let mut map_dirs = map_dirs;
@@ -87,9 +89,7 @@ pub fn pack(wasm_bytes: &[u8], map_dirs: Vec<(String, PathBuf)>) -> Result<Vec<u
8789

8890
// Use tokio runtime for async wizer
8991
let runtime = tokio::runtime::Runtime::new()?;
90-
runtime.block_on(async {
91-
pack_async(wasm_bytes, map_dirs).await
92-
})
92+
runtime.block_on(async { pack_async(wasm_bytes, map_dirs).await })
9393
}
9494

9595
async fn pack_async(wasm_bytes: &[u8], map_dirs: Vec<(String, PathBuf)>) -> Result<Vec<u8>> {
@@ -136,13 +136,15 @@ async fn pack_async(wasm_bytes: &[u8], map_dirs: Vec<(String, PathBuf)>) -> Resu
136136
wizer.func_rename("_initialize", "__wasi_vfs_rt_init");
137137
}
138138

139-
let output_bytes = wizer.run(&mut store, wasm_bytes, async |store, module| {
140-
// Set up linker with WASI inside the closure
141-
let mut linker = wasmtime::Linker::new(module.engine());
142-
wasmtime_wasi::p1::add_to_linker_async(&mut linker, |x| x)?;
143-
linker.define_unknown_imports_as_traps(module)?;
144-
linker.instantiate_async(store, module).await
145-
}).await?;
139+
let output_bytes = wizer
140+
.run(&mut store, wasm_bytes, async |store, module| {
141+
// Set up linker with WASI inside the closure
142+
let mut linker = wasmtime::Linker::new(module.engine());
143+
wasmtime_wasi::p1::add_to_linker_async(&mut linker, |x| x)?;
144+
linker.define_unknown_imports_as_traps(module)?;
145+
linker.instantiate_async(store, module).await
146+
})
147+
.await?;
146148

147149
let output_bytes = copy_export_entry(&output_bytes, "_initialize", "__wasi_vfs_rt_init")?;
148150
Ok(output_bytes)

‎src/alloc.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ unsafe impl std::alloc::GlobalAlloc for WasiAllocator {
4646
unsafe extern "C" {
4747
fn free(ptr: *mut std::ffi::c_void);
4848
}
49-
unsafe {
50-
free(ptr as *mut std::ffi::c_void)
51-
}
49+
unsafe { free(ptr as *mut std::ffi::c_void) }
5250
}
5351

5452
#[inline]

‎src/lib.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ unsafe extern "C" fn __internal_wasi_vfs_rt_init() {
161161
if env_var("__WASI_VFS_PACKING").is_some() {
162162
return;
163163
}
164-
if let Some((embedded_fs, preopened_vfds)) = unsafe { (*std::ptr::addr_of_mut!(GLOBAL_STATE)).embedded_fs.take() } {
164+
if let Some((embedded_fs, preopened_vfds)) =
165+
unsafe { (*std::ptr::addr_of_mut!(GLOBAL_STATE)).embedded_fs.take() }
166+
{
165167
let fs = FileSystem::create(embedded_fs, &preopened_vfds);
166168
unsafe {
167169
(*std::ptr::addr_of_mut!(GLOBAL_STATE)).overlay_fs = Some(fs);
@@ -175,7 +177,9 @@ unsafe extern "C" fn __internal_wasi_vfs_pack_fs() {
175177
std::panic::set_hook(Box::new(|info| {
176178
trace::print(format!("{}\n", info));
177179
}));
178-
let (mut fs, preopened_vfds) = if let Some((fs, vfds)) = unsafe { (*std::ptr::addr_of_mut!(GLOBAL_STATE)).embedded_fs.take() } {
180+
let (mut fs, preopened_vfds) = if let Some((fs, vfds)) =
181+
unsafe { (*std::ptr::addr_of_mut!(GLOBAL_STATE)).embedded_fs.take() }
182+
{
179183
(fs, vfds)
180184
} else {
181185
(EmbeddedFs::default(), vec![])

‎src/trampoline_generated.rs‎

Lines changed: 32 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_advise(
3434
arg2 as u64,
3535
arg3,
3636
) {
37-
Ok(e) => {
38-
wasi::ERRNO_SUCCESS.raw() as i32
39-
}
37+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
4038
Err(e) => {
4139
#[cfg(feature = "trace-syscall")]
4240
crate::trace::trace_syscall_error("fd_advise", e.clone());
@@ -73,9 +71,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_allocate(
7371
arg1 as u64,
7472
arg2 as u64,
7573
) {
76-
Ok(e) => {
77-
wasi::ERRNO_SUCCESS.raw() as i32
78-
}
74+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
7975
Err(e) => {
8076
#[cfg(feature = "trace-syscall")]
8177
crate::trace::trace_syscall_error("fd_allocate", e.clone());
@@ -100,9 +96,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_close(arg0: i32) ->
10096
};
10197
{
10298
match crate::wasi_snapshot_preview1::fd_close(fs, arg0 as UserFd) {
103-
Ok(e) => {
104-
wasi::ERRNO_SUCCESS.raw() as i32
105-
}
99+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
106100
Err(e) => {
107101
#[cfg(feature = "trace-syscall")]
108102
crate::trace::trace_syscall_error("fd_close", e.clone());
@@ -127,9 +121,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_datasync(arg0: i32)
127121
};
128122
{
129123
match crate::wasi_snapshot_preview1::fd_datasync(fs, arg0 as UserFd) {
130-
Ok(e) => {
131-
wasi::ERRNO_SUCCESS.raw() as i32
132-
}
124+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
133125
Err(e) => {
134126
#[cfg(feature = "trace-syscall")]
135127
crate::trace::trace_syscall_error("fd_datasync", e.clone());
@@ -195,9 +187,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_fdstat_set_flags(
195187
arg0 as UserFd,
196188
arg1 as Fdflags,
197189
) {
198-
Ok(e) => {
199-
wasi::ERRNO_SUCCESS.raw() as i32
200-
}
190+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
201191
Err(e) => {
202192
#[cfg(feature = "trace-syscall")]
203193
crate::trace::trace_syscall_error("fd_fdstat_set_flags", e.clone());
@@ -234,9 +224,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_fdstat_set_rights(
234224
arg1 as Rights,
235225
arg2 as Rights,
236226
) {
237-
Ok(e) => {
238-
wasi::ERRNO_SUCCESS.raw() as i32
239-
}
227+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
240228
Err(e) => {
241229
#[cfg(feature = "trace-syscall")]
242230
crate::trace::trace_syscall_error("fd_fdstat_set_rights", e.clone());
@@ -298,9 +286,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_filestat_set_size(
298286
};
299287
{
300288
match crate::wasi_snapshot_preview1::fd_filestat_set_size(fs, arg0 as UserFd, arg1 as u64) {
301-
Ok(e) => {
302-
wasi::ERRNO_SUCCESS.raw() as i32
303-
}
289+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
304290
Err(e) => {
305291
#[cfg(feature = "trace-syscall")]
306292
crate::trace::trace_syscall_error("fd_filestat_set_size", e.clone());
@@ -341,9 +327,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_filestat_set_times(
341327
arg2 as u64,
342328
arg3 as Fstflags,
343329
) {
344-
Ok(e) => {
345-
wasi::ERRNO_SUCCESS.raw() as i32
346-
}
330+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
347331
Err(e) => {
348332
#[cfg(feature = "trace-syscall")]
349333
crate::trace::trace_syscall_error("fd_filestat_set_times", e.clone());
@@ -453,9 +437,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_prestat_dir_name(
453437
arg1 as *mut u8,
454438
arg2 as u32,
455439
) {
456-
Ok(e) => {
457-
wasi::ERRNO_SUCCESS.raw() as i32
458-
}
440+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
459441
Err(e) => {
460442
#[cfg(feature = "trace-syscall")]
461443
crate::trace::trace_syscall_error("fd_prestat_dir_name", e.clone());
@@ -605,9 +587,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_renumber(arg0: i32,
605587
};
606588
{
607589
match crate::wasi_snapshot_preview1::fd_renumber(fs, arg0 as UserFd, arg1 as UserFd) {
608-
Ok(e) => {
609-
wasi::ERRNO_SUCCESS.raw() as i32
610-
}
590+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
611591
Err(e) => {
612592
#[cfg(feature = "trace-syscall")]
613593
crate::trace::trace_syscall_error("fd_renumber", e.clone());
@@ -668,9 +648,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_fd_sync(arg0: i32) -> i
668648
};
669649
{
670650
match crate::wasi_snapshot_preview1::fd_sync(fs, arg0 as UserFd) {
671-
Ok(e) => {
672-
wasi::ERRNO_SUCCESS.raw() as i32
673-
}
651+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
674652
Err(e) => {
675653
#[cfg(feature = "trace-syscall")]
676654
crate::trace::trace_syscall_error("fd_sync", e.clone());
@@ -778,9 +756,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_path_create_directory(
778756
let str_bytes = core::slice::from_raw_parts(arg1 as *const u8, (arg2 + 1) as usize);
779757
std::ffi::CStr::from_bytes_with_nul_unchecked(str_bytes)
780758
}) {
781-
Ok(e) => {
782-
wasi::ERRNO_SUCCESS.raw() as i32
783-
}
759+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
784760
Err(e) => {
785761
#[cfg(feature = "trace-syscall")]
786762
crate::trace::trace_syscall_error("path_create_directory", e.clone());
@@ -893,9 +869,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_path_filestat_set_times
893869
arg5 as u64,
894870
arg6 as Fstflags,
895871
) {
896-
Ok(e) => {
897-
wasi::ERRNO_SUCCESS.raw() as i32
898-
}
872+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
899873
Err(e) => {
900874
#[cfg(feature = "trace-syscall")]
901875
crate::trace::trace_syscall_error("path_filestat_set_times", e.clone());
@@ -958,9 +932,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_path_link(
958932
std::ffi::CStr::from_bytes_with_nul_unchecked(str_bytes)
959933
},
960934
) {
961-
Ok(e) => {
962-
wasi::ERRNO_SUCCESS.raw() as i32
963-
}
935+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
964936
Err(e) => {
965937
#[cfg(feature = "trace-syscall")]
966938
crate::trace::trace_syscall_error("path_link", e.clone());
@@ -983,11 +955,20 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_path_open(
983955
arg8: i32,
984956
) -> i32 {
985957
#[cfg(feature = "trace-syscall")]
986-
crate::trace::trace_syscall_entry(format_args!("path_open(fd: {}, dirflags: {}, path: {}, oflags: {}, fs_rights_base: {}, fs_rights_inheriting: {}, fdflags: {})\n", arg0, arg1, {
987-
let str_bytes = core::slice::from_raw_parts(arg2 as *const u8, (arg3 + 1) as usize);
988-
let cstr = std::ffi::CStr::from_bytes_with_nul_unchecked(str_bytes);
989-
cstr.to_str().unwrap().to_string()
990-
}, arg4, arg5, arg6, arg7));
958+
crate::trace::trace_syscall_entry(format_args!(
959+
"path_open(fd: {}, dirflags: {}, path: {}, oflags: {}, fs_rights_base: {}, fs_rights_inheriting: {}, fdflags: {})\n",
960+
arg0,
961+
arg1,
962+
{
963+
let str_bytes = core::slice::from_raw_parts(arg2 as *const u8, (arg3 + 1) as usize);
964+
let cstr = std::ffi::CStr::from_bytes_with_nul_unchecked(str_bytes);
965+
cstr.to_str().unwrap().to_string()
966+
},
967+
arg4,
968+
arg5,
969+
arg6,
970+
arg7
971+
));
991972
let fs = if let Some(fs) = unsafe {
992973
(*std::ptr::addr_of_mut!(crate::GLOBAL_STATE))
993974
.overlay_fs
@@ -1114,9 +1095,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_path_remove_directory(
11141095
let str_bytes = core::slice::from_raw_parts(arg1 as *const u8, (arg2 + 1) as usize);
11151096
std::ffi::CStr::from_bytes_with_nul_unchecked(str_bytes)
11161097
}) {
1117-
Ok(e) => {
1118-
wasi::ERRNO_SUCCESS.raw() as i32
1119-
}
1098+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
11201099
Err(e) => {
11211100
#[cfg(feature = "trace-syscall")]
11221101
crate::trace::trace_syscall_error("path_remove_directory", e.clone());
@@ -1176,9 +1155,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_path_rename(
11761155
std::ffi::CStr::from_bytes_with_nul_unchecked(str_bytes)
11771156
},
11781157
) {
1179-
Ok(e) => {
1180-
wasi::ERRNO_SUCCESS.raw() as i32
1181-
}
1158+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
11821159
Err(e) => {
11831160
#[cfg(feature = "trace-syscall")]
11841161
crate::trace::trace_syscall_error("path_rename", e.clone());
@@ -1233,9 +1210,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_path_symlink(
12331210
std::ffi::CStr::from_bytes_with_nul_unchecked(str_bytes)
12341211
},
12351212
) {
1236-
Ok(e) => {
1237-
wasi::ERRNO_SUCCESS.raw() as i32
1238-
}
1213+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
12391214
Err(e) => {
12401215
#[cfg(feature = "trace-syscall")]
12411216
crate::trace::trace_syscall_error("path_symlink", e.clone());
@@ -1275,9 +1250,7 @@ pub unsafe extern "C" fn wasi_vfs_wasi_snapshot_preview1_path_unlink_file(
12751250
let str_bytes = core::slice::from_raw_parts(arg1 as *const u8, (arg2 + 1) as usize);
12761251
std::ffi::CStr::from_bytes_with_nul_unchecked(str_bytes)
12771252
}) {
1278-
Ok(e) => {
1279-
wasi::ERRNO_SUCCESS.raw() as i32
1280-
}
1253+
Ok(e) => wasi::ERRNO_SUCCESS.raw() as i32,
12811254
Err(e) => {
12821255
#[cfg(feature = "trace-syscall")]
12831256
crate::trace::trace_syscall_error("path_unlink_file", e.clone());

‎src/wasi_snapshot_preview1.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use wasi::{
1717
};
1818

1919
use crate::{
20-
embed::{Node, NodeDirBody, NodeFileBody, NodeIdTrait, Storage},
2120
BackingFd, Error, FileSystem, UserFd,
21+
embed::{Node, NodeDirBody, NodeFileBody, NodeIdTrait, Storage},
2222
};
2323

2424
pub(crate) unsafe fn fd_advise<S: Storage>(

0 commit comments

Comments
 (0)