From fc32996b51f5bf983fdd20d08028938841b10d3f Mon Sep 17 00:00:00 2001 From: ToastXC <100072983+toastxc@users.noreply.github.com> Date: Thu, 19 Jan 2023 02:16:27 +0800 Subject: [PATCH] chore: remove clippy warnings (#213) --- crates/quark/src/events/impl.rs | 6 +----- crates/quark/src/permissions/defn/mod.rs | 2 +- crates/quark/src/presence/mod.rs | 4 ++-- crates/quark/src/tasks/process_embeds.rs | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/crates/quark/src/events/impl.rs b/crates/quark/src/events/impl.rs index 0dd41e16..6da72a77 100644 --- a/crates/quark/src/events/impl.rs +++ b/crates/quark/src/events/impl.rs @@ -23,11 +23,7 @@ impl Cache { pub async fn can_view_channel(&self, db: &Database, channel: &Channel) -> bool { match &channel { Channel::TextChannel { server, .. } | Channel::VoiceChannel { server, .. } => { - let member = self - .members - .iter() - .map(|(_, x)| x) - .find(|x| &x.id.server == server); + let member = self.members.values().find(|x| &x.id.server == server); let server = self.servers.get(server); let mut perms = perms(self.users.get(&self.user_id).unwrap()).channel(channel); diff --git a/crates/quark/src/permissions/defn/mod.rs b/crates/quark/src/permissions/defn/mod.rs index 6f46254f..a665b903 100644 --- a/crates/quark/src/permissions/defn/mod.rs +++ b/crates/quark/src/permissions/defn/mod.rs @@ -97,7 +97,7 @@ impl From for PermissionValue { impl From for PermissionValue { fn from(v: u64) -> Self { - Self(v as u64) + Self(v) } } diff --git a/crates/quark/src/presence/mod.rs b/crates/quark/src/presence/mod.rs index 2f301f84..73c14b6a 100644 --- a/crates/quark/src/presence/mod.rs +++ b/crates/quark/src/presence/mod.rs @@ -35,7 +35,7 @@ pub async fn presence_create_session(user_id: &str, flags: u8) -> (bool, u8) { __set_key_presence_entry(&mut conn, user_id, entry).await; // Add to region set in case of failure. - __add_to_set_sessions(&mut conn, &*REGION_KEY, user_id, session_id).await; + __add_to_set_sessions(&mut conn, ®ION_KEY, user_id, session_id).await; (was_empty, session_id) } @@ -74,7 +74,7 @@ async fn presence_delete_session_internal( // Remove from region set. if !skip_region { - __remove_from_set_sessions(&mut conn, &*REGION_KEY, user_id, session_id).await; + __remove_from_set_sessions(&mut conn, ®ION_KEY, user_id, session_id).await; } } diff --git a/crates/quark/src/tasks/process_embeds.rs b/crates/quark/src/tasks/process_embeds.rs index 5514c25c..11c37215 100644 --- a/crates/quark/src/tasks/process_embeds.rs +++ b/crates/quark/src/tasks/process_embeds.rs @@ -38,7 +38,7 @@ pub async fn queue(channel: String, id: String, content: String) { pub async fn worker(db: Database) { loop { let task = Q.pop().await; - if let Ok(embeds) = Embed::generate(task.content, &*JANUARY_URL, *MAX_EMBED_COUNT).await { + if let Ok(embeds) = Embed::generate(task.content, &JANUARY_URL, *MAX_EMBED_COUNT).await { if let Err(err) = Message::append( &db, task.id,