Skip to content

Slightly improve error message of feeding components to Module APIs #8235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fitzgen merged 1 commit into from
Mar 25, 2024
Merged

Slightly improve error message of feeding components to Module APIs #8235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions crates/environ/src/module_environ.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use crate::{
Tunables, TypeConvert, TypeIndex, Unsigned, WasmError, WasmHeapType, WasmResult, WasmValType,
WasmparserTypeConverter,
};
use anyhow::{bail, Result};
use std::borrow::Cow;
use std::collections::HashMap;
use std::path::PathBuf;
Expand Down Expand Up @@ -182,7 +183,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
mut self,
parser: Parser,
data: &'data [u8],
) -> WasmResult<ModuleTranslation<'data>> {
) -> Result<ModuleTranslation<'data>> {
self.result.wasm = data;

for payload in parser.parse_all(data) {
Expand All @@ -192,7 +193,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
Ok(self.result)
}

fn translate_payload(&mut self, payload: Payload<'data>) -> WasmResult<()> {
fn translate_payload(&mut self, payload: Payload<'data>) -> Result<()> {
match payload {
Payload::Version {
num,
Expand All @@ -203,7 +204,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
match encoding {
Encoding::Module => {}
Encoding::Component => {
return Err(WasmError::Unsupported(format!("component model")));
bail!("expected a WebAssembly module but was given a WebAssembly component")
}
}
}
Expand Down Expand Up @@ -324,7 +325,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
TableInitialValue::GlobalGet(index)
}
s => {
return Err(WasmError::Unsupported(format!(
bail!(WasmError::Unsupported(format!(
"unsupported init expr in table section: {:?}",
s
)));
Expand Down Expand Up @@ -388,7 +389,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
GlobalInit::GetGlobal(GlobalIndex::from_u32(global_index))
}
s => {
return Err(WasmError::Unsupported(format!(
bail!(WasmError::Unsupported(format!(
"unsupported init expr in global section: {:?}",
s
)));
Expand Down Expand Up @@ -479,7 +480,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
TableElementExpression::GlobalGet(global)
}
s => {
return Err(WasmError::Unsupported(format!(
bail!(WasmError::Unsupported(format!(
"unsupported init expr in element section: {:?}",
s
)));
Expand All @@ -504,7 +505,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
(Some(GlobalIndex::from_u32(global_index)), 0)
}
ref s => {
return Err(WasmError::Unsupported(format!(
bail!(WasmError::Unsupported(format!(
"unsupported init expr in element section: {:?}",
s
)));
Expand Down Expand Up @@ -625,7 +626,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
(Some(GlobalIndex::from_u32(global_index)), 0)
}
s => {
return Err(WasmError::Unsupported(format!(
bail!(WasmError::Unsupported(format!(
"unsupported init expr in data section: {:?}",
s
)));
Expand Down Expand Up @@ -673,7 +674,7 @@ impl<'a, 'data> ModuleEnvironment<'a, 'data> {
Payload::CustomSection(s)
if s.name() == "webidl-bindings" || s.name() == "wasm-interface-types" =>
{
return Err(WasmError::Unsupported(
bail!(
"\
Support for interface types has temporarily been removed from `wasmtime`.

Expand All @@ -685,8 +686,7 @@ and for re-adding support for interface types you can see this issue:

https://github.com/bytecodealliance/wasmtime/issues/677
"
.to_string(),
))
)
}

Payload::CustomSection(s) => {
Expand Down
12 changes: 12 additions & 0 deletions tests/all/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,15 @@ fn large_add_chain_no_stack_overflow() -> Result<()> {

Ok(())
}

#[test]
fn compile_a_component() -> Result<()> {
let engine = Engine::default();
let err = Module::new(&engine, "(component)").unwrap_err();
let err = format!("{err:?}");
assert!(
err.contains("expected a WebAssembly module but was given a WebAssembly component"),
"bad error: {err}"
);
Ok(())
}