Skip to content

Commit df0f7c0

Browse files
committed
small enhancements
1 parent 42d4953 commit df0f7c0

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

src/context/call_reply.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -699,20 +699,20 @@ pub enum CallReply<'root> {
699699
}
700700

701701
impl<'root> CallReply<'root> {
702-
/// Return the raw pointer to the underlying [RedisModuleCallReply].
703-
pub fn get_raw(&self) -> *mut RedisModuleCallReply {
702+
/// Return the raw pointer to the underlying [RedisModuleCallReply], or `None` if this is the `Unknown` variant.
703+
pub fn get_raw(&self) -> Option<*mut RedisModuleCallReply> {
704704
match self {
705-
CallReply::Unknown => std::ptr::null_mut(),
706-
CallReply::I64(inner) => inner.get_raw(),
707-
CallReply::String(inner) => inner.get_raw(),
708-
CallReply::Array(inner) => inner.get_raw(),
709-
CallReply::Null(inner) => inner.get_raw(),
710-
CallReply::Map(inner) => inner.get_raw(),
711-
CallReply::Set(inner) => inner.get_raw(),
712-
CallReply::Bool(inner) => inner.get_raw(),
713-
CallReply::Double(inner) => inner.get_raw(),
714-
CallReply::BigNumber(inner) => inner.get_raw(),
715-
CallReply::VerbatimString(inner) => inner.get_raw(),
705+
CallReply::Unknown => None,
706+
CallReply::I64(inner) => Some(inner.get_raw()),
707+
CallReply::String(inner) => Some(inner.get_raw()),
708+
CallReply::Array(inner) => Some(inner.get_raw()),
709+
CallReply::Null(inner) => Some(inner.get_raw()),
710+
CallReply::Map(inner) => Some(inner.get_raw()),
711+
CallReply::Set(inner) => Some(inner.get_raw()),
712+
CallReply::Bool(inner) => Some(inner.get_raw()),
713+
CallReply::Double(inner) => Some(inner.get_raw()),
714+
CallReply::BigNumber(inner) => Some(inner.get_raw()),
715+
CallReply::VerbatimString(inner) => Some(inner.get_raw()),
716716
}
717717
}
718718
}

src/context/key_cursor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl ScanKeyCursor {
7070
///
7171
/// ## Example
7272
///
73-
/// ```
73+
/// ```ignore
7474
/// while cursor.scan(|_key, field, value| {
7575
/// // do something with field and value
7676
/// }) {

src/redismodule.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ impl RedisString {
161161
Self { ctx, inner }
162162
}
163163

164-
/// Create a RedisString from a raw C string and length. The String will be copied.
164+
/// Create a RedisString from a raw C string and length. The provided C String will be copied.
165165
///
166166
/// # Safety
167167
/// The caller must ensure that the provided pointer is valid and points to a memory region

tests/integration.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,10 @@ fn test_scan_key() -> Result<()> {
210210
.query::<()>(&mut con)
211211
.with_context(|| "failed to hset")?;
212212

213-
let res: Vec<String> = redis::cmd("scan_key").arg(&["user:123"]).query(&mut con)?;
213+
let res: Vec<String> = redis::cmd("scan_key")
214+
.arg(&["user:123"])
215+
.query(&mut con)
216+
.with_context(|| "failed scan_key")?;
214217
assert_eq!(&res, &["name", "Alice", "age", "29", "location", "Austin"]);
215218
Ok(())
216219
}
@@ -227,7 +230,8 @@ fn test_scan_key_for_each() -> Result<()> {
227230

228231
let res: Vec<String> = redis::cmd("scan_key_for_each")
229232
.arg(&["user:123"])
230-
.query(&mut con)?;
233+
.query(&mut con)
234+
.with_context(|| "failed scan_key_for_each")?;
231235
assert_eq!(&res, &["name", "Alice", "age", "29", "location", "Austin"]);
232236
Ok(())
233237
}

0 commit comments

Comments
 (0)