Bump dep redismodule-rs to v1.0.0 (RedisJSON#663)

oshadmi · web-flow · commit f08d0863ce96 · 2022-02-22T19:36:42.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,8 +24,7 @@ serde_json = "1.0"
 serde = "1.0"
 libc = "0.2"
 jsonpath_lib = { git = "https://github.com/RedisJSON/jsonpath.git", branch = "generic_json_path" }
-#redis-module = { version="0.26", features = ["experimental-api"]}
-redis-module = { git = "https://github.com/RedisLabsModules/redismodule-rs.git", branch="master", features = ["experimental-api"]}
+redis-module = { version="1.0", features = ["experimental-api"]}
 itertools = "0.10.1"
 [features]
 # Workaround to allow cfg(feature = "test") in redismodue-rs dependencies:
diff --git a/src/c_api.rs b/src/c_api.rs
@@ -521,16 +521,16 @@ macro_rules! redis_json_module_export_shared_api {
         static REDISJSON_GETAPI: &str = concat!("RedisJSON_V1", "\0");
 
         pub fn export_shared_api(ctx: &Context) {
-            ctx.log_notice("Exported RedisJSON_V1 API");
             unsafe {
+                ctx.log_notice("Exported RedisJSON_V1 API");
                 LLAPI_CTX = Some(rawmod::RedisModule_GetThreadSafeContext.unwrap()(
                     std::ptr::null_mut(),
-                ))
-            };
-            ctx.export_shared_api(
-                &JSONAPI as *const RedisJSONAPI_V1 as *const c_void,
-                REDISJSON_GETAPI.as_ptr() as *const c_char,
-            );
+                ));
+                ctx.export_shared_api(
+                    &JSONAPI as *const RedisJSONAPI_V1 as *const c_void,
+                    REDISJSON_GETAPI.as_ptr() as *const c_char,
+                );
+            }
         }
 
         static JSONAPI: RedisJSONAPI_V1 = RedisJSONAPI_V1 {
diff --git a/src/commands.rs b/src/commands.rs
@@ -1899,7 +1899,7 @@ pub fn command_json_clear<M: Manager>(
         SelectValueType::Array | SelectValueType::Object => v.len().unwrap() > 0,
         SelectValueType::Long => v.get_long() != 0,
         SelectValueType::Double => v.get_double() != 0.0,
-        SelectValueType::String => v.get_str().len() > 0,
+        SelectValueType::String => !v.get_str().is_empty(),
         SelectValueType::Bool => v.get_bool(),
         _ => false,
     })?;
diff --git a/src/ivalue_manager.rs b/src/ivalue_manager.rs
@@ -133,7 +133,7 @@ fn update<F: FnMut(&mut IValue) -> Result<Option<()>, Error>>(
                         let mut v = e.get_mut();
                         match (func)(&mut v) {
                             Ok(res) => {
-                                if let None = res {
+                                if res.is_none() {
                                     e.remove();
                                 }
                             }
@@ -152,7 +152,7 @@ fn update<F: FnMut(&mut IValue) -> Result<Option<()>, Error>>(
                             let mut v = &mut arr.as_mut_slice()[x];
                             match (func)(&mut v) {
                                 Ok(res) => {
-                                    if let None = res {
+                                    if res.is_none() {
                                         arr.remove(x);
                                     }
                                 }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ fn update<F: FnMut(&mut IValue) -> Result<Option<()>, Error>>(`
`133`	`133`	`let mut v = e.get_mut();`
`134`	`134`	`match (func)(&mut v) {`
`135`	`135`	`Ok(res) => {`
`136`		`- if let None = res {`
	`136`	`+ if res.is_none() {`
`137`	`137`	`e.remove();`
`138`	`138`	`}`
`139`	`139`	`}`
`@@ -152,7 +152,7 @@ fn update<F: FnMut(&mut IValue) -> Result<Option<()>, Error>>(`
`152`	`152`	`let mut v = &mut arr.as_mut_slice()[x];`
`153`	`153`	`match (func)(&mut v) {`
`154`	`154`	`Ok(res) => {`
`155`		`- if let None = res {`
	`155`	`+ if res.is_none() {`
`156`	`156`	`arr.remove(x);`
`157`	`157`	`}`
`158`	`158`	`}`