summaryrefslogtreecommitdiff
path: root/src/error.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/error.rs')
-rw-r--r--src/error.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/error.rs b/src/error.rs
index 6d4d13b..a3944c3 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -18,6 +18,9 @@ pub enum RikiError {
#[error(transparent)]
Directive(#[from] crate::directive::DirectiveError),
+ #[error(transparent)]
+ Parser(#[from] crate::parser::ParserError),
+
#[error("string formatting error: {0}")]
Format(#[source] std::fmt::Error),
@@ -36,9 +39,6 @@ pub enum RikiError {
#[error(transparent)]
PageSpec(#[from] crate::pagespec::PageSpecError),
- #[error("failed to parse wikitext, line {0}, column {1}: {2:?}")]
- WikitextSyntax(usize, usize, Vec<crate::token::TokenKind>),
-
#[error(transparent)]
HtmlError(#[from] HtmlError),
}
@@ -46,6 +46,6 @@ pub enum RikiError {
impl RikiError {
pub fn wikitext_syntax(line: usize, col: usize, tokens: &[crate::token::TokenKind]) -> Self {
let tokens = tokens.to_vec();
- Self::WikitextSyntax(line, col, tokens)
+ crate::parser::ParserError::WikitextSyntax(line, col, tokens).into()
}
}