Skip to content

Commit b86b07a

Browse files
iddmiddm
committed
Revert to the old style of RedisResult.
1 parent 08e7c4e commit b86b07a

27 files changed

+108
-116
lines changed

‎examples/acl.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use redis_module::{
2-
redis_module, AclPermissions, Context, NextArg, RedisError, RedisString, RedisValue,
3-
RedisValueResult,
2+
redis_module, AclPermissions, Context, NextArg, RedisError, RedisResult, RedisString,
3+
RedisValue,
44
};
55

6-
fn verify_key_access_for_user(ctx: &Context, args: Vec<RedisString>) -> RedisValueResult {
6+
fn verify_key_access_for_user(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
77
let mut args = args.into_iter().skip(1);
88
let user = args.next_arg()?;
99
let key = args.next_arg()?;
@@ -14,7 +14,7 @@ fn verify_key_access_for_user(ctx: &Context, args: Vec<RedisString>) -> RedisVal
1414
Ok(RedisValue::SimpleStringStatic("OK"))
1515
}
1616

17-
fn get_current_user(ctx: &Context, _args: Vec<RedisString>) -> RedisValueResult {
17+
fn get_current_user(ctx: &Context, _args: Vec<RedisString>) -> RedisResult {
1818
Ok(RedisValue::BulkRedisString(ctx.get_current_user()))
1919
}
2020

‎examples/block.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use redis_module::{
2-
redis_module, Context, RedisString, RedisValue, RedisValueResult, ThreadSafeContext,
2+
redis_module, Context, RedisResult, RedisString, RedisValue, ThreadSafeContext,
33
};
44
use std::thread;
55
use std::time::Duration;
66

7-
fn block(ctx: &Context, _args: Vec<RedisString>) -> RedisValueResult {
7+
fn block(ctx: &Context, _args: Vec<RedisString>) -> RedisResult {
88
let blocked_client = ctx.block_client();
99

1010
thread::spawn(move || {

‎examples/call.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use redis_module::{
22
redis_module, BlockedClient, CallOptionResp, CallOptionsBuilder, CallReply, CallResult,
3-
Context, FutureCallReply, PromiseCallReply, RedisError, RedisString, RedisValue,
4-
RedisValueResult, ThreadSafeContext,
3+
Context, FutureCallReply, PromiseCallReply, RedisError, RedisResult, RedisString, RedisValue,
4+
ThreadSafeContext,
55
};
66

77
use std::thread;
88

9-
fn call_test(ctx: &Context, _: Vec<RedisString>) -> RedisValueResult {
9+
fn call_test(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
1010
let res: String = ctx.call("ECHO", &["TEST"])?.try_into()?;
1111
if "TEST" != &res {
1212
return Err(RedisError::Str("Failed calling 'ECHO TEST'"));
@@ -126,7 +126,7 @@ fn call_blocking_handle_future(ctx: &Context, f: FutureCallReply, blocked_client
126126
future_handler.dispose(ctx);
127127
}
128128

129-
fn call_blocking(ctx: &Context, _: Vec<RedisString>) -> RedisValueResult {
129+
fn call_blocking(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
130130
let res = call_blocking_internal(ctx);
131131
match res {
132132
PromiseCallReply::Resolved(r) => r.map_or_else(|e| Err(e.into()), |v| Ok((&v).into())),
@@ -138,7 +138,7 @@ fn call_blocking(ctx: &Context, _: Vec<RedisString>) -> RedisValueResult {
138138
}
139139
}
140140

141-
fn call_blocking_from_detach_ctx(ctx: &Context, _: Vec<RedisString>) -> RedisValueResult {
141+
fn call_blocking_from_detach_ctx(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
142142
let blocked_client = ctx.block_client();
143143
thread::spawn(move || {
144144
let ctx_guard = redis_module::MODULE_CONTEXT.lock();

‎examples/configuration.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use std::sync::{
66
use lazy_static::lazy_static;
77
use redis_module::{
88
configuration::{ConfigurationContext, ConfigurationFlags},
9-
enum_configuration, redis_module, ConfigurationValue, Context, RedisGILGuard, RedisString,
10-
RedisValue, RedisValueResult,
9+
enum_configuration, redis_module, ConfigurationValue, Context, RedisGILGuard, RedisResult,
10+
RedisString, RedisValue,
1111
};
1212

1313
enum_configuration! {
@@ -42,7 +42,7 @@ fn on_configuration_changed<G, T: ConfigurationValue<G>>(
4242
*val += 1
4343
}
4444

45-
fn num_changes(ctx: &Context, _: Vec<RedisString>) -> RedisValueResult {
45+
fn num_changes(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
4646
let val = NUM_OF_CONFIGURATION_CHANGES.lock(ctx);
4747
Ok(RedisValue::Integer(*val))
4848
}

‎examples/ctx_flags.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
use redis_module::{
2-
redis_module, Context, ContextFlags, RedisString, RedisValue, RedisValueResult,
3-
};
1+
use redis_module::{redis_module, Context, ContextFlags, RedisResult, RedisString, RedisValue};
42

5-
fn role(ctx: &Context, _args: Vec<RedisString>) -> RedisValueResult {
3+
fn role(ctx: &Context, _args: Vec<RedisString>) -> RedisResult {
64
Ok(RedisValue::SimpleStringStatic(
75
if ctx.get_flags().contains(ContextFlags::MASTER) {
86
"master"

‎examples/data_type.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use redis_module::native_types::RedisType;
2-
use redis_module::{raw, redis_module, Context, NextArg, RedisString, RedisValueResult};
2+
use redis_module::{raw, redis_module, Context, NextArg, RedisResult, RedisString};
33
use std::os::raw::c_void;
44

55
#[derive(Debug)]
@@ -43,7 +43,7 @@ unsafe extern "C" fn free(value: *mut c_void) {
4343
drop(Box::from_raw(value.cast::<MyType>()));
4444
}
4545

46-
fn alloc_set(ctx: &Context, args: Vec<RedisString>) -> RedisValueResult {
46+
fn alloc_set(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
4747
let mut args = args.into_iter().skip(1);
4848
let key = args.next_arg()?;
4949
let size = args.next_i64()?;
@@ -64,7 +64,7 @@ fn alloc_set(ctx: &Context, args: Vec<RedisString>) -> RedisValueResult {
6464
Ok(size.into())
6565
}
6666

67-
fn alloc_get(ctx: &Context, args: Vec<RedisString>) -> RedisValueResult {
67+
fn alloc_get(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
6868
let mut args = args.into_iter().skip(1);
6969
let key = args.next_arg()?;
7070

‎examples/events.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use redis_module::{
2-
redis_module, Context, NotifyEvent, RedisError, RedisString, RedisValue, RedisValueResult,
3-
Status,
2+
redis_module, Context, NotifyEvent, RedisError, RedisResult, RedisString, RedisValue, Status,
43
};
54
use std::ptr::NonNull;
65
use std::sync::atomic::{AtomicI64, Ordering};
@@ -32,7 +31,7 @@ fn on_stream(ctx: &Context, _event_type: NotifyEvent, _event: &str, _key: &[u8])
3231
ctx.log_debug("Stream event received!");
3332
}
3433

35-
fn event_send(ctx: &Context, args: Vec<RedisString>) -> RedisValueResult {
34+
fn event_send(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
3635
if args.len() > 1 {
3736
return Err(RedisError::WrongArity);
3837
}
@@ -49,7 +48,7 @@ fn on_key_miss(_ctx: &Context, _event_type: NotifyEvent, _event: &str, _key: &[u
4948
NUM_KEY_MISSES.fetch_add(1, Ordering::SeqCst);
5049
}
5150

52-
fn num_key_miss(_ctx: &Context, _args: Vec<RedisString>) -> RedisValueResult {
51+
fn num_key_miss(_ctx: &Context, _args: Vec<RedisString>) -> RedisResult {
5352
Ok(RedisValue::Integer(NUM_KEY_MISSES.load(Ordering::SeqCst)))
5453
}
5554

‎examples/hello.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use redis_module::{redis_module, Context, RedisError, RedisString, RedisValueResult};
1+
use redis_module::{redis_module, Context, RedisError, RedisResult, RedisString};
22

3-
fn hello_mul(_: &Context, args: Vec<RedisString>) -> RedisValueResult {
3+
fn hello_mul(_: &Context, args: Vec<RedisString>) -> RedisResult {
44
if args.len() < 2 {
55
return Err(RedisError::WrongArity);
66
}

‎examples/info.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use redis_module::{
2-
redis_module, Context, NextArg, RedisError, RedisString, RedisValue, RedisValueResult,
2+
redis_module, Context, NextArg, RedisError, RedisResult, RedisString, RedisValue,
33
};
44

5-
fn info_cmd(ctx: &Context, args: Vec<RedisString>) -> RedisValueResult {
5+
fn info_cmd(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
66
if args.len() < 3 {
77
return Err(RedisError::WrongArity);
88
}

‎examples/keys_pos.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use redis_module::{redis_module, Context, RedisError, RedisString, RedisValue, RedisValueResult};
1+
use redis_module::{redis_module, Context, RedisError, RedisResult, RedisString, RedisValue};
22

3-
fn keys_pos(ctx: &Context, args: Vec<RedisString>) -> RedisValueResult {
3+
fn keys_pos(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
44
// Number of args (excluding command name) must be even
55
if (args.len() - 1) % 2 != 0 {
66
return Err(RedisError::WrongArity);

0 commit comments

Comments
 (0)