Refactor AfError to impl fmt::Display instead of error::Error

Author: 9prady9

src/defines.rs

@@ -1,7 +1,6 @@
 extern crate num;
 
 use self::num::Complex;
-use std::error::Error;
 use std::fmt::Error as FmtError;
 use std::fmt::{Display, Formatter};
 
@@ -80,13 +79,7 @@ impl Display for Backend {
 
 impl Display for AfError {
     fn fmt(&self, f: &mut Formatter) -> Result<(), FmtError> {
-        write!(f, "{}", self.description())
-    }
-}
-
-impl Error for AfError {
-    fn description(&self) -> &str {
-        match *self {
+        let text = match *self {
             AfError::SUCCESS => "Function returned successfully",
             AfError::ERR_NO_MEM => "System or Device ran out of memory",
             AfError::ERR_DRIVER => "Error in the device driver",
@@ -104,7 +97,8 @@ impl Error for AfError {
             AfError::ERR_NO_GFX => "This build of ArrayFire has no graphics support",
             AfError::ERR_INTERNAL => "Error either in ArrayFire or in a project upstream",
             AfError::ERR_UNKNOWN => "Unknown Error",
-        }
+        };
+        write!(f, "{}", text)
     }
 }
 

src/error.rs

@@ -3,7 +3,6 @@ extern crate libc;
 use self::libc::c_char;
 use crate::defines::AfError;
 use crate::util::{free_host, DimT, MutDimT};
-use std::error::Error;
 use std::ffi::CStr;
 use std::ops::{Deref, DerefMut};
 use std::sync::RwLock;
@@ -39,7 +38,7 @@ pub fn handle_error_general(error_code: AfError) {
         AfError::SUCCESS => {} /* No-op */
         _ => panic!(
             "Error message: {}\nLast error: {}",
-            error_code.description(),
+            error_code,
             get_last_error()
         ),
     }
@@ -63,7 +62,7 @@ lazy_static! {
 /// fn handle_error(error_code: AfError) {
 ///     match error_code {
 ///         AfError::SUCCESS => {}, /* No-op */
-///         _ => panic!("Error message: {}", error_code.description()),
+///         _ => panic!("Error message: {}", error_code),
 ///     }
 /// }
 ///

tests/error_handler.rs

@@ -8,7 +8,7 @@ macro_rules! implement_handler {
         pub fn $fn_name(error_code: AfError) {
             match error_code {
                 AfError::SUCCESS => {} /* No-op */
-                _ => panic!("Error message: {}", error_code.description()),
+                _ => panic!("Error message: {}", error_code),
             }
         }
     };