Replace error strings with Error trait descriptions

Author: 9prady9

src/defines.rs

@@ -84,23 +84,23 @@ impl Display for AfError {
 impl Error for AfError {
     fn description(&self) -> &str {
         match *self {
-            AfError::SUCCESS => "Function returned successfully",
-            AfError::ERR_NO_MEM => "The system or device ran out of memory",
-            AfError::ERR_DRIVER => "Device driver error",
-            AfError::ERR_RUNTIME => "Error in runtime environment",
-            AfError::ERR_INVALID_ARRAY => "Input is not a valid Array Object",
-            AfError::ERR_ARG => "One of the function arguments is incorrect",
-            AfError::ERR_SIZE => "The size is incorrect",
-            AfError::ERR_TYPE => "The type is not supported by this function",
-            AfError::ERR_DIFF_TYPE => "The type of input arrays are not compatible",
-            AfError::ERR_BATCH => "Function does not support GFOR / batch mode",
-            AfError::ERR_DEVICE => "Array does not belong to device",
-            AfError::ERR_NOT_SUPPORTED => "The option is not supported",
+            AfError::SUCCESS            => "Function returned successfully",
+            AfError::ERR_NO_MEM         => "System or Device ran out of memory",
+            AfError::ERR_DRIVER         => "Error in the device driver",
+            AfError::ERR_RUNTIME        => "Error with the runtime environment",
+            AfError::ERR_INVALID_ARRAY  => "Iput Array is not a valid object",
+            AfError::ERR_ARG            => "One of the function arguments is incorrect",
+            AfError::ERR_SIZE           => "Size is incorrect",
+            AfError::ERR_TYPE           => "Type is not suppported by this function",
+            AfError::ERR_DIFF_TYPE      => "Type of the input arrays are not compatible",
+            AfError::ERR_BATCH          => "Function does not support GFOR / batch mode",
+            AfError::ERR_DEVICE         => "Input does not belong to the current device",
+            AfError::ERR_NOT_SUPPORTED  => "Unsupported operation/parameter option",
             AfError::ERR_NOT_CONFIGURED => "This build of ArrayFire does not support this feature",
-            AfError::ERR_NO_DBL => "This device does not support double",
-            AfError::ERR_NO_GFX => "This build of ArrayFire was not built with graphics or this device does not support graphics",
-            AfError::ERR_INTERNAL => "There was an internal error in either ArrayFire or upstream project",
-            AfError::ERR_UNKNOWN => "Unkown Error",
+            AfError::ERR_NO_DBL         => "This device does not support double",
+            AfError::ERR_NO_GFX         => "This build of ArrayFire has no graphics support",
+            AfError::ERR_INTERNAL       => "Eror either in ArrayFire or in a project upstream",
+            AfError::ERR_UNKNOWN        => "Unknown Error",
         }
     }
 }

src/error.rs

@@ -1,4 +1,5 @@
 use defines::AfError;
+use std::error::Error;
 
 pub type ErrorCallback = Fn(AfError);
 
@@ -12,22 +13,7 @@ pub fn register_error_handler(callback: &'static ErrorCallback) {
 
 pub fn handle_error_general(error_code: AfError) {
     match error_code {
-        AfError::SUCCESS            => {}, /* No-op */
-        AfError::ERR_NO_MEM         => panic!("The system or device ran out of memory"),
-        AfError::ERR_DRIVER         => panic!("There was an error in the device driver"),
-        AfError::ERR_RUNTIME        => panic!("There was an error with the runtime environment"),
-        AfError::ERR_INVALID_ARRAY  => panic!("The input array is not a valid Array object"),
-        AfError::ERR_ARG            => panic!("One of the function arguments is incorrect"),
-        AfError::ERR_SIZE           => panic!("The size is incorrect"),
-        AfError::ERR_TYPE           => panic!("The type is not suppported by this function"),
-        AfError::ERR_DIFF_TYPE      => panic!("The type of the input arrays are not compatible"),
-        AfError::ERR_BATCH          => panic!("Function does not support GFOR / batch mode"),
-        AfError::ERR_DEVICE         => panic!("Input does not belong to the current device"),
-        AfError::ERR_NOT_SUPPORTED  => panic!("Unsupported operation/parameter option"),
-        AfError::ERR_NOT_CONFIGURED => panic!("This build of ArrayFire does not support this feature"),
-        AfError::ERR_NO_DBL         => panic!("This device does not support double"),
-        AfError::ERR_NO_GFX         => panic!("This build of ArrayFire was not built with graphics or this device does not support graphics"),
-        AfError::ERR_INTERNAL       => panic!("There was an internal error either in ArrayFire or in a project upstream"),
-        AfError::ERR_UNKNOWN        => panic!("Unknown Error"),
+        AfError::SUCCESS => {}, /* No-op */
+        _ => panic!("Error message: {}", error_code.description()),
     }
-}
+}

src/index.rs

@@ -187,8 +187,8 @@ pub fn set_rows(input: &Array, new_rows: &Array, first: u64, last: u64) -> Array
 /// use arrayfire::{Dim4, randu, col, print};
 /// let dims = Dim4::new(&[5, 5, 1, 1]);
 /// let a = randu::<f32>(dims);
-/// println!("Grab last col of the random matrix");
 /// print(&a);
+/// println!("Grab last col of the random matrix");
 /// print(&col(&a, 4));
 /// ```
 #[allow(dead_code)]
@@ -406,4 +406,4 @@ impl SeqInternal {
             step: From::from(s.step()),
         }
     }
-}
+}