summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJokler <jokler.contact@gmail.com>2018-02-28 14:44:01 +0100
committerJokler <jokler.contact@gmail.com>2018-02-28 14:44:01 +0100
commit090dea2091eb12559004b27a38a9c5f1afc32626 (patch)
tree3861e7109c120dd9628a63ce0df9c7d628075392 /src
parent244b999e9bb4f43b3ec9d2ac85ed7c8cb53ce7b3 (diff)
downloadfrippy-090dea2091eb12559004b27a38a9c5f1afc32626.tar.gz
frippy-090dea2091eb12559004b27a38a9c5f1afc32626.zip
Add the mysql error to the mysql feature
Diffstat (limited to 'src')
-rw-r--r--src/error.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/error.rs b/src/error.rs
index c6cecb4..2ceb4cc 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -4,6 +4,7 @@ use std::io::Error as IoError;
use std::str::Utf8Error;
use irc::error::IrcError;
use reqwest::Error as ReqwestError;
+#[cfg(feature = "mysql")]
use r2d2::Error as R2d2Error;
/// The main crate-wide error type.
@@ -34,6 +35,7 @@ pub enum FrippyError {
Utf8(#[cause] Utf8Error),
/// An r2d2 error
+ #[cfg(feature = "mysql")]
#[fail(display = "An r2d2 error occured")]
R2d2(#[cause] R2d2Error),
@@ -102,6 +104,7 @@ impl From<Utf8Error> for FrippyError {
}
}
+#[cfg(feature = "mysql")]
impl From<R2d2Error> for FrippyError {
fn from(e: R2d2Error) -> FrippyError {
FrippyError::R2d2(e)