From 41a5e6fb50b2c0beaf28e19d138ecf853079a999 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Tue, 21 May 2024 22:06:45 -0700 Subject: [PATCH] enable `manual_is_variant_and` lint --- Cargo.toml | 1 - src/service/rooms/state_accessor.rs | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fbe0d34f..9e717e76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,6 @@ wildcard_dependencies = "warn" missing_errors_doc = "allow" missing_panics_doc = "allow" -manual_is_variant_and = "allow" mixed_attributes_style = "allow" multiple_bound_locations = "allow" option_as_ref_cloned = "allow" diff --git a/src/service/rooms/state_accessor.rs b/src/service/rooms/state_accessor.rs index fe0b25a1..844cccc0 100644 --- a/src/service/rooms/state_accessor.rs +++ b/src/service/rooms/state_accessor.rs @@ -108,17 +108,16 @@ impl Service { #[tracing::instrument(skip(self), ret(level = "trace"))] fn user_was_joined(&self, shortstatehash: u64, user_id: &UserId) -> bool { self.user_membership(shortstatehash, user_id) - .map(|s| s == MembershipState::Join) - .unwrap_or_default() + .is_ok_and(|s| s == MembershipState::Join) } /// The user was an invited or joined room member at this state (potentially /// in the past) #[tracing::instrument(skip(self), ret(level = "trace"))] fn user_was_invited(&self, shortstatehash: u64, user_id: &UserId) -> bool { - self.user_membership(shortstatehash, user_id) - .map(|s| s == MembershipState::Join || s == MembershipState::Invite) - .unwrap_or_default() + self.user_membership(shortstatehash, user_id).is_ok_and(|s| { + s == MembershipState::Join || s == MembershipState::Invite + }) } /// Whether a server is allowed to see an event through federation, based on