diff --git a/crates/gateway/src/discord/shard_state.rs b/crates/gateway/src/discord/shard_state.rs index 7c3d9bf7..a7579583 100644 --- a/crates/gateway/src/discord/shard_state.rs +++ b/crates/gateway/src/discord/shard_state.rs @@ -3,7 +3,7 @@ use metrics::{counter, gauge}; use tracing::info; use twilight_gateway::{Event, Latency}; -use libpk::{state::*, util::redis::*}; +use libpk::state::ShardState; #[derive(Clone)] pub struct ShardStateManager { @@ -24,11 +24,7 @@ impl ShardStateManager { } async fn get_shard(&self, shard_id: u32) -> anyhow::Result { - let data: Option = self - .redis - .hget("pluralkit:shardstatus", shard_id) - .await - .to_option_or_error()?; + let data: Option = self.redis.hget("pluralkit:shardstatus", shard_id).await?; match data { Some(buf) => Ok(serde_json::from_str(&buf).expect("could not decode shard data!")), None => Ok(ShardState::default()), diff --git a/crates/libpk/src/lib.rs b/crates/libpk/src/lib.rs index 39643fb6..03c420e7 100644 --- a/crates/libpk/src/lib.rs +++ b/crates/libpk/src/lib.rs @@ -9,7 +9,6 @@ use sentry_tracing::event_from_event; pub mod db; pub mod state; -pub mod util; pub mod _config; pub use crate::_config::CONFIG as config; diff --git a/crates/libpk/src/util/mod.rs b/crates/libpk/src/util/mod.rs deleted file mode 100644 index 027fbef5..00000000 --- a/crates/libpk/src/util/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod redis; diff --git a/crates/libpk/src/util/redis.rs b/crates/libpk/src/util/redis.rs deleted file mode 100644 index 25a5acdb..00000000 --- a/crates/libpk/src/util/redis.rs +++ /dev/null @@ -1,15 +0,0 @@ -use fred::error::RedisError; - -pub trait RedisErrorExt { - fn to_option_or_error(self) -> Result, RedisError>; -} - -impl RedisErrorExt for Result { - fn to_option_or_error(self) -> Result, RedisError> { - match self { - Ok(v) => Ok(Some(v)), - Err(error) if error.is_not_found() => Ok(None), - Err(error) => Err(error), - } - } -}