From 2357a09d130ff8f4e314a15c7ffa4150177a8ff8 Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Thu, 13 Jul 2023 15:37:04 +0200 Subject: [PATCH] chore: remove spurious `feature` guarding against "experimental-sliding-sync" The whole file is guarded against this feature. --- crates/matrix-sdk-base/src/sliding_sync.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/matrix-sdk-base/src/sliding_sync.rs b/crates/matrix-sdk-base/src/sliding_sync.rs index 6015f0a31..d3f3c208e 100644 --- a/crates/matrix-sdk-base/src/sliding_sync.rs +++ b/crates/matrix-sdk-base/src/sliding_sync.rs @@ -27,7 +27,7 @@ use ruma::{ use tracing::{debug, info, instrument, warn}; use super::BaseClient; -#[cfg(all(feature = "e2e-encryption", feature = "experimental-sliding-sync"))] +#[cfg(feature = "e2e-encryption")] use crate::latest_event::{is_suitable_for_latest_event, PossibleLatestEvent}; #[cfg(feature = "e2e-encryption")] use crate::RoomMemberships; @@ -251,7 +251,7 @@ impl BaseClient { // Cache the latest decrypted event in room_info, and also keep any later // encrypted events, so we can slot them in when we get the keys. - #[cfg(all(feature = "e2e-encryption", feature = "experimental-sliding-sync"))] + #[cfg(feature = "e2e-encryption")] cache_latest_events(&mut room, &mut room_info, &timeline.events); #[cfg(feature = "e2e-encryption")] @@ -375,7 +375,7 @@ impl BaseClient { /// Find the most recent decrypted event and cache it in the supplied RoomInfo. /// If any encrypted events are found after that one, store them in the RoomInfo /// too so we can use them when we get the relevant keys. -#[cfg(all(feature = "e2e-encryption", feature = "experimental-sliding-sync"))] +#[cfg(feature = "e2e-encryption")] fn cache_latest_events(room: &mut Room, room_info: &mut RoomInfo, events: &[SyncTimelineEvent]) { let mut encrypted_events = Vec::with_capacity(room.latest_encrypted_events.read().unwrap().capacity());