diff options
Diffstat (limited to 'src/errors.rs')
-rw-r--r-- | src/errors.rs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/errors.rs b/src/errors.rs index 05642d0a8598..3f00a2976a2a 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -32,7 +32,6 @@ use askama; use diesel; use r2d2; use reqwest; -use tera; use tokio_timer; pub type Result<T> = result::Result<T, ConverseError>; @@ -51,9 +50,6 @@ pub enum ConverseError { #[fail(display = "a template rendering error occured: {}", reason)] Template { reason: String }, - #[fail(display = "a template rendering error occured: {}", reason)] - Askama { reason: String }, - #[fail(display = "error occured during request handling: {}", error)] ActixWeb { error: actix_web::Error }, @@ -84,17 +80,9 @@ impl From<r2d2::Error> for ConverseError { } } -impl From<tera::Error> for ConverseError { - fn from(error: tera::Error) -> ConverseError { - ConverseError::Template { - reason: format!("{}", error), - } - } -} - impl From<askama::Error> for ConverseError { fn from(error: askama::Error) -> ConverseError { - ConverseError::Askama { + ConverseError::Template { reason: format!("{}", error), } } |