michael/sailfish
michael
/
sailfish
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update error format

This commit is contained in:
Kogia-sima 2020-12-16 15:38:28 +09:00
parent 99e0f4cf89
commit a965f03321
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sailfish-compiler/src/error.rs
View File

@ -22,10 +22,10 @@ impl fmt::Display for ErrorKind {
match *self {
ErrorKind::FmtError(ref e) => e.fmt(f),
ErrorKind::IoError(ref e) => e.fmt(f),
ErrorKind::RustSyntaxError(ref e) => write!(f, "Rust Syntax Error: {}", e),
ErrorKind::ConfigError(ref e) => write!(f, "Invalid configuration: {}", e),
ErrorKind::ParseError(ref msg) => write!(f, "Parse error: {}", msg),
ErrorKind::AnalyzeError(ref msg) => write!(f, "Analyzation error: {}", msg),
ErrorKind::RustSyntaxError(ref e) => write!(f, "Rust Syntax Error ({})", e),
ErrorKind::ConfigError(ref e) => write!(f, "Invalid configuration ({})", e),
ErrorKind::ParseError(ref msg) => write!(f, "Parse error ({})", msg),
ErrorKind::AnalyzeError(ref msg) => write!(f, "Analyzation error ({})", msg),
ErrorKind::Unimplemented(ref msg) => f.write_str(&**msg),
ErrorKind::Other(ref msg) => f.write_str(&**msg),
}
@ -97,7 +97,7 @@ impl fmt::Display for Error {
writeln!(f, "{}", self.chains.last().unwrap())?;
for e in self.chains.iter().rev().skip(1) {
writeln!(f, "Caused by: {}", e)?;
writeln!(f, "caused by: {}", e)?;
}
f.write_str("\n")?;
@ -255,7 +255,7 @@ mod tests {
assert_eq!(
err.to_string(),
r#"some error
Caused by: Analyzation error: mismatched types
caused by: Analyzation error (mismatched types)
file: apple.rs
position: line 2, column 5

2
sailfish-tests/integration-tests/tests/fails/unbalanced_brace.stderr
View File

@ -9,7 +9,7 @@ warning: unused import: `std::mem`
warning: 1 warning emitted
error: Failed to compile template.
Caused by: Rust Syntax Error: LexError
caused by: Rust Syntax Error (LexError)
file: unbalanced_brace.stpl

2
sailfish-tests/integration-tests/tests/fails/unclosed_delimter.stderr
View File

@ -9,7 +9,7 @@ warning: unused import: `std::mem`
warning: 1 warning emitted
error: Failed to compile template.
Caused by: Parse error: Unterminated code block
caused by: Parse error (Unterminated code block)
file: unclosed_delimiter.stpl
position: line 3, column 5

2
sailfish-tests/integration-tests/tests/fails/unexpected_token.stderr
View File

@ -9,7 +9,7 @@ warning: unused import: `std::mem`
warning: 1 warning emitted
error: Failed to compile template.
Caused by: Rust Syntax Error: expected expression
caused by: Rust Syntax Error (expected expression)
file: unexpected_token.stpl
position: line 3, column 17