summaryrefslogtreecommitdiff
path: root/src/bin/riki.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/riki.rs')
-rw-r--r--src/bin/riki.rs18
1 files changed, 9 insertions, 9 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()?;