add fields to KeyMode bitflags

Author: DarthB

Cargo.toml

@@ -133,6 +133,7 @@ serde = { version = "1", features = ["derive"] }
 nix = "0.26"
 cfg-if = "1"
 redis-module-macros-internals = { path = "./redismodule-rs-macros-internals" }
+strum = {version = "0.27.2",features = ["derive"]}
 log = "0.4"
 
 [dev-dependencies]
@@ -146,6 +147,10 @@ redis-module = { path = "./", default-features = false }
 bindgen = "0.66"
 cc = "1"
 
+#[build-dependencies.bindgen]
+#version = "0.71.1"
+#default-features = false
+
 [features]
 default = ["min-redis-compatibility-version-6-0"]
 min-redis-compatibility-version-7-4 = ["redis-module/min-redis-compatibility-version-7-4"]

build.rs

@@ -12,12 +12,9 @@ impl ParseCallbacks for RedisModuleCallback {
     fn int_macro(&self, name: &str, _value: i64) -> Option<IntKind> {
         if name.starts_with("REDISMODULE_SUBEVENT_") || name.starts_with("REDISMODULE_EVENT_") {
             Some(IntKind::U64)
-        } else if name.starts_with("REDISMODULE_REPLY_")
-            || name.starts_with("REDISMODULE_KEYTYPE_")
-            || name.starts_with("REDISMODULE_AUX_")
-            || name == "REDISMODULE_OK"
-            || name == "REDISMODULE_ERR"
-            || name == "REDISMODULE_LIST_HEAD"
+        } else if name.starts_with("REDISMODULE_REPLY") {
+            Some(IntKind::I32)
+        } else if name == "REDISMODULE_LIST_HEAD"
             || name == "REDISMODULE_LIST_TAIL"
         {
             // These values are used as `enum` discriminants, and thus must be `isize`.

src/key.rs

@@ -110,7 +110,8 @@ impl RedisKey {
     /// Will panic if `RedisModule_KeyType` is missing in redismodule.h
     #[must_use]
     pub fn key_type(&self) -> raw::KeyType {
-        unsafe { raw::RedisModule_KeyType.unwrap()(self.key_inner) }.into()
+        let discriminant = unsafe { raw::RedisModule_KeyType.unwrap()(self.key_inner) };
+        KeyType::from_repr(discriminant as u32).unwrap()
     }
 
     /// Detects whether the key pointer given to us by Redis is null.
@@ -379,7 +380,8 @@ impl RedisKeyWritable {
     /// Will panic if `RedisModule_KeyType` is missing in redismodule.h
     #[must_use]
     pub fn key_type(&self) -> raw::KeyType {
-        unsafe { raw::RedisModule_KeyType.unwrap()(self.key_inner) }.into()
+        let discriminant = unsafe { raw::RedisModule_KeyType.unwrap()(self.key_inner) };
+        KeyType::from_repr(discriminant as u32).unwrap()
     }
 
     pub fn open_with_redis_string(
@@ -670,7 +672,7 @@ fn to_raw_mode(mode: KeyMode) -> raw::KeyMode {
 /// Will panic if `RedisModule_KeyType` or `RedisModule_ModuleTypeGetType` are missing in redismodule.h
 #[allow(clippy::not_unsafe_ptr_arg_deref)]
 pub fn verify_type(key_inner: *mut raw::RedisModuleKey, redis_type: &RedisType) -> RedisResult {
-    let key_type: KeyType = unsafe { raw::RedisModule_KeyType.unwrap()(key_inner) }.into();
+    let key_type: KeyType = KeyType::from_repr(unsafe { raw::RedisModule_KeyType.unwrap()(key_inner) as u32 }).unwrap();
 
     if key_type != KeyType::Empty {
         // The key exists; check its type

src/raw.rs

@@ -29,6 +29,13 @@ bitflags! {
     pub struct KeyMode: c_int {
         const READ = REDISMODULE_READ as c_int;
         const WRITE = REDISMODULE_WRITE as c_int;
+
+        const KEYOPEN_NOTOUCH = REDISMODULE_OPEN_KEY_NOTOUCH as c_int;
+        const KEYOPEN_NONOTIFY = REDISMODULE_OPEN_KEY_NONOTIFY as c_int;
+        const KEYOPEN_NOSTATS = REDISMODULE_OPEN_KEY_NOSTATS as c_int;
+        const KEYOPEN_NOEFFECTS = REDISMODULE_OPEN_KEY_NOEFFECTS as c_int;
+        const KEYOPEN_NOEXPIRE = REDISMODULE_OPEN_KEY_NOEXPIRE as c_int;
+        const KEYOPEN_ACCESSEXPIRED = REDISMODULE_OPEN_KEY_ACCESS_EXPIRED as c_int;
     }
 }
 
@@ -40,7 +47,8 @@ bitflags! {
     }
 }
 
-#[derive(Primitive, Debug, PartialEq, Eq)]
+#[repr(u32)]
+#[derive(Primitive, Debug, PartialEq, Eq, strum::FromRepr)]
 pub enum KeyType {
     Empty = REDISMODULE_KEYTYPE_EMPTY,
     String = REDISMODULE_KEYTYPE_STRING,
@@ -52,19 +60,14 @@ pub enum KeyType {
     Stream = REDISMODULE_KEYTYPE_STREAM,
 }
 
-impl From<c_int> for KeyType {
-    fn from(v: c_int) -> Self {
-        Self::from_i32(v).unwrap()
-    }
-}
-
 #[derive(Primitive, Debug, PartialEq, Eq)]
 pub enum Where {
     ListHead = REDISMODULE_LIST_HEAD,
     ListTail = REDISMODULE_LIST_TAIL,
 }
 
-#[derive(Primitive, Debug, PartialEq, Eq)]
+#[repr(i32)]
+#[derive(Primitive, Debug, PartialEq, Eq, strum::FromRepr)]
 pub enum ReplyType {
     Unknown = REDISMODULE_REPLY_UNKNOWN,
     String = REDISMODULE_REPLY_STRING,
@@ -86,13 +89,15 @@ impl From<c_int> for ReplyType {
     }
 }
 
-#[derive(Primitive, Debug, PartialEq, Eq)]
+#[repr(u32)]
+#[derive(Primitive, Debug, PartialEq, Eq, strum::FromRepr)]
 pub enum Aux {
     Before = REDISMODULE_AUX_BEFORE_RDB,
     After = REDISMODULE_AUX_AFTER_RDB,
 }
 
-#[derive(Primitive, Debug, PartialEq, Eq)]
+#[repr(u32)]
+#[derive(Primitive, Debug, PartialEq, Eq, strum::FromRepr)]
 pub enum Status {
     Ok = REDISMODULE_OK,
     Err = REDISMODULE_ERR,