From 7b742f1b4c565ae420aeb3190fadaa5c7b080271 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Tue, 15 Jun 2021 09:34:56 +0200 Subject: [PATCH] client-api: Remove ruma-common reexports --- crates/ruma-client-api/CHANGELOG.md | 14 ++++++++++++++ .../ruma-client-api/src/r0/contact/get_contacts.rs | 2 +- crates/ruma-client-api/src/r0/keys.rs | 5 ----- crates/ruma-client-api/src/r0/to_device.rs | 2 -- .../src/r0/to_device/send_event_to_device.rs | 3 +-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/crates/ruma-client-api/CHANGELOG.md b/crates/ruma-client-api/CHANGELOG.md index d10846a1..df925dbb 100644 --- a/crates/ruma-client-api/CHANGELOG.md +++ b/crates/ruma-client-api/CHANGELOG.md @@ -4,6 +4,20 @@ Breaking changes: * Use `Raw` over just `AnyInitialStateEvent` in the `initial_state` field of `r0::room::create_room::Request` +* Remove + + ```rust + r0::keys::{ + CrossSigningKey, CrossSigningKeySignatures, KeyUsage, OneTimeKey, SignedKey, + SignedKeySignatures, + } + ``` + + These are now found in `ruma_common::encryption` (or `ruma::encryption`). +* Remove `r0::to_device::DeviceIdOrAllDevices`, now found in `ruma_common::to_device` + (or `ruma::to_device`) +* Remove `r0::contact::get_contacts::{ThirdPartyIdentifier, ThirdPartyIdentifierInit}`, now found + in `ruma_common::thirdparty` (or `ruma::thirdparty`) # 0.10.2 diff --git a/crates/ruma-client-api/src/r0/contact/get_contacts.rs b/crates/ruma-client-api/src/r0/contact/get_contacts.rs index ccf6880c..113dcdf5 100644 --- a/crates/ruma-client-api/src/r0/contact/get_contacts.rs +++ b/crates/ruma-client-api/src/r0/contact/get_contacts.rs @@ -1,7 +1,7 @@ //! [GET /_matrix/client/r0/account/3pid](https://matrix.org/docs/spec/client_server/r0.6.0#get-matrix-client-r0-account-3pid) use ruma_api::ruma_api; -pub use ruma_common::thirdparty::{ThirdPartyIdentifier, ThirdPartyIdentifierInit}; +use ruma_common::thirdparty::ThirdPartyIdentifier; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/r0/keys.rs b/crates/ruma-client-api/src/r0/keys.rs index 8aafd3a2..14f6b6b5 100644 --- a/crates/ruma-client-api/src/r0/keys.rs +++ b/crates/ruma-client-api/src/r0/keys.rs @@ -1,10 +1,5 @@ //! Endpoints for key management -pub use ruma_common::encryption::{ - CrossSigningKey, CrossSigningKeySignatures, KeyUsage, OneTimeKey, SignedKey, - SignedKeySignatures, -}; - pub mod claim_keys; pub mod get_key_changes; pub mod get_keys; diff --git a/crates/ruma-client-api/src/r0/to_device.rs b/crates/ruma-client-api/src/r0/to_device.rs index 476a0c8a..855f2a21 100644 --- a/crates/ruma-client-api/src/r0/to_device.rs +++ b/crates/ruma-client-api/src/r0/to_device.rs @@ -1,5 +1,3 @@ //! Endpoints for client devices to exchange information not persisted in room DAG. -pub use ruma_common::to_device::DeviceIdOrAllDevices; - pub mod send_event_to_device; diff --git a/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs b/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs index e10ec76b..6eb22db4 100644 --- a/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs +++ b/crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs @@ -3,12 +3,11 @@ use std::collections::BTreeMap; use ruma_api::ruma_api; +use ruma_common::to_device::DeviceIdOrAllDevices; use ruma_events::EventType; use ruma_identifiers::UserId; use serde_json::value::RawValue as RawJsonValue; -use super::DeviceIdOrAllDevices; - ruma_api! { metadata: { description: "Send an event to a device or devices.",