diff options
Diffstat (limited to 'src/directive/mod.rs')
-rw-r--r-- | src/directive/mod.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/directive/mod.rs b/src/directive/mod.rs index ae2dc09..dd9eedb 100644 --- a/src/directive/mod.rs +++ b/src/directive/mod.rs @@ -1,4 +1,4 @@ -use crate::error::SiteError; +use crate::error::RikiError; use crate::page::PageMeta; use crate::site::Site; use crate::wikitext::ParsedDirective; @@ -17,9 +17,9 @@ pub trait DirectiveImplementation { const ALLOW_ANY_UNNAMED: bool; fn from_parsed(p: &ParsedDirective) -> Self; - fn process(&self, site: &Site, meta: &mut PageMeta) -> Result<Processed, SiteError>; + fn process(&self, site: &Site, meta: &mut PageMeta) -> Result<Processed, RikiError>; - fn prepare(&self, _site: &mut Site) -> Result<(), SiteError> { + fn prepare(&self, _site: &mut Site) -> Result<(), RikiError> { Ok(()) } } @@ -49,7 +49,7 @@ pub enum Directive { } impl TryFrom<ParsedDirective> for Directive { - type Error = SiteError; + type Error = RikiError; fn try_from(p: ParsedDirective) -> Result<Self, Self::Error> { Self::try_from(&p) @@ -57,7 +57,7 @@ impl TryFrom<ParsedDirective> for Directive { } impl TryFrom<&ParsedDirective> for Directive { - type Error = SiteError; + type Error = RikiError; fn try_from(p: &ParsedDirective) -> Result<Self, Self::Error> { let d = match p.name() { @@ -173,7 +173,7 @@ impl TryFrom<&ParsedDirective> for Directive { )?; Directive::TrailLink(TrailLink::from_parsed(p)) } - _ => return Err(SiteError::UnknownDirective(p.name().into())), + _ => return Err(RikiError::UnknownDirective(p.name().into())), }; Ok(d) } @@ -185,11 +185,11 @@ impl Directive { required: &[&str], allowed: &[&str], allow_any_unnamed: bool, - ) -> Result<(), SiteError> { + ) -> Result<(), RikiError> { let args = p.args(); for arg in required.iter() { if !args.contains_key(arg) { - return Err(SiteError::DirectiveMissingArg( + return Err(RikiError::DirectiveMissingArg( p.name().into(), arg.to_string(), )); @@ -201,11 +201,11 @@ impl Directive { for (arg, value) in p.args().iter() { if value.is_empty() { if !allow_any_unnamed { - return Err(SiteError::UnknownArgsNotAllowed(p.name().into())); + return Err(RikiError::UnknownArgsNotAllowed(p.name().into())); } } else if !allowed.contains(*arg) { debug!("parsed directive {:?}", p); - return Err(SiteError::DirectiveUnknownArg( + return Err(RikiError::DirectiveUnknownArg( p.name().into(), arg.to_string(), )); @@ -214,7 +214,7 @@ impl Directive { Ok(()) } - pub fn prepare(&self, site: &mut Site) -> Result<(), SiteError> { + pub fn prepare(&self, site: &mut Site) -> Result<(), RikiError> { trace!("prepare directive {:?}", self); if let Self::Shortcut(x) = self { x.prepare(site)?; @@ -222,7 +222,7 @@ impl Directive { Ok(()) } - pub fn process(&self, site: &mut Site, meta: &mut PageMeta) -> Result<Processed, SiteError> { + pub fn process(&self, site: &mut Site, meta: &mut PageMeta) -> Result<Processed, RikiError> { match self { Self::Simple | Self::UnnamedArg |