diff options
author | Lars Wirzenius <liw@liw.fi> | 2023-01-07 13:22:53 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2023-01-07 13:22:53 +0200 |
commit | 25e24fb5f971498c19d5b3fae80494d973217990 (patch) | |
tree | b38106a6c78bb253d8b09c02888ff96e20088a79 | |
parent | 45916f032a7fbbd30f8d3dac2870a837d2c4684f (diff) | |
download | riki-25e24fb5f971498c19d5b3fae80494d973217990.tar.gz |
refactor: move boxing from PageError::Wikitext to SiteError::Page
Sponsored-by: author
-rw-r--r-- | src/page.rs | 10 | ||||
-rw-r--r-- | src/site.rs | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/page.rs b/src/page.rs index ec29936..ba4c55f 100644 --- a/src/page.rs +++ b/src/page.rs @@ -5,7 +5,7 @@ use crate::name::Name; use crate::parser::{ParserError, WikitextParser}; use crate::site::Site; use crate::util::get_mtime; -use crate::wikitext::{Snippet, WikitextError}; +use crate::wikitext::Snippet; use log::{info, trace}; use std::path::{Path, PathBuf}; use std::time::SystemTime; @@ -22,7 +22,7 @@ pub enum PageError { Util(#[from] crate::util::UtilError), #[error(transparent)] - Wikitext(#[from] Box<crate::wikitext::WikitextError>), + Wikitext(#[from] crate::wikitext::WikitextError), #[error(transparent)] Html(#[from] Box<HtmlError>), @@ -31,12 +31,6 @@ pub enum PageError { Parser(#[from] Box<ParserError>), } -impl From<WikitextError> for PageError { - fn from(e: WikitextError) -> Self { - Self::Wikitext(Box::new(e)) - } -} - impl From<HtmlError> for PageError { fn from(e: HtmlError) -> Self { Self::Html(Box::new(e)) diff --git a/src/site.rs b/src/site.rs index 49da9f2..4d2ce29 100644 --- a/src/site.rs +++ b/src/site.rs @@ -1,6 +1,6 @@ use crate::git::git_whatchanged; use crate::name::{Name, NameBuilder, Names}; -use crate::page::{MarkdownPage, Page, UnprocessedPage, WikitextPage}; +use crate::page::{MarkdownPage, Page, PageError, UnprocessedPage, WikitextPage}; use crate::parser::{ParserError, WikitextParser}; use crate::srcdir::{PathFilter, SourceDir}; use crate::token::TokenPatterns; @@ -16,7 +16,7 @@ pub enum SiteError { PageMissing(PathBuf, PathBuf), #[error(transparent)] - Page(#[from] crate::page::PageError), + Page(#[from] Box<PageError>), #[error(transparent)] Git(#[from] crate::git::GitError), @@ -28,6 +28,12 @@ pub enum SiteError { WalkDir(#[from] crate::srcdir::SourceDirError), } +impl From<PageError> for SiteError { + fn from(e: PageError) -> Self { + Self::Page(Box::new(e)) + } +} + impl From<ParserError> for SiteError { fn from(e: ParserError) -> Self { Self::Parser(Box::new(e)) |