More cleanups

Author: gavrie

examples/data_type.rs

@@ -21,16 +21,16 @@ fn alloc_set(ctx: &Context, args: Vec<String>) -> RedisResult {
     let key = ctx.open_key_writable(&key);
 
     match key.get_value::<MyType>(&MY_REDIS_TYPE)? {
+        Some(value) => {
+            value.data = "B".repeat(size as usize);
+        }
         None => {
             let value = MyType {
                 data: "A".repeat(size as usize)
             };
 
             key.set_value(&MY_REDIS_TYPE, value)?;
         }
-        Some(value) => {
-            value.data = "B".repeat(size as usize);
-        }
     }
 
     Ok(size.into())
@@ -43,20 +43,20 @@ fn alloc_get(ctx: &Context, args: Vec<String>) -> RedisResult {
     let key = ctx.open_key_writable(&key); // TODO: Use read-only key
 
     let value = match key.get_value::<MyType>(&MY_REDIS_TYPE)? {
-        None => ().into(),
         Some(value) => {
             // TODO: Use the value
             let _ = value;
             "some value".into()
         }
+        None => ().into()
     };
 
     Ok(value)
 }
 
 //////////////////////////////////////////////////////
 
-redis_module!{
+redis_module! {
     name: "alloc",
     version: 1,
     data_types: [

src/macros.rs

@@ -30,7 +30,7 @@ macro_rules! redis_command {
                 Some(do_command),
                 flags.as_ptr(),
                 firstkey, lastkey, keystep,
-            ) == raw::Status::Err as _ { return raw::Status::Err as _; }
+            ) == raw::Status::Err as c_int { return raw::Status::Err as c_int; }
         }
     }
 }
@@ -74,11 +74,11 @@ macro_rules! redis_module {
                     module_name.as_ptr(),
                     module_version,
                     raw::REDISMODULE_APIVER_1 as c_int,
-                ) == raw::Status::Err as _ { return raw::Status::Err as _; }
+                ) == raw::Status::Err as c_int { return raw::Status::Err as c_int; }
 
                 $(
                     if (&$data_type).create_data_type(ctx).is_err() {
-                        return raw::Status::Err as _;
+                        return raw::Status::Err as c_int;
                     }
                 )*
 
@@ -92,7 +92,7 @@ macro_rules! redis_module {
                     redis_command!(ctx, $name, $command, $flags);
                 )*
 
-                raw::Status::Ok as _
+                raw::Status::Ok as c_int
             }
         }
     }