From a4ff32667e1036d6e5129940942182fdc08307be Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 14 May 2024 19:24:40 -0700
Subject: [PATCH] enable `unnested_or_patterns` lint

---
 Cargo.toml                          | 1 +
 src/api/client_server/membership.rs | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6b8e03d7..566525bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,6 +87,7 @@ unnecessary_safety_doc = "warn"
 unnecessary_self_imports = "warn"
 unnecessary_wraps = "warn"
 unneeded_field_pattern = "warn"
+unnested_or_patterns = "warn"
 unseparated_literal_suffix = "warn"
 verbose_file_reads = "warn"
 wildcard_dependencies = "warn"
diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index 84b92f4f..b8663ce1 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -571,10 +571,7 @@ async fn join_room_by_id_helper(
 
         let restriction_rooms = match join_rules_event_content {
             Some(RoomJoinRulesEventContent {
-                join_rule: JoinRule::Restricted(restricted),
-            })
-            | Some(RoomJoinRulesEventContent {
-                join_rule: JoinRule::KnockRestricted(restricted),
+                join_rule: JoinRule::Restricted(restricted) | JoinRule::KnockRestricted(restricted),
             }) => restricted
                 .allow
                 .into_iter()