T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wasmtime-bench-api build (#4956)

Browse Source 
This fixes a compile-time error introduced in #4207. The `?` operator
doesn't work inside `Option::map` because it tries to return from the
inner closure, not the outer function.

Apparently our CI doesn't build wasmtime-bench-api so it didn't catch
this issue.
This commit is contained in:
Jamey Sharp
2022-09-25 20:39:26 -07:00
committed by GitHub
parent bd870a9d6c
commit 11e90049d2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/bench-api/src/lib.rs
View File

@@ -430,9 +430,11 @@ impl BenchState {
execution_end: extern "C" fn(*mut u8), execution_end: extern "C" fn(*mut u8),
make_wasi_cx: impl FnMut() -> Result<WasiCtx> + 'static, make_wasi_cx: impl FnMut() -> Result<WasiCtx> + 'static,
) -> Result<Self> { ) -> Result<Self> {
let config = options let config = if let Some(o) = &options {
.map(|o| o.config(Some(&Triple::host().to_string()))?) o.config(Some(&Triple::host().to_string()))?
.unwrap_or(Config::new()); } else {
Config::new()
};
// NB: do not configure a code cache. // NB: do not configure a code cache.
let engine = Engine::new(&config)?; let engine = Engine::new(&config)?;
let mut linker = Linker::<HostState>::new(&engine); let mut linker = Linker::<HostState>::new(&engine);