A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Migrate the wasip2 plugins example to `wasmtime::error` (#12268)
Nick Fitzgerald3fa985acb3f5
diff --git a/Cargo.lock b/Cargo.lockindex 2e7cc0e613..9c1682efe1 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -335,7 +335,6 @@ dependencies = [name = "calculator"version = "0.1.0"dependencies = [- "anyhow","clap","wasmtime","wasmtime-wasi",diff --git a/examples/wasip2-plugins/Cargo.toml b/examples/wasip2-plugins/Cargo.tomlindex 7652628b92..cce35e7b78 100644--- a/examples/wasip2-plugins/Cargo.toml+++ b/examples/wasip2-plugins/Cargo.toml@@ -9,7 +9,6 @@ with plugins for arithmetic operations.publish = false[dependencies]-anyhow = { workspace = true }clap = { workspace = true, features = ["derive"] }wasmtime = { workspace = true, features = ['std', 'cranelift'] }wasmtime-wasi = { workspace = true }diff --git a/examples/wasip2-plugins/src/main.rs b/examples/wasip2-plugins/src/main.rsindex 1195ff48c5..40814411e6 100644--- a/examples/wasip2-plugins/src/main.rs+++ b/examples/wasip2-plugins/src/main.rs@@ -1,11 +1,10 @@-use anyhow::anyhow;use clap::Parser;use std::collections::HashMap;use std::ffi::OsStr;use std::fs;use std::path::{Path, PathBuf};use wasmtime::component::{Component, Linker, bindgen};-use wasmtime::{Engine, Store};+use wasmtime::{Engine, Store, format_err};// Generates bindings for the plugin world defined in the wit/calculator.wit file.bindgen!("plugin");@@ -26,15 +25,15 @@ struct BinaryOperation {fn lookup_plugin<'a>(state: &'a mut CalculatorState,op: &str,-) -> anyhow::Result<&'a mut PluginDesc> {+) -> wasmtime::Result<&'a mut PluginDesc> {state.plugin_descs.get_mut(op)- .ok_or(anyhow!("unknown operation {}", op))+ .ok_or(format_err!("unknown operation {}", op))}impl BinaryOperation {- fn run(self, state: &mut CalculatorState) -> anyhow::Result<()> {+ fn run(self, state: &mut CalculatorState) -> wasmtime::Result<()> {let desc = lookup_plugin(state, self.op.as_ref())?;let result = desc.plugin.call_evaluate(&mut desc.store, self.x, self.y)?;println!("{}({}, {}) = {}", self.op, self.x, self.y, result);@@ -99,7 +98,7 @@ fn load_plugins(state: &mut CalculatorState, plugins_dir: &Path) -> wasmtime::Relet linker: Linker<()> = Linker::new(&engine);if !plugins_dir.is_dir() {- anyhow::bail!("plugins directory does not exist");+ wasmtime::bail!("plugins directory does not exist");}for entry in fs::read_dir(plugins_dir)? {@@ -122,7 +121,7 @@ struct Args {plugins: PathBuf,}-fn main() -> anyhow::Result<()> {+fn main() -> wasmtime::Result<()> {// Get plugins directorylet args = Args::parse();