From 090dea2091eb12559004b27a38a9c5f1afc32626 Mon Sep 17 00:00:00 2001 From: Jokler Date: Wed, 28 Feb 2018 14:44:01 +0100 Subject: Add the mysql error to the mysql feature --- src/error.rs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/error.rs') 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 for FrippyError { } } +#[cfg(feature = "mysql")] impl From for FrippyError { fn from(e: R2d2Error) -> FrippyError { FrippyError::R2d2(e) -- cgit v1.2.3-70-g09d2