From 94e61d3403a79e29a19d7949be4c3b14b8fd65b7 Mon Sep 17 00:00:00 2001 From: Hirrolot Date: Sat, 8 May 2021 05:39:18 -0700 Subject: [PATCH] Refactor src/dispatching/dialogue/storage/redis_storage.rs Co-authored-by: Waffle Lapkin --- .../dialogue/storage/redis_storage.rs | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/dispatching/dialogue/storage/redis_storage.rs b/src/dispatching/dialogue/storage/redis_storage.rs index 00603fac..0b1219a0 100644 --- a/src/dispatching/dialogue/storage/redis_storage.rs +++ b/src/dispatching/dialogue/storage/redis_storage.rs @@ -65,19 +65,16 @@ where .query_async::<_, redis::Value>(self.conn.lock().await.deref_mut()) .await?; - let deleted_rows_count = match deleted_rows_count { - redis::Value::Bulk(values) => match values[0] { - redis::Value::Int(x) => x, - _ => unreachable!("Must return redis::Value::Int"), - }, - _ => unreachable!("Must return redis::Value::Bulk"), - }; - - if deleted_rows_count == 0 { - return Err(RedisStorageError::RowNotFound); - } - - Ok(()) + if let redis::Value::Bulk(values) = deleted_rows_count { + if let redis::Value::Int(deleted_rows_count) = values[0] { + match deleted_rows_count { + 0 => return Err(RedisStorageError::RowNotFound), + _ => return Ok(()) + } + } + } + + unreachable!("Must return redis::Value::Bulk(redis::Value::Int(_))"); }) }