From a344423ba37193e1f4728d58f983ef6e6f8c8005 Mon Sep 17 00:00:00 2001
From: rasul <rascul3@gmail.com>
Date: Sun, 6 Dec 2020 10:16:29 -0600
Subject: [PATCH] update to 2018 edition and remove custom error and result
 types

---
 src/error.rs | 32 --------------------------------
 src/lib.rs   | 10 ++--------
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 src/error.rs

diff --git a/src/error.rs b/src/error.rs
deleted file mode 100644
index 72d0334..0000000
--- a/src/error.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::fmt::{Display, Formatter, Result as FmtResult};
-
-use log::SetLoggerError;
-
-pub type RagResult<T> = Result<T, RagError>;
-
-#[derive(Debug)]
-pub enum RagError {
-	SetLogger(SetLoggerError),
-	Empty,
-}
-
-impl From<()> for RagError {
-	fn from(_: ()) -> RagError {
-		RagError::Empty
-	}
-}
-
-impl From<SetLoggerError> for RagError {
-	fn from(e: SetLoggerError) -> RagError {
-		RagError::SetLogger(e)
-	}
-}
-
-impl Display for RagError {
-	fn fmt(&self, f: &mut Formatter) -> FmtResult {
-		match *self {
-			RagError::SetLogger(ref e) => Display::fmt(e, f),
-			RagError::Empty => Display::fmt("Empty", f),
-		}
-	}
-}
diff --git a/src/lib.rs b/src/lib.rs
index 80436fd..55d5fd3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,19 +1,13 @@
 /// Logger implementation for colors in the terminal and in the future
 /// logging to a file and to a remote log server
-extern crate chrono;
-extern crate colored;
-extern crate log;
 
 use colored::*;
-use log::{set_logger, set_max_level, Log, Level, LevelFilter, Metadata, Record};
+use log::{set_logger, set_max_level, Log, Level, LevelFilter, Metadata, Record, SetLoggerError};
 
 pub mod error;
 #[cfg(test)]
 mod tests;
 
-pub use error::RagError;
-pub use error::RagResult;
-
 static LOGGER: Logger = Logger;
 
 struct Logger;
@@ -57,7 +51,7 @@ impl Log for Logger {
 	fn flush(&self) {}
 }
 
-pub fn init() -> RagResult<()> {
+pub fn init() -> Result<(), SetLoggerError> {
 	Ok(set_logger(&LOGGER).map(|()| set_max_level(LevelFilter::Info))?)
 }