More cleanups

Author: gavrie

examples/hello.rs

@@ -1,14 +1,8 @@
 use std::ffi::CString;
 
-extern crate libc;
-
-use libc::c_int;
-
 #[macro_use]
 extern crate redismodule;
-
-use redismodule::Context;
-use redismodule::{Command, RedisResult, RedisValue, RedisError};
+use redismodule::{Context, Command, RedisResult, RedisValue, RedisError};
 
 fn hello_mul(_: &Context, args: Vec<String>) -> RedisResult {
     if args.len() != 3 {
@@ -31,7 +25,7 @@ fn hello_mul(_: &Context, args: Vec<String>) -> RedisResult {
 
 fn parse_integer(arg: &str) -> Result<i64, RedisError> {
     arg.parse::<i64>()
-        .map_err(|_| RedisError::String("Couldn't parse as integer"))
+        .map_err(|_| RedisError::String(format!("Couldn't parse as integer: {}", arg)))
 }
 
 //////////////////////////////////////////////////////

src/context.rs

@@ -2,7 +2,6 @@ use std::os::raw::c_long;
 use std::ffi::CString;
 
 use crate::raw;
-use crate::error::Error;
 use crate::LogLevel;
 use crate::key::{RedisKey, RedisKeyWritable};
 use crate::{RedisString, RedisError, RedisValue, RedisResult};
@@ -37,7 +36,7 @@ impl Context {
         let _ = command;
         let _ = args;
 
-        return Err(RedisError::String("not implemented"));
+        return Err(RedisError::Str("not implemented"));
     }
 
     pub fn reply(&self, r: RedisResult) -> raw::Status {
@@ -74,6 +73,11 @@ impl Context {
                 let msg = CString::new(s).unwrap();
                 raw::RedisModule_ReplyWithError.unwrap()(self.ctx, msg.as_ptr()).into()
             }
+
+            Err(RedisError::Str(s)) => unsafe {
+                let msg = CString::new(s).unwrap();
+                raw::RedisModule_ReplyWithError.unwrap()(self.ctx, msg.as_ptr()).into()
+            }
         }
     }
 
@@ -85,10 +89,3 @@ impl Context {
         RedisKeyWritable::open(self.ctx, key)
     }
 }
-
-fn handle_status(status: raw::Status, message: &str) -> Result<(), Error> {
-    match status {
-        raw::Status::Ok => Ok(()),
-        raw::Status::Err => Err(error!(message)),
-    }
-}

src/lib.rs

@@ -1,4 +1,4 @@
-#![allow(dead_code)]
+//#![allow(dead_code)]
 
 use std::string;
 use std::os::raw::c_char;

src/macros.rs

@@ -24,6 +24,7 @@ macro_rules! log_debug {
 #[macro_export]
 macro_rules! redis_module (
     ($module_name:expr, $module_version:expr, $commands:expr) => (
+        use std::os::raw::c_int;
         use redismodule::raw;
 
         #[no_mangle]

src/redismodule.rs

@@ -9,7 +9,8 @@ use crate::raw;
 #[derive(Debug)]
 pub enum RedisError {
     WrongArity,
-    String(&'static str),
+    Str(&'static str),
+    String(String),
 }
 
 #[derive(Debug)]