From c8e05173e40ba4c58b6f38fc635a34b6cedf6971 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Wed, 3 Jul 2024 21:01:52 +0200 Subject: [PATCH] chore(base): Move imports under the correct feature flag. Some imports are only required under `cfg(feature = "e2e-encryption")`. Let's fix these warnings. --- crates/matrix-sdk-base/src/latest_event.rs | 13 +++++-------- crates/matrix-sdk-base/src/sliding_sync.rs | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/crates/matrix-sdk-base/src/latest_event.rs b/crates/matrix-sdk-base/src/latest_event.rs index 84584f7ed..fce740d58 100644 --- a/crates/matrix-sdk-base/src/latest_event.rs +++ b/crates/matrix-sdk-base/src/latest_event.rs @@ -6,16 +6,13 @@ use matrix_sdk_common::deserialized_responses::SyncTimelineEvent; #[cfg(feature = "e2e-encryption")] use ruma::events::{ - poll::unstable_start::SyncUnstablePollStartEvent, room::message::SyncRoomMessageEvent, + call::{invite::SyncCallInviteEvent, notify::SyncCallNotifyEvent}, + poll::unstable_start::SyncUnstablePollStartEvent, + relation::RelationType, + room::message::SyncRoomMessageEvent, AnySyncMessageLikeEvent, AnySyncTimelineEvent, }; -use ruma::{ - events::{ - call::{invite::SyncCallInviteEvent, notify::SyncCallNotifyEvent}, - relation::RelationType, - }, - MxcUri, OwnedEventId, -}; +use ruma::{MxcUri, OwnedEventId}; use serde::{Deserialize, Serialize}; use crate::MinimalRoomMemberEvent; diff --git a/crates/matrix-sdk-base/src/sliding_sync.rs b/crates/matrix-sdk-base/src/sliding_sync.rs index 497fae211..e4c3445ca 100644 --- a/crates/matrix-sdk-base/src/sliding_sync.rs +++ b/crates/matrix-sdk-base/src/sliding_sync.rs @@ -16,6 +16,7 @@ use std::collections::BTreeMap; #[cfg(feature = "e2e-encryption")] use std::ops::Deref; +#[cfg(feature = "e2e-encryption")] use matrix_sdk_common::deserialized_responses::SyncTimelineEvent; #[cfg(feature = "e2e-encryption")] use ruma::events::AnyToDeviceEvent;