refactor: rename SiteError to RikiError

I may want to use the name SiteError just for src/site.rs.

Sponsored-by: author

22 files changed, 100 insertions, 100 deletions

diff --git a/src/bin/riki.rs b/src/bin/riki.rs
index 3c24148..20990f5 100644
--- a/src/bin/riki.rs
+++ b/src/bin/riki.rs
@@ -1,7 +1,7 @@
 use clap::{CommandFactory, FromArgMatches, Parser};
 use git_testament::{git_testament, render_testament, GitModification};
 use log::{debug, error, info};
-use riki::error::SiteError;
+use riki::error::RikiError;
 use riki::git::{git_dirty, git_whatchanged};
 use riki::name::Name;
 use riki::pagespec;
@@ -28,14 +28,14 @@ fn main() {
     }
 }
 
-fn real_main() -> Result<(), SiteError> {
+fn real_main() -> Result<(), RikiError> {
     let env = env_logger::Env::new().filter(ENVLOG);
     env_logger::init_from_env(env);
 
     info!("riki starts");
 
-    let version = version().map_err(SiteError::Format)?;
-    let long_version = long_version().map_err(SiteError::Format)?;
+    let version = version().map_err(RikiError::Format)?;
+    let long_version = long_version().map_err(RikiError::Format)?;
 
     {
         let argparser = Args::command();
@@ -134,7 +134,7 @@ struct Build {
 }
 
 impl Build {
-    fn run(&self) -> Result<(), SiteError> {
+    fn run(&self) -> Result<(), RikiError> {
         let srcdir = canonicalize(&self.srcdir)?;
         debug!("srcdir={}", srcdir.display());
 
@@ -175,7 +175,7 @@ struct List {
 }
 
 impl List {
-    fn run(&self) -> Result<(), SiteError> {
+    fn run(&self) -> Result<(), RikiError> {
         let srcdir = canonicalize(&self.srcdir)?;
         let mut site = Site::new(&srcdir, &srcdir);
         site.scan()?;
@@ -196,7 +196,7 @@ struct Timestamps {
 }
 
 impl Timestamps {
-    fn run(&self) -> Result<(), SiteError> {
+    fn run(&self) -> Result<(), RikiError> {
         let srcdir = canonicalize(&self.srcdir)?;
         let mut site = Site::new(&srcdir, &srcdir);
         site.scan()?;
@@ -234,7 +234,7 @@ struct ParseDate {
 }
 
 impl ParseDate {
-    fn run(&self) -> Result<(), SiteError> {
+    fn run(&self) -> Result<(), RikiError> {
         for date in self.dates.iter() {
             println!("input: {:?}", date);
             let parsed = parse_timestamp(date)?;
@@ -258,7 +258,7 @@ struct PageSpec {
 }
 
 impl PageSpec {
-    fn run(&self) -> Result<(), SiteError> {
+    fn run(&self) -> Result<(), RikiError> {
         let srcdir = canonicalize(&self.srcdir)?;
         let mut site = Site::new(&srcdir, &PathBuf::from("/tmp"));
         site.scan()?;
diff --git a/src/directive/calendar.rs b/src/directive/calendar.rs
index f29aaf9..64298f6 100644
--- a/src/directive/calendar.rs
+++ b/src/directive/calendar.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -24,7 +24,7 @@ impl DirectiveImplementation for Calendar {
         Self::default()
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
-        Err(SiteError::UnimplementedDirective("calendar".into()))
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
+        Err(RikiError::UnimplementedDirective("calendar".into()))
     }
 }
diff --git a/src/directive/format.rs b/src/directive/format.rs
index 66741ff..fbfdde6 100644
--- a/src/directive/format.rs
+++ b/src/directive/format.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -16,7 +16,7 @@ impl DirectiveImplementation for Format {
         Self::default()
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
-        Err(SiteError::UnimplementedDirective("format".into()))
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
+        Err(RikiError::UnimplementedDirective("format".into()))
     }
 }
diff --git a/src/directive/graph.rs b/src/directive/graph.rs
index 56a6ac8..12d3c66 100644
--- a/src/directive/graph.rs
+++ b/src/directive/graph.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -16,7 +16,7 @@ impl DirectiveImplementation for Graph {
         Self::default()
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
-        Err(SiteError::UnimplementedDirective("graph".into()))
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
+        Err(RikiError::UnimplementedDirective("graph".into()))
     }
 }
diff --git a/src/directive/img.rs b/src/directive/img.rs
index 8b74e5e..843975c 100644
--- a/src/directive/img.rs
+++ b/src/directive/img.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -82,7 +82,7 @@ impl DirectiveImplementation for Img {
         img
     }
 
-    fn process(&self, site: &Site, meta: &mut PageMeta) -> Result<Processed, SiteError> {
+    fn process(&self, site: &Site, meta: &mut PageMeta) -> Result<Processed, RikiError> {
         trace!(
             "verify image exists: {} on {}",
             self.src,
diff --git a/src/directive/inline.rs b/src/directive/inline.rs
index f4e18d7..5afc02c 100644
--- a/src/directive/inline.rs
+++ b/src/directive/inline.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::pagespec::PageSpec;
 use crate::site::Site;
@@ -38,7 +38,7 @@ impl DirectiveImplementation for Inline {
         Inline::new(pages.to_string())
     }
 
-    fn process(&self, site: &Site, meta: &mut PageMeta) -> Result<Processed, SiteError> {
+    fn process(&self, site: &Site, meta: &mut PageMeta) -> Result<Processed, RikiError> {
         let pagespec = PageSpec::new(meta.path(), &self.pages)?;
         let matches: Vec<String> = site
             .markdown_pages()
diff --git a/src/directive/map.rs b/src/directive/map.rs
index e468aad..5a9d2ae 100644
--- a/src/directive/map.rs
+++ b/src/directive/map.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -16,7 +16,7 @@ impl DirectiveImplementation for Map {
         Self::default()
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
-        Err(SiteError::UnimplementedDirective("map".into()))
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
+        Err(RikiError::UnimplementedDirective("map".into()))
     }
 }
diff --git a/src/directive/meta.rs b/src/directive/meta.rs
index 882288b..00f2372 100644
--- a/src/directive/meta.rs
+++ b/src/directive/meta.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::time::parse_timestamp;
@@ -28,7 +28,7 @@ impl DirectiveImplementation for Meta {
         meta
     }
 
-    fn process(&self, _site: &Site, meta: &mut PageMeta) -> Result<Processed, SiteError> {
+    fn process(&self, _site: &Site, meta: &mut PageMeta) -> Result<Processed, RikiError> {
         if let Some(title) = &self.title {
             meta.set_title(title.into());
         }
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
diff --git a/src/directive/pagestats.rs b/src/directive/pagestats.rs
index 11edc29..1971a16 100644
--- a/src/directive/pagestats.rs
+++ b/src/directive/pagestats.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -16,7 +16,7 @@ impl DirectiveImplementation for PageStats {
         Self::default()
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
-        Err(SiteError::UnimplementedDirective("pagestat".into()))
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
+        Err(RikiError::UnimplementedDirective("pagestat".into()))
     }
 }
diff --git a/src/directive/shortcut.rs b/src/directive/shortcut.rs
index 48bc482..8c5009d 100644
--- a/src/directive/shortcut.rs
+++ b/src/directive/shortcut.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::{Shortcut as S, Site};
 use crate::wikitext::ParsedDirective;
@@ -24,13 +24,13 @@ impl DirectiveImplementation for Shortcut {
         Self::new(S::new(name, desc, url))
     }
 
-    fn prepare(&self, site: &mut Site) -> Result<(), SiteError> {
+    fn prepare(&self, site: &mut Site) -> Result<(), RikiError> {
         trace!("shortcut: prepare");
         site.add_shortcut(self.shortcut.clone());
         Ok(())
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
         Ok(Processed::Markdown("".into()))
     }
 }
diff --git a/src/directive/sidebar.rs b/src/directive/sidebar.rs
index 1c25144..c7a3ca8 100644
--- a/src/directive/sidebar.rs
+++ b/src/directive/sidebar.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -16,7 +16,7 @@ impl DirectiveImplementation for Sidebar {
         Self::default()
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
-        Err(SiteError::UnimplementedDirective("sidebar".into()))
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
+        Err(RikiError::UnimplementedDirective("sidebar".into()))
     }
 }
diff --git a/src/directive/table.rs b/src/directive/table.rs
index 2bbfbc8..3039516 100644
--- a/src/directive/table.rs
+++ b/src/directive/table.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -19,7 +19,7 @@ impl DirectiveImplementation for Table {
         Self::new(p.args().get("data").unwrap().to_string())
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
         let mut table = String::new();
         let mut lines = self.data.trim().lines();
         if let Some(first) = lines.next() {
diff --git a/src/directive/tag.rs b/src/directive/tag.rs
index 6d4377d..b6708ef 100644
--- a/src/directive/tag.rs
+++ b/src/directive/tag.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -19,7 +19,7 @@ impl DirectiveImplementation for Tag {
         Tag::new(tags)
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
         Ok(Processed::Markdown("".into()))
     }
 }
diff --git a/src/directive/toc.rs b/src/directive/toc.rs
index f027931..4425e6e 100644
--- a/src/directive/toc.rs
+++ b/src/directive/toc.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::html::{Content, Element, ElementTag};
 use crate::page::PageMeta;
 use crate::site::Site;
@@ -21,11 +21,11 @@ impl DirectiveImplementation for Toc {
         Self::new(levels.to_string())
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
         let levels: usize = self
             .levels
             .parse()
-            .map_err(|e| SiteError::LevelsParse(self.levels.clone(), e))?;
+            .map_err(|e| RikiError::LevelsParse(self.levels.clone(), e))?;
         Ok(Processed::Toc(levels))
     }
 }
diff --git a/src/directive/traillink.rs b/src/directive/traillink.rs
index b3e8cb7..d7ed8d8 100644
--- a/src/directive/traillink.rs
+++ b/src/directive/traillink.rs
@@ -1,5 +1,5 @@
 use crate::directive::{DirectiveImplementation, Processed};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::page::PageMeta;
 use crate::site::Site;
 use crate::wikitext::ParsedDirective;
@@ -16,7 +16,7 @@ impl DirectiveImplementation for TrailLink {
         Self::default()
     }
 
-    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, SiteError> {
-        Err(SiteError::UnimplementedDirective("traillink".into()))
+    fn process(&self, _site: &Site, _meta: &mut PageMeta) -> Result<Processed, RikiError> {
+        Err(RikiError::UnimplementedDirective("traillink".into()))
     }
 }
diff --git a/src/error.rs b/src/error.rs
index 74970f7..d6a7d57 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -2,7 +2,7 @@ use crate::html::HtmlError;
 use std::path::PathBuf;
 
 #[derive(Debug, thiserror::Error)]
-pub enum SiteError {
+pub enum RikiError {
     #[error(transparent)]
     WalkDir(#[from] crate::srcdir::SourceDirError),
 
@@ -61,7 +61,7 @@ pub enum SiteError {
     HtmlError(#[from] HtmlError),
 }
 
-impl SiteError {
+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)
diff --git a/src/page.rs b/src/page.rs
index 3dd3029..3cca57e 100644
--- a/src/page.rs
+++ b/src/page.rs
@@ -1,5 +1,5 @@
 use crate::directive::{Processed, Toc};
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::html::{parse, Content, Element, ElementTag, HtmlPage};
 use crate::name::Name;
 use crate::parser::WikitextParser;
@@ -33,7 +33,7 @@ impl Page {
         &self.meta
     }
 
-    pub fn markdown(&self, site: &mut Site) -> Result<MarkdownPage, SiteError> {
+    pub fn markdown(&self, site: &mut Site) -> Result<MarkdownPage, RikiError> {
         self.unprocessed.process(site)
     }
 }
@@ -49,7 +49,7 @@ impl WikitextPage {
         Self { meta, wikitext }
     }
 
-    pub fn read(name: &Name) -> Result<Self, SiteError> {
+    pub fn read(name: &Name) -> Result<Self, RikiError> {
         info!("input file: {}", name);
 
         let src = name.source_path();
@@ -84,7 +84,7 @@ pub struct UnprocessedPage {
 }
 
 impl UnprocessedPage {
-    pub fn new(meta: PageMeta, parser: &mut WikitextParser) -> Result<Self, SiteError> {
+    pub fn new(meta: PageMeta, parser: &mut WikitextParser) -> Result<Self, RikiError> {
         Ok(Self {
             meta,
             snippets: Self::snippets(parser)?,
@@ -95,7 +95,7 @@ impl UnprocessedPage {
         &self.meta
     }
 
-    fn snippets(parser: &mut WikitextParser) -> Result<Vec<Snippet>, SiteError> {
+    fn snippets(parser: &mut WikitextParser) -> Result<Vec<Snippet>, RikiError> {
         let mut snippets = vec![];
         while let Some(snippet) = parser.parse()? {
             snippets.push(snippet);
@@ -103,7 +103,7 @@ impl UnprocessedPage {
         Ok(snippets)
     }
 
-    pub fn prepare(&self, site: &mut Site) -> Result<(), SiteError> {
+    pub fn prepare(&self, site: &mut Site) -> Result<(), RikiError> {
         trace!("UnprocessedPage: preparing snippets");
         for snippet in self.snippets.iter() {
             snippet.prepare(site)?;
@@ -111,7 +111,7 @@ impl UnprocessedPage {
         Ok(())
     }
 
-    pub fn process(&self, site: &mut Site) -> Result<MarkdownPage, SiteError> {
+    pub fn process(&self, site: &mut Site) -> Result<MarkdownPage, RikiError> {
         let mut meta = self.meta.clone();
         let mut processed = vec![];
         trace!("UnprocessedPage: processing snippets");
@@ -157,14 +157,14 @@ impl MarkdownPage {
         &self.meta
     }
 
-    pub fn body_to_html(&self) -> Result<HtmlPage, SiteError> {
+    pub fn body_to_html(&self) -> Result<HtmlPage, RikiError> {
         let head = Element::new(ElementTag::Head);
         let body = parse(self.markdown())
-            .map_err(|e| SiteError::PageProblem(self.meta.path().into(), Box::new(e.into())))?;
+            .map_err(|e| RikiError::PageProblem(self.meta.path().into(), Box::new(e.into())))?;
         Ok(HtmlPage::new(head, body))
     }
 
-    pub fn to_html(&self) -> Result<HtmlPage, SiteError> {
+    pub fn to_html(&self) -> Result<HtmlPage, RikiError> {
         let mut title = Element::new(ElementTag::Title);
         title.push_child(Content::Text(self.meta.title().into()));
 
@@ -172,7 +172,7 @@ impl MarkdownPage {
         head.push_child(Content::Elt(title));
 
         let body = parse(self.markdown())
-            .map_err(|e| SiteError::PageProblem(self.meta.path().into(), Box::new(e.into())))?;
+            .map_err(|e| RikiError::PageProblem(self.meta.path().into(), Box::new(e.into())))?;
 
         trace!("MarkdownPage::to_html: head={:?}", head);
         Ok(HtmlPage::new(head, body))
diff --git a/src/parser.rs b/src/parser.rs
index 59ba111..81eda42 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -1,4 +1,4 @@
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::token::{TokenKind, TokenParser, TokenPatterns};
 use crate::wikitext::{ParsedDirective, Snippet, WikiLink};
 use line_col::LineColLookup;
@@ -44,7 +44,7 @@ impl WikitextParser {
         self.tokens.is_empty()
     }
 
-    pub fn parse(&mut self) -> Result<Option<Snippet>, SiteError> {
+    pub fn parse(&mut self) -> Result<Option<Snippet>, RikiError> {
         if self.is_empty() {
             return Ok(None);
         }
@@ -110,7 +110,7 @@ impl WikitextParser {
                             self.drain(3);
                             break;
                         }
-                        _ => return Err(SiteError::wikitext_syntax(line, col, &self.tokens[..5])),
+                        _ => return Err(RikiError::wikitext_syntax(line, col, &self.tokens[..5])),
                     }
                 }
                 if target.is_none() {
@@ -163,7 +163,7 @@ impl WikitextParser {
                             args.insert(value.to_string(), "".to_string());
                             self.drain(1);
                         }
-                        _ => return Err(SiteError::wikitext_syntax(line, col, &self.tokens[..5])),
+                        _ => return Err(RikiError::wikitext_syntax(line, col, &self.tokens[..5])),
                     }
                 }
                 Snippet::Directive(ParsedDirective::new(&name, args)?)
@@ -199,7 +199,7 @@ impl WikitextParser {
                             break;
                         }
                         _ => {
-                            return Err(SiteError::wikitext_syntax(
+                            return Err(RikiError::wikitext_syntax(
                                 line,
                                 col,
                                 &self.tokens[..std::cmp::min(5, self.tokens.len())],
@@ -279,7 +279,7 @@ impl WikitextParser {
                 self.drain(1);
                 Snippet::Markdown("]]".into())
             }
-            _ => return Err(SiteError::wikitext_syntax(line, col, &self.tokens[..5])),
+            _ => return Err(RikiError::wikitext_syntax(line, col, &self.tokens[..5])),
         };
         Ok(Some(snippet))
     }
diff --git a/src/site.rs b/src/site.rs
index 739cffb..9c6463e 100644
--- a/src/site.rs
+++ b/src/site.rs
@@ -1,4 +1,4 @@
-use crate::error::SiteError;
+use crate::error::RikiError;
 use crate::git::git_whatchanged;
 use crate::name::{Name, NameBuilder, Names};
 use crate::page::{MarkdownPage, Page, UnprocessedPage, WikitextPage};
@@ -40,7 +40,7 @@ impl Site {
         }
     }
 
-    pub fn scan(&mut self) -> Result<(), SiteError> {
+    pub fn scan(&mut self) -> Result<(), RikiError> {
         for name in self.all_files()? {
             trace!("scan: name={}", name);
             if name.is_wikitext_page() {
@@ -60,7 +60,7 @@ impl Site {
         Ok(())
     }
 
-    fn add_wikitextpage(&mut self, page: WikitextPage) -> Result<(), SiteError> {
+    fn add_wikitextpage(&mut self, page: WikitextPage) -> Result<(), RikiError> {
         info!("add wikitext page {}", page.meta().path().display());
         self.pages_that_will_exist.insert(&page);
 
@@ -80,7 +80,7 @@ impl Site {
         self.files.insert(name);
     }
 
-    pub fn process(&mut self) -> Result<(), SiteError> {
+    pub fn process(&mut self) -> Result<(), RikiError> {
         trace!("processing queues");
         loop {
             if !self.process_page()? {
@@ -91,7 +91,7 @@ impl Site {
         Ok(())
     }
 
-    fn process_page(&mut self) -> Result<bool, SiteError> {
+    fn process_page(&mut self) -> Result<bool, RikiError> {
         if let Some(page) = self.pages.pop() {
             debug!(
                 "processing unprocessed page {}",
@@ -122,7 +122,7 @@ impl Site {
         self.pages_that_will_exist.get_path(path).is_some()
     }
 
-    fn all_files(&self) -> Result<Vec<Name>, SiteError> {
+    fn all_files(&self) -> Result<Vec<Name>, RikiError> {
         let whatchanged = git_whatchanged(self.name_builder.srcdir())?;
 
         let mut srcdir = SourceDir::new(self.name_builder.srcdir());
@@ -153,7 +153,7 @@ impl Site {
         }
     }
 
-    pub fn resolve<P: AsRef<Path>>(&self, page: P, target: P) -> Result<PathBuf, SiteError> {
+    pub fn resolve<P: AsRef<Path>>(&self, page: P, target: P) -> Result<PathBuf, RikiError> {
         let page = page.as_ref();
         let target = target.as_ref();
         let resolved = self.resolve_helper(page, target)?;
@@ -169,7 +169,7 @@ impl Site {
         Ok(resolved)
     }
 
-    fn resolve_helper(&self, page: &Path, target: &Path) -> Result<PathBuf, SiteError> {
+    fn resolve_helper(&self, page: &Path, target: &Path) -> Result<PathBuf, RikiError> {
         trace!(
             "recursive_helper: page={} target={}",
             page.display(),
@@ -183,7 +183,7 @@ impl Site {
                 return Ok(path.into());
             } else {
                 trace!("absolute target does not exist");
-                return Err(SiteError::PageMissing(page.into(), target.into()));
+                return Err(RikiError::PageMissing(page.into(), target.into()));
             }
         }
 
@@ -230,7 +230,7 @@ impl Site {
 
         // Target doesn't exist.
         trace!("target does not exist: {}", target.display());
-        Err(SiteError::PageMissing(page.into(), target.into()))
+        Err(RikiError::PageMissing(page.into(), target.into()))
     }
 
     fn file_exists(&self, filename: &Path) -> bool {
@@ -307,7 +307,7 @@ impl Shortcut {
 
 #[cfg(test)]
 mod test {
-    use super::{Name, NameBuilder, Site, SiteError, WikitextPage};
+    use super::{Name, NameBuilder, Site, RikiError, WikitextPage};
     use crate::page::MetaBuilder;
     use crate::pagespec::PageSpec;
     use std::{
@@ -353,7 +353,7 @@ mod test {
     fn link_to_missing_is_an_error() {
         let site = site();
         match site.resolve("/src/foo/bar", "yo") {
-            Err(SiteError::PageMissing(page, target)) => {
+            Err(RikiError::PageMissing(page, target)) => {
                 assert_eq!(target, PathBuf::from("yo"));
                 assert_eq!(page, PathBuf::from("/src/foo/bar"));
             }
@@ -399,7 +399,7 @@ mod test {
         let mut site = site();
         site.process().unwrap();
         match site.resolve("/foo/bar", "yo/yoyo") {
-            Err(SiteError::PageMissing(page, target)) => {
+            Err(RikiError::PageMissing(page, target)) => {
                 assert_eq!(target, PathBuf::from("yo/yoyo"));
                 assert_eq!(page, PathBuf::from("/foo/bar"));
             }
diff --git a/src/time.rs b/src/time.rs
index dce3ecc..98256b1 100644
--- a/src/time.rs
+++ b/src/time.rs
@@ -1,4 +1,4 @@
-use crate::error::SiteError;
+use crate::error::RikiError;
 use log::trace;
 use std::time::{Duration, SystemTime};
 use time::{
@@ -9,7 +9,7 @@ use time::{
     OffsetDateTime, PrimitiveDateTime,
 };
 
-pub fn parse_timestamp(timestamp: &str) -> Result<SystemTime, SiteError> {
+pub fn parse_timestamp(timestamp: &str) -> Result<SystemTime, RikiError> {
     trace!("parsing timestamp {:?}", timestamp);
     let odt = parse(timestamp)?;
     let unix = odt.unix_timestamp();
@@ -24,7 +24,7 @@ fn system_time(unix: i64) -> SystemTime {
     SystemTime::UNIX_EPOCH.checked_add(offset).unwrap()
 }
 
-fn parse(timestamp: &str) -> Result<OffsetDateTime, SiteError> {
+fn parse(timestamp: &str) -> Result<OffsetDateTime, RikiError> {
     const SIMPLIFIED_ISO9601: &[FormatItem<'static>] =
         format_description!("[year]-[month]-[day] [hour]:[minute]:[second]");
     const SIMPLIFIED_ISO9601_MIN: &[FormatItem<'static>] =
@@ -51,7 +51,7 @@ fn parse(timestamp: &str) -> Result<OffsetDateTime, SiteError> {
     } else if let Ok(t) = parse_one_time_format(timestamp, "RFC2822", &Rfc2822) {
         Ok(t)
     } else {
-        Err(SiteError::UnknownTimestamp(timestamp.into()))
+        Err(RikiError::UnknownTimestamp(timestamp.into()))
     }
 }
 
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(),