Skip to content

Commit 754ad78

Browse files
committed
Use consistent "null" terminology for NULL replies
1 parent 05d95f3 commit 754ad78

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl Context {
9999
}
100100
raw::ReplyType::Integer => Ok(RedisValue::Integer(raw::call_reply_integer(reply))),
101101
raw::ReplyType::String => Ok(RedisValue::SimpleString(raw::call_reply_string(reply))),
102-
raw::ReplyType::Nil => Ok(RedisValue::None),
102+
raw::ReplyType::Null => Ok(RedisValue::Null),
103103
}
104104
}
105105

@@ -145,7 +145,7 @@ impl Context {
145145
raw::Status::Ok
146146
}
147147

148-
Ok(RedisValue::None) => unsafe {
148+
Ok(RedisValue::Null) => unsafe {
149149
raw::RedisModule_ReplyWithNull.unwrap()(self.ctx).into()
150150
},
151151

src/raw.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pub enum ReplyType {
5959
Error = REDISMODULE_REPLY_ERROR_ISIZE,
6060
Integer = REDISMODULE_REPLY_INTEGER_ISIZE,
6161
Array = REDISMODULE_REPLY_ARRAY_ISIZE,
62-
Nil = REDISMODULE_REPLY_NULL_ISIZE,
62+
Null = REDISMODULE_REPLY_NULL_ISIZE,
6363
}
6464

6565
impl From<c_int> for ReplyType {

src/redisvalue.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ pub enum RedisValue {
66
Integer(i64),
77
Float(f64),
88
Array(Vec<RedisValue>),
9-
None,
9+
Null,
1010
}
1111

1212
impl From<()> for RedisValue {
1313
fn from(_: ()) -> Self {
14-
RedisValue::None
14+
RedisValue::Null
1515
}
1616
}
1717

@@ -55,7 +55,7 @@ impl<T: Into<RedisValue>> From<Option<T>> for RedisValue {
5555
fn from(s: Option<T>) -> Self {
5656
match s {
5757
Some(v) => v.into(),
58-
None => RedisValue::None,
58+
None => RedisValue::Null,
5959
}
6060
}
6161
}
@@ -106,6 +106,6 @@ mod tests {
106106

107107
#[test]
108108
fn from_option_none() {
109-
assert_eq!(RedisValue::from(None::<()>), RedisValue::None,);
109+
assert_eq!(RedisValue::from(None::<()>), RedisValue::Null,);
110110
}
111111
}

0 commit comments

Comments
 (0)