Skip to content

Commit 4c16797

Browse files
committed
chore: Rename types in `matrix_sdk_base::sliding_sync::http.
This patch renames types in `matrix_sdk_base::sliding_sync::http`: * `Request<name>` becomes `request::<name>`, * `Response<name>` becomes `response::<name>`, * `extensions::Request<name>` becomes `request::<name>`, * `extensions::Response<name>` becomes `response::<name>`.
1 parent 280b905 commit 4c16797

File tree

18 files changed

+171
-187
lines changed

18 files changed

+171
-187
lines changed

Cargo.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/matrix-sdk-ffi/src/room_list.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,9 @@ pub struct RoomSubscription {
671671
pub include_heroes: Option<bool>,
672672
}
673673

674-
impl From<RoomSubscription> for http::RequestRoomSubscription {
674+
impl From<RoomSubscription> for http::request::RoomSubscription {
675675
fn from(val: RoomSubscription) -> Self {
676-
assign!(http::RequestRoomSubscription::default(), {
676+
assign!(http::request::RoomSubscription::default(), {
677677
required_state: val.required_state.map(|r|
678678
r.into_iter().map(|s| (s.key.into(), s.value)).collect()
679679
).unwrap_or_default(),

crates/matrix-sdk-base/src/sliding_sync/http.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121
/// HTTP types from MSC3575, renamed to match the Simplified MSC3575 namings.
2222
pub mod msc3575 {
2323
use ruma::api::client::sync::sync_events::v4;
24-
pub use v4::{
25-
Extensions as ResponseExtensions, ExtensionsConfig as RequestExtensions, Request, Response,
26-
RoomDetailsConfig as RequestRoomDetails, RoomSubscription as RequestRoomSubscription,
27-
SlidingSyncRoom as ResponseRoom, SlidingSyncRoomHero as ResponseRoomHero,
28-
SyncList as ResponseList, SyncRequestList as RequestList,
29-
SyncRequestListFilters as RequestListFilters,
30-
};
24+
pub use v4::{Request, Response};
3125

32-
/// HTTP types for MSC3575 extensions, renamed to match the Simplified
33-
/// MSC3575 namings.
34-
pub mod extensions {
26+
/// HTTP types related to a `Request`.
27+
pub mod request {
3528
pub use super::v4::{
36-
AccountData as ResponseAccountData, AccountDataConfig as RequestAccountData,
37-
E2EEConfig as RequestE2EE, Receipts as ResponseReceipts,
38-
ReceiptsConfig as RequestReceipts, RoomReceiptConfig as RequestReceiptsRoom,
39-
ToDevice as ResponseToDevice, ToDeviceConfig as RequestToDevice,
40-
Typing as ResponseTyping, TypingConfig as RequestTyping, E2EE as ResponseE2EE,
29+
AccountDataConfig as AccountData, ExtensionsConfig as Extensions,
30+
ReceiptsConfig as Receipts, RoomDetailsConfig as RoomDetails, RoomSubscription,
31+
SyncRequestList as List, SyncRequestListFilters as ListFilters,
32+
ToDeviceConfig as ToDevice, TypingConfig as Typing,
33+
};
34+
}
35+
36+
/// HTTP types related to a `Response`.
37+
pub mod response {
38+
pub use super::v4::{
39+
AccountData, Extensions, Receipts, SlidingSyncRoom as Room,
40+
SlidingSyncRoomHero as RoomHero, SyncList as List, ToDevice, Typing,
4141
};
4242
}
4343
}

0 commit comments

Comments
 (0)