summaryrefslogtreecommitdiff
path: root/src/wikitext.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wikitext.rs')
-rw-r--r--src/wikitext.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wikitext.rs b/src/wikitext.rs
index b78cd66..2561ce5 100644
--- a/src/wikitext.rs
+++ b/src/wikitext.rs
@@ -1,5 +1,5 @@
use crate::directive::{Directive, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
use crate::page::PageMeta;
use crate::site::Site;
use log::trace;
@@ -14,7 +14,7 @@ pub enum Snippet {
}
impl Snippet {
- pub fn prepare(&self, site: &mut Site) -> Result<(), SiteError> {
+ pub fn prepare(&self, site: &mut Site) -> Result<(), RikiError> {
trace!("prepare snippet {:?}", self);
if let Snippet::Directive(p) = self {
trace!("creating directive from parsed directive");
@@ -29,14 +29,14 @@ impl Snippet {
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> {
trace!("Snippet::process: self={:?}", self);
let processed = match self {
Snippet::Markdown(text) => Processed::Markdown(text.into()),
Snippet::WikiLink(w) => {
let resolved = site
.resolve(meta.path(), Path::new(w.target()))
- .map_err(|e| SiteError::PageProblem(meta.path().into(), Box::new(e)))?;
+ .map_err(|e| RikiError::PageProblem(meta.path().into(), Box::new(e)))?;
trace!("resolved {} to {}", w.target(), resolved.display());
let link = format!("[{}]({})", w.link_text(), resolved.display());
Processed::Markdown(link)
@@ -45,7 +45,7 @@ impl Snippet {
let e = Directive::try_from(p);
if let Ok(d) = e {
d.process(site, meta)
- .map_err(|e| SiteError::PageProblem(meta.path().into(), Box::new(e)))?
+ .map_err(|e| RikiError::PageProblem(meta.path().into(), Box::new(e)))?
} else if let Some(shortcut) = site.shortcut(p.name()) {
let arg = p.unnamed_args().first().unwrap().to_string();
let link = format!("[{}]({})", shortcut.desc(&arg), shortcut.url(&arg));
@@ -89,7 +89,7 @@ pub struct ParsedDirective {
}
impl ParsedDirective {
- pub fn new(name: &str, args: HashMap<String, String>) -> Result<Self, SiteError> {
+ pub fn new(name: &str, args: HashMap<String, String>) -> Result<Self, RikiError> {
trace!("ParsedDirective::new: name={:?} args={:?}", name, args);
Ok(Self {
name: name.into(),