Reduce duplication in error messages (#532)

* Reduce duplication in error messages

This commit removes duplication in error messages where the same text
would show up multiple times in a fully rendered error message.

When using `derive(Error)` when the `#[from]` attribute is used there's
no need to also render that payload into the error string because the
`#[from]` establishes a "backtrace" which means that when the full
context of an error is rendered it will include the `#[from]` in the
lower frames of the backtrace anyway.

This commit audits the `derive(Error)` implementations to avoid
duplication in the rendered error messages, ensuring that if `#[from]`
is used then the `#[from]` field isn't also rendered in the textual
description.

* Search the full error in wast assertions

Don't just search the top error, but search the whole backtrace by using
the `{:?}` format instead of `{}`.
This commit is contained in:
Alex Crichton
2019-11-08 18:24:02 -06:00
committed by GitHub
parent b58c2bf2a4
commit 29c8c4f68f
6 changed files with 11 additions and 11 deletions

View File

@@ -114,7 +114,7 @@ pub enum ActionOutcome {
#[derive(Error, Debug)]
pub enum ActionError {
/// An internal implementation error occurred.
#[error("{0}")]
#[error("Failed to setup a module")]
Setup(#[from] SetupError),
/// No field with the specified name was present.

View File

@@ -23,10 +23,10 @@ pub struct UnknownInstance {
#[derive(Error, Debug)]
pub enum ContextError {
/// An unknown instance name was used.
#[error("{0}")]
#[error("An error occured due to an unknown instance being specified")]
Instance(#[from] UnknownInstance),
/// An error occured while performing an action.
#[error("{0}")]
#[error("An error occurred while performing an action")]
Action(#[from] ActionError),
}

View File

@@ -35,12 +35,12 @@ pub enum SetupError {
Validate(String),
/// A wasm translation error occured.
#[error("WebAssembly compilation error: {0}")]
#[error("WebAssembly failed to compile")]
Compile(#[from] CompileError),
/// Some runtime resource was unavailable or insufficient, or the start function
/// trapped.
#[error("Instantiation error: {0}")]
#[error("Instantiation failed during setup")]
Instantiate(#[from] InstantiationError),
/// Debug information generation error occured.