diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3fb6b968..770c2641 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -125,7 +125,7 @@ For example, ```rust use std::collections::BTreeMap; -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use super::MyType; ``` diff --git a/crates/ruma-api/CHANGELOG.md b/crates/ruma-api/CHANGELOG.md deleted file mode 100644 index 0553fcb7..00000000 --- a/crates/ruma-api/CHANGELOG.md +++ /dev/null @@ -1,287 +0,0 @@ -# [unreleased] - -# 0.20.0 - -Breaking changes: - -* Bump dependencies - -# 0.19.0 - -Breaking changes: - -* Remove the `RequestDeserializationError` and `ResponseDeserializationError` - types in favor of using `DeserializationError` directly -* Replace singular `path` metadata field with `stable_path`, `r0_path` and - `unstable_path` -* Require callers of `OutgoingRequest::try_into_http_request` to pass a list of - server-supported matrix versions for selecting whether to use r0, unstable or - stable paths -* Require callers of `IncomingRequest::try_from_http_request` to pass path - arguments, to avoid unnecessary extra path parsing - -# 0.18.5 - -Bug fixes: - -* Stop adding a `Content-Type` header to requests without any fields - * This fixes usage of the `.well-known` endpoints in a browser WASM - environment if the server isn't configured to allow that header for - cross-origin requests - -# 0.18.4 - -Yanked. - -# 0.18.3 - -Improvements: - -* Refactor handling of newtype bodies in `ruma_api!` - * Likely what fixed a bug affecting `ruma-federation-api` - -# 0.18.2 - -Bug fixes: - -* Fix (de)serialization of requests with a `#[ruma_api(body)]` field - -# 0.18.1 - -Breaking changes: - -* Generate "struct structs" for `Request` and `Response`, even if there are no - fields - * We used to generate unit structs when there's no fields -* Upgrade dependencies - -Bug fixes: - -* Allow all borrowing query and / or body parameters in `ruma_api!` to be - `cfg`-conditional - * This used lead to broken code being generated and was fixed by moving all - `impl` block generation code into a derive macro (derive macros run after - `cfg` expansion) - -# 0.18.0 - -Yanked, this was the same as 0.17.2 but accidentally released with the minor -rather than the patch version segment incremented. It then turned out that it -did actually contain breaking changes, so 0.17.2 was yanked too. - -# 0.17.2 - -Yanked since it unintentionally contained breaking changes. - -# 0.17.1 - -Improvements: - -* Allow `ruma_api!` to be used by crates that depend on matrix-sdk, but not (directly) on ruma or - ruma-api - -# 0.17.0 - -Breaking changes: - -* Update the syntax of the `ruma_api!` macro. Colons are now required after the keywords `metadata`, - `request` and `response`. -* The `EndpointError` trait now requires `std::error::Error`. This allows integrating - `EndpointError`s in the common rust error ecosystem like `thiserror` and `anyhow`. -* The `Endpoint` trait has been replaced by four of new traits that each capture a subset of its - previous functionality: `OutgoingRequest`, `OutgoingResponse`, `IncomingRequest`, - `IncomingResponse`. See the API documentation for more details. -* Endpoint authentication is now more granularly defined by an enum `AuthScheme` - instead of a boolean. The `ruma_api!` macro has been updated to require - `authentication` instead of `requires_authentication`. -* Remove `error::Void`, the default error type for `ruma_api!` is now `error::MatrixError` - (see below) - -Improvements: - -* The `EndpointError`s that come with ruma crates now implement `std::error::Error` -* Add a new `MatrixError` type to the `error` module that consists of a HTTP status code and JSON - `body` and is the new default error type for `ruma_api!` - -Bug fixes: - -* Prevent panic when building requests with an invalid URI - -# 0.16.1 - -Bug fixes: - -* Update ruma-serde to 0.2.0, fixing some issues with query string deserialization (some issues - still remain but will be fixed in a semver-compatible version) - -# 0.16.0 - -Breaking changes: - -* Update ruma-identifiers to 0.16.1 -* Remove the `Outgoing` trait and update the `Endpoint` trait and code generation accordingly - -Improvements: - -* Remove dependency on the `url` crate - -# 0.15.1 - -Bug fixes: - -* Write `{}` to the body of responses without body fields (fix from ruma-api-macros) - -# 0.15.0 - -Breaking changes: - -* Emit an error on non-UTF8 characters in path segments - * Before, they would be replaced by the unknown character codepoint -* `FromHttpResponseError` now has a generic parameter for the expected type of - error the homeserver could return - -Improvements: - -* Enable deserialization of unsuccessful responses - -# 0.14.0 - -Breaking changes: - -* Update ruma-api-macros to 0.11.0 - * This includes a fix that uses `TryFrom<&str>` instead of serde_json for path segment - deserialization - -# 0.13.1 - -Improvements: - -* Update ruma-api-macros to 0.10.1 - * `Incoming` types will now implement `Debug` - -# 0.13.0 - -Breaking changes: - -* Instead of one `Error` type, there is now many - * The new types live in their own `error` module - * They provide access to details that were previously hidden -* Our Minimum Supported Rust Version is now 1.40.0 - -# 0.12.1 - -Improvements: - -* Update ruma-api-macros to 0.9.1 to support `#[ruma_api(raw_body)]` - -# 0.12.0 - -Breaking changes: - -* Our Minimum Supported Rust Version is now 1.39.0 -* Support for the server-side use case has been restored. For details, see the documentation for - `ruma_api!`, the new `Outgoing` trait and its derive macro - -# 0.11.2 - -Improvements: - -* Update ruma-api-macros to 0.8.2 - -# 0.11.1 - -Improvements: - -* Update ruma-api-macros to 0.8.1 - -# 0.11.0 - -Breaking changes: - -* To be able to use ruma-event's `EventResult` in ruma-client without large-ish refactorings to ruma-api, we removed support for the server-side use case in ruma-api 0.11.0. It will be added back in a future release. - -Improvements: - -* Our CI now tests ruma-api on Rust 1.34.2, beta and nightly in addition to stable -* Updated syn and quote to 1.0 - -# 0.10.0 - -Breaking changes: - -* The `Endpoint` trait is now implemented directly on the relevant request type rather than having both the request and response be associated types. - -Improvements: - -* ruma-api now re-exports the `ruma_api` macro from ruma-api-macros. Downstream crates no longer need to depend on ruma-api-macros directly. -* The ruma-api and ruma-api-macros repositories have been merged into one Cargo workspace for easier dependency management and development. - -# 0.9.0 - -Breaking changes: - -* The `Request` and `Response` associated types on the `Endpoint` trait are now bounded by `std::convert::TryFrom` instead of `futures::future::FutureFrom`. This was done in preparation for futures 0.3 which does not have this trait. -* The conversions required to and from `http::Request` and `http::Response` for the `Request` and `Response` associated types on the `Endpoint` trait now use `Vec` as the body type. This removes the dependency on hyper. It's possible this will change again in a future release. See https://github.com/rustasync/team/issues/84 for details. - -Improvements: - -* Internal code quality improvements via clippy and rustfmt. - -# 0.8.0 - -Breaking changes: - -* The `Error` type is now an opaque struct that hides implementation details. -* Updates to ruma-identifiers 0.13. - -Improvements: - -* ruma-api now uses clippy to improve code quality. - -# 0.7.0 - -Improvements: - -* ruma-api now runs on stable Rust, requiring version 1.34 or higher. -* Updated all dependencies for upstream improvements. -* Updated all code to use Rust edition 2018. - -# 0.6.0 - -Breaking changes: - -* Hyper has been updated to version 0.12. -* A new variant to the `Error` enum for hyper errors has been added. -* Conversions between this crate's request and response types and the http crate's request and response types are now bidirectional. - -# 0.5.0 - -Breaking changes: - -* Types from hyper have been replaced with types from the http crate. -* The `Error` enum can no longer be matched exhaustively, to allow for future expansion without breaking the crate's API. - -# 0.4.0 - -Breaking changes: - -The crate has been redesign to focus on conversions between an endpoint's request and response types and Hyper request and response types. Implementations are expected to be generated via [ruma-api-macros]. - -[ruma-api-macros]: https://github.com/ruma/ruma/tree/main/ruma-api-macros - -# 0.3.0 - -Breaking changes: - -* `Endpoint::router_path` now returns a `&'static str` -* Added new required methods to `Endpoint`: `name`, `description`, `requires_authentication`, and `rate_limited`. - -# 0.2.0 - -Breaking changes: - -* `Endpoint::Query_params` must now be `Deserialize + Serialize`. - -# 0.1.0 - -Initial release. diff --git a/crates/ruma-api/Cargo.toml b/crates/ruma-api/Cargo.toml deleted file mode 100644 index 9f256b07..00000000 --- a/crates/ruma-api/Cargo.toml +++ /dev/null @@ -1,39 +0,0 @@ -[package] -categories = ["api-bindings", "web-programming"] -description = "An abstraction for Matrix API endpoints." -homepage = "https://www.ruma.io/" -keywords = ["matrix", "chat", "messaging", "ruma"] -license = "MIT" -name = "ruma-api" -readme = "README.md" -repository = "https://github.com/ruma/ruma" -version = "0.20.0" -edition = "2018" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -# These feature gates exist only for the tests. Disabling them results in a -# compile error. -[features] -default = ["client", "server"] -client = [] -server = [] - -[dependencies] -bytes = "1.0.1" -http = "0.2.2" -percent-encoding = "2.1.0" -ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } -ruma-macros = { version = "=0.1.0", path = "../ruma-macros" } -ruma-serde = { version = "0.6.0", path = "../ruma-serde" } -serde = { version = "1.0.118", features = ["derive"] } -serde_json = "1.0.61" -thiserror = "1.0.26" -tracing = "0.1.25" - -[dev-dependencies] -matches = "0.1.8" -ruma-events = { version = "0.26.0", path = "../ruma-events" } -trybuild = "1.0.38" diff --git a/crates/ruma-api/README.md b/crates/ruma-api/README.md deleted file mode 100644 index e47f995f..00000000 --- a/crates/ruma-api/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# ruma-api - -[![crates.io page](https://img.shields.io/crates/v/ruma-api.svg)](https://crates.io/crates/ruma-api) -[![docs.rs page](https://docs.rs/ruma-api/badge.svg)](https://docs.rs/ruma-api/) -![license: MIT](https://img.shields.io/crates/l/ruma-api.svg) - -**ruma-api** contains core types used to define the requests and responses for each endpoint in the various [Matrix](https://matrix.org/) API specifications. -These types can be shared by client and server code for all Matrix APIs. diff --git a/crates/ruma-api/tests/ruma_api.rs b/crates/ruma-api/tests/ruma_api.rs deleted file mode 100644 index b7c536c7..00000000 --- a/crates/ruma-api/tests/ruma_api.rs +++ /dev/null @@ -1,13 +0,0 @@ -#[test] -fn ui() { - let t = trybuild::TestCases::new(); - t.pass("tests/ui/01-api-sanity-check.rs"); - t.compile_fail("tests/ui/02-invalid-path.rs"); - t.pass("tests/ui/03-move-value.rs"); - t.compile_fail("tests/ui/04-attributes.rs"); - t.pass("tests/ui/05-request-only.rs"); - t.pass("tests/ui/06-response-only.rs"); - t.compile_fail("tests/ui/07-error-type-attribute.rs"); - t.compile_fail("tests/ui/08-deprecated-without-added.rs"); - t.compile_fail("tests/ui/09-removed-without-deprecated.rs"); -} diff --git a/crates/ruma-appservice-api/Cargo.toml b/crates/ruma-appservice-api/Cargo.toml index 6835dc39..872fde6d 100644 --- a/crates/ruma-appservice-api/Cargo.toml +++ b/crates/ruma-appservice-api/Cargo.toml @@ -20,9 +20,8 @@ client = [] server = [] [dependencies] -ruma-api = { version = "0.20.0", path = "../ruma-api" } ruma-client-api = { version = "0.13.0", path = "../ruma-client-api", features = ["client"], optional = true } -ruma-common = { version = "0.8.0", path = "../ruma-common" } +ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api"] } ruma-events = { version = "0.26.0", path = "../ruma-events" } ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } diff --git a/crates/ruma-appservice-api/src/event/push_events.rs b/crates/ruma-appservice-api/src/event/push_events.rs index 38dd1090..83761ebb 100644 --- a/crates/ruma-appservice-api/src/event/push_events.rs +++ b/crates/ruma-appservice-api/src/event/push_events.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#put_matrixappv1transactionstxnid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::AnyRoomEvent; use ruma_identifiers::TransactionId; use ruma_serde::Raw; @@ -161,7 +161,7 @@ pub mod v1 { #[cfg(feature = "server")] #[cfg(test)] mod tests { - use ruma_api::{OutgoingRequest, SendAccessToken}; + use ruma_common::api::{OutgoingRequest, SendAccessToken}; use serde_json::json; use super::Request; @@ -186,7 +186,7 @@ pub mod v1 { .try_into_http_request::>( "https://homeserver.tld", SendAccessToken::IfRequired("auth_tok"), - &[ruma_api::MatrixVersion::V1_1], + &[ruma_common::api::MatrixVersion::V1_1], ) .unwrap(); let json_body: serde_json::Value = serde_json::from_slice(req.body()).unwrap(); diff --git a/crates/ruma-appservice-api/src/query/query_room_alias.rs b/crates/ruma-appservice-api/src/query/query_room_alias.rs index 9bfd3b1d..85b67eed 100644 --- a/crates/ruma-appservice-api/src/query/query_room_alias.rs +++ b/crates/ruma-appservice-api/src/query/query_room_alias.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1roomsroomalias - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomAliasId; ruma_api! { diff --git a/crates/ruma-appservice-api/src/query/query_user_id.rs b/crates/ruma-appservice-api/src/query/query_user_id.rs index 3b1c372f..d1a1d4c2 100644 --- a/crates/ruma-appservice-api/src/query/query_user_id.rs +++ b/crates/ruma-appservice-api/src/query/query_user_id.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1usersuserid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs b/crates/ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs index b778a4d7..33badd05 100644 --- a/crates/ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs +++ b/crates/ruma-appservice-api/src/thirdparty/get_location_for_protocol.rs @@ -10,8 +10,7 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::thirdparty::Location; + use ruma_common::{api::ruma_api, thirdparty::Location}; ruma_api! { metadata: { diff --git a/crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs b/crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs index b721f30d..7e09d2bf 100644 --- a/crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs +++ b/crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1thirdpartylocation - use ruma_api::ruma_api; - use ruma_common::thirdparty::Location; + use ruma_common::{api::ruma_api, thirdparty::Location}; use ruma_identifiers::RoomAliasId; ruma_api! { diff --git a/crates/ruma-appservice-api/src/thirdparty/get_protocol.rs b/crates/ruma-appservice-api/src/thirdparty/get_protocol.rs index 035176c2..ec664e9b 100644 --- a/crates/ruma-appservice-api/src/thirdparty/get_protocol.rs +++ b/crates/ruma-appservice-api/src/thirdparty/get_protocol.rs @@ -8,8 +8,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1thirdpartyprotocolprotocol - use ruma_api::ruma_api; - use ruma_common::thirdparty::Protocol; + use ruma_common::{api::ruma_api, thirdparty::Protocol}; ruma_api! { metadata: { diff --git a/crates/ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs b/crates/ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs index 5953ca69..ce42013c 100644 --- a/crates/ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs +++ b/crates/ruma-appservice-api/src/thirdparty/get_user_for_protocol.rs @@ -10,8 +10,7 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::thirdparty::User; + use ruma_common::{api::ruma_api, thirdparty::User}; ruma_api! { metadata: { diff --git a/crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs b/crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs index 48687f8d..ec6c077c 100644 --- a/crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs +++ b/crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1thirdpartyuser - use ruma_api::ruma_api; - use ruma_common::thirdparty::User; + use ruma_common::{api::ruma_api, thirdparty::User}; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-client-api/Cargo.toml b/crates/ruma-client-api/Cargo.toml index be324985..10a84315 100644 --- a/crates/ruma-client-api/Cargo.toml +++ b/crates/ruma-client-api/Cargo.toml @@ -28,8 +28,7 @@ http = "0.2.2" js_int = { version = "0.2.0", features = ["serde"] } maplit = "1.0.2" percent-encoding = "2.1.0" -ruma-api = { version = "0.20.0", path = "../ruma-api" } -ruma-common = { version = "0.8.0", path = "../ruma-common" } +ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api"] } ruma-events = { version = "0.26.0", path = "../ruma-events" } ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } diff --git a/crates/ruma-client-api/src/account/add_3pid.rs b/crates/ruma-client-api/src/account/add_3pid.rs index 63e2b4dd..4b380f8b 100644 --- a/crates/ruma-client-api/src/account/add_3pid.rs +++ b/crates/ruma-client-api/src/account/add_3pid.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidadd - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/account/bind_3pid.rs b/crates/ruma-client-api/src/account/bind_3pid.rs index b214f868..6989a97a 100644 --- a/crates/ruma-client-api/src/account/bind_3pid.rs +++ b/crates/ruma-client-api/src/account/bind_3pid.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidbind - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/change_password.rs b/crates/ruma-client-api/src/account/change_password.rs index d6974c25..dee74d7e 100644 --- a/crates/ruma-client-api/src/account/change_password.rs +++ b/crates/ruma-client-api/src/account/change_password.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3accountpassword - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/account/check_registration_token_validity.rs b/crates/ruma-client-api/src/account/check_registration_token_validity.rs index 7457bb60..bf045894 100644 --- a/crates/ruma-client-api/src/account/check_registration_token_validity.rs +++ b/crates/ruma-client-api/src/account/check_registration_token_validity.rs @@ -5,7 +5,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv1registermloginregistration_tokenvalidity - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/account/deactivate.rs b/crates/ruma-client-api/src/account/deactivate.rs index 32ff7f7a..16c9782c 100644 --- a/crates/ruma-client-api/src/account/deactivate.rs +++ b/crates/ruma-client-api/src/account/deactivate.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3accountdeactivate - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::{ account::ThirdPartyIdRemovalStatus, diff --git a/crates/ruma-client-api/src/account/delete_3pid.rs b/crates/ruma-client-api/src/account/delete_3pid.rs index 4b1146f2..eb563208 100644 --- a/crates/ruma-client-api/src/account/delete_3pid.rs +++ b/crates/ruma-client-api/src/account/delete_3pid.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3piddelete - use ruma_api::ruma_api; - use ruma_common::thirdparty::Medium; + use ruma_common::{api::ruma_api, thirdparty::Medium}; use crate::account::ThirdPartyIdRemovalStatus; diff --git a/crates/ruma-client-api/src/account/get_3pids.rs b/crates/ruma-client-api/src/account/get_3pids.rs index 568380d1..a0b51f73 100644 --- a/crates/ruma-client-api/src/account/get_3pids.rs +++ b/crates/ruma-client-api/src/account/get_3pids.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3account3pid - use ruma_api::ruma_api; - use ruma_common::thirdparty::ThirdPartyIdentifier; + use ruma_common::{api::ruma_api, thirdparty::ThirdPartyIdentifier}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/account/get_username_availability.rs b/crates/ruma-client-api/src/account/get_username_availability.rs index 6b79aa67..528dfba2 100644 --- a/crates/ruma-client-api/src/account/get_username_availability.rs +++ b/crates/ruma-client-api/src/account/get_username_availability.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3registeravailable - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/account/register.rs b/crates/ruma-client-api/src/account/register.rs index 9e3d61cd..4c4ecfe5 100644 --- a/crates/ruma-client-api/src/account/register.rs +++ b/crates/ruma-client-api/src/account/register.rs @@ -7,7 +7,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3register - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{DeviceId, UserId}; use super::{LoginType, RegistrationKind}; diff --git a/crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs b/crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs index 01cb134a..6b5a099f 100644 --- a/crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs +++ b/crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidemailrequesttoken use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs b/crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs index 4f09bd75..90239b6c 100644 --- a/crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs +++ b/crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidmsisdnrequesttoken use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/request_openid_token.rs b/crates/ruma-client-api/src/account/request_openid_token.rs index e51a1dd1..7812686f 100644 --- a/crates/ruma-client-api/src/account/request_openid_token.rs +++ b/crates/ruma-client-api/src/account/request_openid_token.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::time::Duration; - use ruma_api::ruma_api; - use ruma_common::authentication::TokenType; + use ruma_common::{api::ruma_api, authentication::TokenType}; use ruma_identifiers::{ServerName, UserId}; ruma_api! { diff --git a/crates/ruma-client-api/src/account/request_password_change_token_via_email.rs b/crates/ruma-client-api/src/account/request_password_change_token_via_email.rs index 5d021784..814f4ba2 100644 --- a/crates/ruma-client-api/src/account/request_password_change_token_via_email.rs +++ b/crates/ruma-client-api/src/account/request_password_change_token_via_email.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3accountpasswordemailrequesttoken use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs b/crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs index d575f553..b099ee7c 100644 --- a/crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs +++ b/crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3accountpasswordmsisdnrequesttoken use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; ruma_api! { diff --git a/crates/ruma-client-api/src/account/request_registration_token_via_email.rs b/crates/ruma-client-api/src/account/request_registration_token_via_email.rs index b21df0ec..18fc213d 100644 --- a/crates/ruma-client-api/src/account/request_registration_token_via_email.rs +++ b/crates/ruma-client-api/src/account/request_registration_token_via_email.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3registeremailrequesttoken use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs b/crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs index 1b78ae58..918b52d3 100644 --- a/crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs +++ b/crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3registermsisdnrequesttoken use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/unbind_3pid.rs b/crates/ruma-client-api/src/account/unbind_3pid.rs index 396aed3a..17714913 100644 --- a/crates/ruma-client-api/src/account/unbind_3pid.rs +++ b/crates/ruma-client-api/src/account/unbind_3pid.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidunbind - use ruma_api::ruma_api; - use ruma_common::thirdparty::Medium; + use ruma_common::{api::ruma_api, thirdparty::Medium}; use crate::account::ThirdPartyIdRemovalStatus; diff --git a/crates/ruma-client-api/src/account/whoami.rs b/crates/ruma-client-api/src/account/whoami.rs index 90c56d3d..4fcef0c7 100644 --- a/crates/ruma-client-api/src/account/whoami.rs +++ b/crates/ruma-client-api/src/account/whoami.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3accountwhoami - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{DeviceId, UserId}; ruma_api! { diff --git a/crates/ruma-client-api/src/alias/create_alias.rs b/crates/ruma-client-api/src/alias/create_alias.rs index d36dd825..dacd94ac 100644 --- a/crates/ruma-client-api/src/alias/create_alias.rs +++ b/crates/ruma-client-api/src/alias/create_alias.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3directoryroomroomalias - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomAliasId, RoomId}; ruma_api! { diff --git a/crates/ruma-client-api/src/alias/delete_alias.rs b/crates/ruma-client-api/src/alias/delete_alias.rs index 832b29e7..f669f3c4 100644 --- a/crates/ruma-client-api/src/alias/delete_alias.rs +++ b/crates/ruma-client-api/src/alias/delete_alias.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3directoryroomroomalias - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomAliasId; ruma_api! { diff --git a/crates/ruma-client-api/src/alias/get_alias.rs b/crates/ruma-client-api/src/alias/get_alias.rs index b678bb2d..acdd197d 100644 --- a/crates/ruma-client-api/src/alias/get_alias.rs +++ b/crates/ruma-client-api/src/alias/get_alias.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3directoryroomroomalias - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomAliasId, RoomId, ServerName}; ruma_api! { diff --git a/crates/ruma-client-api/src/appservice/set_room_visibility.rs b/crates/ruma-client-api/src/appservice/set_room_visibility.rs index 77242358..969b1797 100644 --- a/crates/ruma-client-api/src/appservice/set_room_visibility.rs +++ b/crates/ruma-client-api/src/appservice/set_room_visibility.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#put_matrixclientv3directorylistappservicenetworkidroomid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use crate::room::Visibility; diff --git a/crates/ruma-client-api/src/backup/add_backup_keys.rs b/crates/ruma-client-api/src/backup/add_backup_keys.rs index c076a4e0..f74cec73 100644 --- a/crates/ruma-client-api/src/backup/add_backup_keys.rs +++ b/crates/ruma-client-api/src/backup/add_backup_keys.rs @@ -8,7 +8,7 @@ pub mod v3 { use std::collections::BTreeMap; use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use crate::backup::RoomKeyBackup; diff --git a/crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs b/crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs index 92e45f35..090a0bef 100644 --- a/crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs +++ b/crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs @@ -8,7 +8,7 @@ pub mod v3 { use std::collections::BTreeMap; use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs b/crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs index 53b77ff4..bd06a400 100644 --- a/crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs +++ b/crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3room_keyskeysroomidsessionid use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/backup/create_backup_version.rs b/crates/ruma-client-api/src/backup/create_backup_version.rs index 2d1ce2da..a6331ba9 100644 --- a/crates/ruma-client-api/src/backup/create_backup_version.rs +++ b/crates/ruma-client-api/src/backup/create_backup_version.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3room_keysversion - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_serde::Raw; use crate::backup::BackupAlgorithm; diff --git a/crates/ruma-client-api/src/backup/delete_backup_keys.rs b/crates/ruma-client-api/src/backup/delete_backup_keys.rs index 8e415022..26432ee5 100644 --- a/crates/ruma-client-api/src/backup/delete_backup_keys.rs +++ b/crates/ruma-client-api/src/backup/delete_backup_keys.rs @@ -8,7 +8,7 @@ pub mod v3 { //! This deletes keys from a backup version, but not the version itself. use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs b/crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs index f4bcc4d9..e3a257d3 100644 --- a/crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs +++ b/crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3room_keyskeysroomid use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; ruma_api! { diff --git a/crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs b/crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs index 83967776..b3aee494 100644 --- a/crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs +++ b/crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3room_keyskeysroomidsessionid use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; ruma_api! { diff --git a/crates/ruma-client-api/src/backup/delete_backup_version.rs b/crates/ruma-client-api/src/backup/delete_backup_version.rs index 2dc2e335..0ee1f1e7 100644 --- a/crates/ruma-client-api/src/backup/delete_backup_version.rs +++ b/crates/ruma-client-api/src/backup/delete_backup_version.rs @@ -7,7 +7,7 @@ pub mod v3 { //! //! This deletes a backup version and its room keys. - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/backup/get_backup_info.rs b/crates/ruma-client-api/src/backup/get_backup_info.rs index 0815f915..ebd7aba4 100644 --- a/crates/ruma-client-api/src/backup/get_backup_info.rs +++ b/crates/ruma-client-api/src/backup/get_backup_info.rs @@ -8,7 +8,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3room_keysversionversion use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_serde::Raw; use serde::{ser, Deserialize, Deserializer, Serialize}; use serde_json::value::{to_raw_value as to_raw_json_value, RawValue as RawJsonValue}; diff --git a/crates/ruma-client-api/src/backup/get_backup_keys.rs b/crates/ruma-client-api/src/backup/get_backup_keys.rs index 05da049a..043af03b 100644 --- a/crates/ruma-client-api/src/backup/get_backup_keys.rs +++ b/crates/ruma-client-api/src/backup/get_backup_keys.rs @@ -9,7 +9,7 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use crate::backup::RoomKeyBackup; diff --git a/crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs b/crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs index 792b4b77..5a078e96 100644 --- a/crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs +++ b/crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs @@ -7,7 +7,7 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs b/crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs index 829bf5cf..a40da725 100644 --- a/crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs +++ b/crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3room_keyskeysroomidsessionid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/backup/get_latest_backup_info.rs b/crates/ruma-client-api/src/backup/get_latest_backup_info.rs index 0ae49b34..e91c8769 100644 --- a/crates/ruma-client-api/src/backup/get_latest_backup_info.rs +++ b/crates/ruma-client-api/src/backup/get_latest_backup_info.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3room_keysversion use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_serde::Raw; use serde::{ser, Deserialize, Deserializer, Serialize}; use serde_json::value::to_raw_value as to_raw_json_value; diff --git a/crates/ruma-client-api/src/backup/update_backup_version.rs b/crates/ruma-client-api/src/backup/update_backup_version.rs index d2d751fb..a67da665 100644 --- a/crates/ruma-client-api/src/backup/update_backup_version.rs +++ b/crates/ruma-client-api/src/backup/update_backup_version.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3room_keysversionversion - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_serde::Raw; use crate::backup::BackupAlgorithm; diff --git a/crates/ruma-client-api/src/capabilities/get_capabilities.rs b/crates/ruma-client-api/src/capabilities/get_capabilities.rs index 2d17a0d7..73957c11 100644 --- a/crates/ruma-client-api/src/capabilities/get_capabilities.rs +++ b/crates/ruma-client-api/src/capabilities/get_capabilities.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3capabilities - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::capabilities::Capabilities; diff --git a/crates/ruma-client-api/src/config/get_global_account_data.rs b/crates/ruma-client-api/src/config/get_global_account_data.rs index 1725e405..db07a315 100644 --- a/crates/ruma-client-api/src/config/get_global_account_data.rs +++ b/crates/ruma-client-api/src/config/get_global_account_data.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridaccount_datatype - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::AnyGlobalAccountDataEventContent; use ruma_identifiers::UserId; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/config/get_room_account_data.rs b/crates/ruma-client-api/src/config/get_room_account_data.rs index 451b156e..fbc1caf2 100644 --- a/crates/ruma-client-api/src/config/get_room_account_data.rs +++ b/crates/ruma-client-api/src/config/get_room_account_data.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridroomsroomidaccount_datatype - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::AnyRoomAccountDataEventContent; use ruma_identifiers::{RoomId, UserId}; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/config/set_global_account_data.rs b/crates/ruma-client-api/src/config/set_global_account_data.rs index 3dc2c995..f4586c46 100644 --- a/crates/ruma-client-api/src/config/set_global_account_data.rs +++ b/crates/ruma-client-api/src/config/set_global_account_data.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3useruseridaccount_datatype - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{AnyGlobalAccountDataEventContent, GlobalAccountDataEventContent}; use ruma_identifiers::UserId; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/config/set_room_account_data.rs b/crates/ruma-client-api/src/config/set_room_account_data.rs index f2a897d2..78d6461e 100644 --- a/crates/ruma-client-api/src/config/set_room_account_data.rs +++ b/crates/ruma-client-api/src/config/set_room_account_data.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3useruseridroomsroomidaccount_datatype - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{AnyRoomAccountDataEventContent, RoomAccountDataEventContent}; use ruma_identifiers::{RoomId, UserId}; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/context/get_context.rs b/crates/ruma-client-api/src/context/get_context.rs index 163504e9..62175b96 100644 --- a/crates/ruma-client-api/src/context/get_context.rs +++ b/crates/ruma-client-api/src/context/get_context.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidcontexteventid use js_int::{uint, UInt}; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{AnyRoomEvent, AnyStateEvent}; use ruma_identifiers::{EventId, RoomId}; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/device/delete_device.rs b/crates/ruma-client-api/src/device/delete_device.rs index b1554749..1869271e 100644 --- a/crates/ruma-client-api/src/device/delete_device.rs +++ b/crates/ruma-client-api/src/device/delete_device.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3devicesdeviceid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::DeviceId; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/device/delete_devices.rs b/crates/ruma-client-api/src/device/delete_devices.rs index a03bbf08..a7003b09 100644 --- a/crates/ruma-client-api/src/device/delete_devices.rs +++ b/crates/ruma-client-api/src/device/delete_devices.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3delete_devices - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::DeviceId; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/device/get_device.rs b/crates/ruma-client-api/src/device/get_device.rs index 256cfa7c..4443f57a 100644 --- a/crates/ruma-client-api/src/device/get_device.rs +++ b/crates/ruma-client-api/src/device/get_device.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3devicesdeviceid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::DeviceId; use crate::device::Device; diff --git a/crates/ruma-client-api/src/device/get_devices.rs b/crates/ruma-client-api/src/device/get_devices.rs index 49a642ea..743d5140 100644 --- a/crates/ruma-client-api/src/device/get_devices.rs +++ b/crates/ruma-client-api/src/device/get_devices.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3devices - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::device::Device; diff --git a/crates/ruma-client-api/src/device/update_device.rs b/crates/ruma-client-api/src/device/update_device.rs index a476b622..8b79020b 100644 --- a/crates/ruma-client-api/src/device/update_device.rs +++ b/crates/ruma-client-api/src/device/update_device.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3devicesdeviceid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::DeviceId; ruma_api! { diff --git a/crates/ruma-client-api/src/directory/get_public_rooms.rs b/crates/ruma-client-api/src/directory/get_public_rooms.rs index 87359206..9b194f3c 100644 --- a/crates/ruma-client-api/src/directory/get_public_rooms.rs +++ b/crates/ruma-client-api/src/directory/get_public_rooms.rs @@ -6,8 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3publicrooms use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::directory::PublicRoomsChunk; + use ruma_common::{api::ruma_api, directory::PublicRoomsChunk}; use ruma_identifiers::ServerName; ruma_api! { @@ -83,7 +82,7 @@ pub mod v3 { #[cfg(feature = "client")] #[test] fn construct_request_from_refs() { - use ruma_api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}; + use ruma_common::api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}; use ruma_identifiers::server_name; let req = super::Request { @@ -110,7 +109,7 @@ pub mod v3 { #[cfg(feature = "server")] #[test] fn construct_response_from_refs() { - use ruma_api::OutgoingResponse as _; + use ruma_common::api::OutgoingResponse as _; let res = super::Response { chunk: vec![], diff --git a/crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs b/crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs index abf21310..14c83197 100644 --- a/crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs +++ b/crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs @@ -6,9 +6,9 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3publicrooms use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::directory::{ - Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork, + use ruma_common::{ + api::ruma_api, + directory::{Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork}, }; use ruma_identifiers::ServerName; diff --git a/crates/ruma-client-api/src/directory/get_room_visibility.rs b/crates/ruma-client-api/src/directory/get_room_visibility.rs index 6526d26b..6819d990 100644 --- a/crates/ruma-client-api/src/directory/get_room_visibility.rs +++ b/crates/ruma-client-api/src/directory/get_room_visibility.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3directorylistroomroomid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use crate::room::Visibility; diff --git a/crates/ruma-client-api/src/directory/set_room_visibility.rs b/crates/ruma-client-api/src/directory/set_room_visibility.rs index a806d877..bb119062 100644 --- a/crates/ruma-client-api/src/directory/set_room_visibility.rs +++ b/crates/ruma-client-api/src/directory/set_room_visibility.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3directorylistroomroomid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use crate::room::Visibility; diff --git a/crates/ruma-client-api/src/discover/discover_homeserver.rs b/crates/ruma-client-api/src/discover/discover_homeserver.rs index fbc7c9d7..d639719e 100644 --- a/crates/ruma-client-api/src/discover/discover_homeserver.rs +++ b/crates/ruma-client-api/src/discover/discover_homeserver.rs @@ -2,7 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#getwell-knownmatrixclient -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use serde::{Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-client-api/src/discover/get_supported_versions.rs b/crates/ruma-client-api/src/discover/get_supported_versions.rs index 13b19de4..10103420 100644 --- a/crates/ruma-client-api/src/discover/get_supported_versions.rs +++ b/crates/ruma-client-api/src/discover/get_supported_versions.rs @@ -4,7 +4,7 @@ use std::collections::BTreeMap; -use ruma_api::{ruma_api, MatrixVersion}; +use ruma_common::api::{ruma_api, MatrixVersion}; ruma_api! { metadata: { @@ -69,7 +69,7 @@ impl Response { #[cfg(test)] mod tests { - use ruma_api::MatrixVersion; + use ruma_common::api::MatrixVersion; use super::Response; diff --git a/crates/ruma-client-api/src/error.rs b/crates/ruma-client-api/src/error.rs index 91de32e7..23f1f4d9 100644 --- a/crates/ruma-client-api/src/error.rs +++ b/crates/ruma-client-api/src/error.rs @@ -3,7 +3,7 @@ use std::{collections::BTreeMap, fmt, time::Duration}; use bytes::BufMut; -use ruma_api::{ +use ruma_common::api::{ error::{DeserializationError, IntoHttpError}, EndpointError, OutgoingResponse, }; diff --git a/crates/ruma-client-api/src/filter/create_filter.rs b/crates/ruma-client-api/src/filter/create_filter.rs index 297e665f..d29946c8 100644 --- a/crates/ruma-client-api/src/filter/create_filter.rs +++ b/crates/ruma-client-api/src/filter/create_filter.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3useruseridfilter - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; use crate::filter::{FilterDefinition, IncomingFilterDefinition}; @@ -63,7 +63,7 @@ pub mod v3 { #[cfg(feature = "server")] #[test] fn deserialize_request() { - use ruma_api::IncomingRequest as _; + use ruma_common::api::IncomingRequest as _; use super::IncomingRequest; @@ -84,7 +84,7 @@ pub mod v3 { #[cfg(feature = "client")] #[test] fn serialize_request() { - use ruma_api::{MatrixVersion, OutgoingRequest, SendAccessToken}; + use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken}; use ruma_identifiers::user_id; use crate::filter::FilterDefinition; diff --git a/crates/ruma-client-api/src/filter/get_filter.rs b/crates/ruma-client-api/src/filter/get_filter.rs index ac164a11..ab24a2b4 100644 --- a/crates/ruma-client-api/src/filter/get_filter.rs +++ b/crates/ruma-client-api/src/filter/get_filter.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridfilterfilterid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; use crate::filter::IncomingFilterDefinition; @@ -62,7 +62,7 @@ pub mod v3 { #[cfg(feature = "client")] #[test] fn deserialize_response() { - use ruma_api::IncomingResponse; + use ruma_common::api::IncomingResponse; assert_matches!( super::Response::try_from_http_response( @@ -75,7 +75,7 @@ pub mod v3 { #[cfg(feature = "server")] #[test] fn serialize_response() { - use ruma_api::OutgoingResponse; + use ruma_common::api::OutgoingResponse; use crate::filter::IncomingFilterDefinition; diff --git a/crates/ruma-client-api/src/keys/claim_keys.rs b/crates/ruma-client-api/src/keys/claim_keys.rs index 180d9cb9..2787d1b8 100644 --- a/crates/ruma-client-api/src/keys/claim_keys.rs +++ b/crates/ruma-client-api/src/keys/claim_keys.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::{collections::BTreeMap, time::Duration}; - use ruma_api::ruma_api; - use ruma_common::encryption::OneTimeKey; + use ruma_common::{api::ruma_api, encryption::OneTimeKey}; use ruma_identifiers::{DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId}; use ruma_serde::Raw; use serde_json::Value as JsonValue; diff --git a/crates/ruma-client-api/src/keys/get_key_changes.rs b/crates/ruma-client-api/src/keys/get_key_changes.rs index 7be445c1..f2c3f02d 100644 --- a/crates/ruma-client-api/src/keys/get_key_changes.rs +++ b/crates/ruma-client-api/src/keys/get_key_changes.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3keyschanges - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-client-api/src/keys/get_keys.rs b/crates/ruma-client-api/src/keys/get_keys.rs index bda7f89a..884cecf4 100644 --- a/crates/ruma-client-api/src/keys/get_keys.rs +++ b/crates/ruma-client-api/src/keys/get_keys.rs @@ -7,8 +7,10 @@ pub mod v3 { use std::{collections::BTreeMap, time::Duration}; - use ruma_api::ruma_api; - use ruma_common::encryption::{CrossSigningKey, DeviceKeys}; + use ruma_common::{ + api::ruma_api, + encryption::{CrossSigningKey, DeviceKeys}, + }; use ruma_identifiers::{DeviceId, UserId}; use ruma_serde::Raw; use serde_json::Value as JsonValue; diff --git a/crates/ruma-client-api/src/keys/upload_keys.rs b/crates/ruma-client-api/src/keys/upload_keys.rs index 0416cdde..31169ad5 100644 --- a/crates/ruma-client-api/src/keys/upload_keys.rs +++ b/crates/ruma-client-api/src/keys/upload_keys.rs @@ -8,8 +8,10 @@ pub mod v3 { use std::collections::BTreeMap; use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::encryption::{DeviceKeys, OneTimeKey}; + use ruma_common::{ + api::ruma_api, + encryption::{DeviceKeys, OneTimeKey}, + }; use ruma_identifiers::{DeviceKeyAlgorithm, DeviceKeyId}; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/keys/upload_signatures.rs b/crates/ruma-client-api/src/keys/upload_signatures.rs index cdf1032a..ac2ea66f 100644 --- a/crates/ruma-client-api/src/keys/upload_signatures.rs +++ b/crates/ruma-client-api/src/keys/upload_signatures.rs @@ -7,8 +7,10 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::encryption::{CrossSigningKey, DeviceKeys}; + use ruma_common::{ + api::ruma_api, + encryption::{CrossSigningKey, DeviceKeys}, + }; use ruma_identifiers::{DeviceId, UserId}; use ruma_serde::{Raw, StringEnum}; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-client-api/src/keys/upload_signing_keys.rs b/crates/ruma-client-api/src/keys/upload_signing_keys.rs index 866d4109..81fb4e7a 100644 --- a/crates/ruma-client-api/src/keys/upload_signing_keys.rs +++ b/crates/ruma-client-api/src/keys/upload_signing_keys.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3keysdevice_signingupload - use ruma_api::ruma_api; - use ruma_common::encryption::CrossSigningKey; + use ruma_common::{api::ruma_api, encryption::CrossSigningKey}; use ruma_serde::Raw; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/knock/knock_room.rs b/crates/ruma-client-api/src/knock/knock_room.rs index ed0f7c67..35d17052 100644 --- a/crates/ruma-client-api/src/knock/knock_room.rs +++ b/crates/ruma-client-api/src/knock/knock_room.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3knockroomidoralias - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, RoomOrAliasId, ServerName}; ruma_api! { diff --git a/crates/ruma-client-api/src/media/create_content.rs b/crates/ruma-client-api/src/media/create_content.rs index 33454322..7c631b56 100644 --- a/crates/ruma-client-api/src/media/create_content.rs +++ b/crates/ruma-client-api/src/media/create_content.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixmediav3upload - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::MxcUri; ruma_api! { diff --git a/crates/ruma-client-api/src/media/get_content.rs b/crates/ruma-client-api/src/media/get_content.rs index 34bdf7ed..517f1556 100644 --- a/crates/ruma-client-api/src/media/get_content.rs +++ b/crates/ruma-client-api/src/media/get_content.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3downloadservernamemediaid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{Error, MxcUri, ServerName}; ruma_api! { diff --git a/crates/ruma-client-api/src/media/get_content_as_filename.rs b/crates/ruma-client-api/src/media/get_content_as_filename.rs index 1afd5dd4..c4aa0e0d 100644 --- a/crates/ruma-client-api/src/media/get_content_as_filename.rs +++ b/crates/ruma-client-api/src/media/get_content_as_filename.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3downloadservernamemediaidfilename - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{Error, MxcUri, ServerName}; ruma_api! { diff --git a/crates/ruma-client-api/src/media/get_content_thumbnail.rs b/crates/ruma-client-api/src/media/get_content_thumbnail.rs index e5aed252..00c430d6 100644 --- a/crates/ruma-client-api/src/media/get_content_thumbnail.rs +++ b/crates/ruma-client-api/src/media/get_content_thumbnail.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3thumbnailservernamemediaid use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{Error, MxcUri, ServerName}; use ruma_serde::StringEnum; diff --git a/crates/ruma-client-api/src/media/get_media_config.rs b/crates/ruma-client-api/src/media/get_media_config.rs index a2a6aa68..aed4a1e7 100644 --- a/crates/ruma-client-api/src/media/get_media_config.rs +++ b/crates/ruma-client-api/src/media/get_media_config.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3config use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/media/get_media_preview.rs b/crates/ruma-client-api/src/media/get_media_preview.rs index 2f04527f..0b065ca3 100644 --- a/crates/ruma-client-api/src/media/get_media_preview.rs +++ b/crates/ruma-client-api/src/media/get_media_preview.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3preview_url - use ruma_api::ruma_api; - use ruma_common::MilliSecondsSinceUnixEpoch; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use serde::Serialize; use serde_json::value::{to_raw_value as to_raw_json_value, RawValue as RawJsonValue}; diff --git a/crates/ruma-client-api/src/membership/ban_user.rs b/crates/ruma-client-api/src/membership/ban_user.rs index f751bda1..7e84fe2f 100644 --- a/crates/ruma-client-api/src/membership/ban_user.rs +++ b/crates/ruma-client-api/src/membership/ban_user.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidban - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, UserId}; ruma_api! { diff --git a/crates/ruma-client-api/src/membership/forget_room.rs b/crates/ruma-client-api/src/membership/forget_room.rs index db88e137..2f989cf6 100644 --- a/crates/ruma-client-api/src/membership/forget_room.rs +++ b/crates/ruma-client-api/src/membership/forget_room.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidforget - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; ruma_api! { diff --git a/crates/ruma-client-api/src/membership/get_member_events.rs b/crates/ruma-client-api/src/membership/get_member_events.rs index cc1ef99e..5a2a3461 100644 --- a/crates/ruma-client-api/src/membership/get_member_events.rs +++ b/crates/ruma-client-api/src/membership/get_member_events.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidmembers - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::room::member::RoomMemberEvent; use ruma_identifiers::RoomId; use ruma_serde::{Raw, StringEnum}; @@ -110,7 +110,7 @@ pub mod v3 { #[cfg(all(test, feature = "server"))] mod tests { use matches::assert_matches; - use ruma_api::IncomingRequest as _; + use ruma_common::api::IncomingRequest as _; use super::{IncomingRequest, MembershipEventFilter}; diff --git a/crates/ruma-client-api/src/membership/invite_user.rs b/crates/ruma-client-api/src/membership/invite_user.rs index e0d6dacd..a1ad39fc 100644 --- a/crates/ruma-client-api/src/membership/invite_user.rs +++ b/crates/ruma-client-api/src/membership/invite_user.rs @@ -10,7 +10,7 @@ pub mod v3 { //! [spec-mxid]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidinvite //! [spec-3pid]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidinvite-1 - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, UserId}; use ruma_serde::Outgoing; use serde::Serialize; diff --git a/crates/ruma-client-api/src/membership/join_room_by_id.rs b/crates/ruma-client-api/src/membership/join_room_by_id.rs index 6a0b7fec..15904477 100644 --- a/crates/ruma-client-api/src/membership/join_room_by_id.rs +++ b/crates/ruma-client-api/src/membership/join_room_by_id.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidjoin - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use crate::membership::{IncomingThirdPartySigned, ThirdPartySigned}; diff --git a/crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs b/crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs index 810d86ac..2dc63eea 100644 --- a/crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs +++ b/crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3joinroomidoralias - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, RoomOrAliasId, ServerName}; use crate::membership::{IncomingThirdPartySigned, ThirdPartySigned}; diff --git a/crates/ruma-client-api/src/membership/joined_members.rs b/crates/ruma-client-api/src/membership/joined_members.rs index 365d199a..e83e2b51 100644 --- a/crates/ruma-client-api/src/membership/joined_members.rs +++ b/crates/ruma-client-api/src/membership/joined_members.rs @@ -7,7 +7,7 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{MxcUri, RoomId, UserId}; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-client-api/src/membership/joined_rooms.rs b/crates/ruma-client-api/src/membership/joined_rooms.rs index bc0556c1..63635919 100644 --- a/crates/ruma-client-api/src/membership/joined_rooms.rs +++ b/crates/ruma-client-api/src/membership/joined_rooms.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3joined_rooms - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; ruma_api! { diff --git a/crates/ruma-client-api/src/membership/kick_user.rs b/crates/ruma-client-api/src/membership/kick_user.rs index 915a7050..1c190584 100644 --- a/crates/ruma-client-api/src/membership/kick_user.rs +++ b/crates/ruma-client-api/src/membership/kick_user.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidkick - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, UserId}; ruma_api! { diff --git a/crates/ruma-client-api/src/membership/leave_room.rs b/crates/ruma-client-api/src/membership/leave_room.rs index 0062587e..8d65e80e 100644 --- a/crates/ruma-client-api/src/membership/leave_room.rs +++ b/crates/ruma-client-api/src/membership/leave_room.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidleave - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; ruma_api! { diff --git a/crates/ruma-client-api/src/membership/unban_user.rs b/crates/ruma-client-api/src/membership/unban_user.rs index 32a57fa9..f98da91b 100644 --- a/crates/ruma-client-api/src/membership/unban_user.rs +++ b/crates/ruma-client-api/src/membership/unban_user.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidunban - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, UserId}; ruma_api! { diff --git a/crates/ruma-client-api/src/message/get_message_events.rs b/crates/ruma-client-api/src/message/get_message_events.rs index 395e271b..90d2a1f7 100644 --- a/crates/ruma-client-api/src/message/get_message_events.rs +++ b/crates/ruma-client-api/src/message/get_message_events.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidmessages use js_int::{uint, UInt}; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{AnyRoomEvent, AnyStateEvent}; use ruma_identifiers::RoomId; use ruma_serde::Raw; @@ -150,7 +150,7 @@ pub mod v3 { #[cfg(all(test, feature = "client"))] mod tests { use js_int::uint; - use ruma_api::{MatrixVersion, OutgoingRequest, SendAccessToken}; + use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken}; use ruma_identifiers::room_id; use super::{Direction, Request}; diff --git a/crates/ruma-client-api/src/message/send_message_event.rs b/crates/ruma-client-api/src/message/send_message_event.rs index a1bdecb9..9b548a8d 100644 --- a/crates/ruma-client-api/src/message/send_message_event.rs +++ b/crates/ruma-client-api/src/message/send_message_event.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3roomsroomidsendeventtypetxnid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{AnyMessageLikeEventContent, MessageLikeEventContent}; use ruma_identifiers::{EventId, RoomId, TransactionId}; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/presence/get_presence.rs b/crates/ruma-client-api/src/presence/get_presence.rs index 6825a92a..3dbc7345 100644 --- a/crates/ruma-client-api/src/presence/get_presence.rs +++ b/crates/ruma-client-api/src/presence/get_presence.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::time::Duration; - use ruma_api::ruma_api; - use ruma_common::presence::PresenceState; + use ruma_common::{api::ruma_api, presence::PresenceState}; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-client-api/src/presence/set_presence.rs b/crates/ruma-client-api/src/presence/set_presence.rs index d00fa3e3..ea529273 100644 --- a/crates/ruma-client-api/src/presence/set_presence.rs +++ b/crates/ruma-client-api/src/presence/set_presence.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3presenceuseridstatus - use ruma_api::ruma_api; - use ruma_common::presence::PresenceState; + use ruma_common::{api::ruma_api, presence::PresenceState}; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-client-api/src/profile/get_avatar_url.rs b/crates/ruma-client-api/src/profile/get_avatar_url.rs index 0c59de84..30455af0 100644 --- a/crates/ruma-client-api/src/profile/get_avatar_url.rs +++ b/crates/ruma-client-api/src/profile/get_avatar_url.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuseridavatar_url - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{MxcUri, UserId}; ruma_api! { diff --git a/crates/ruma-client-api/src/profile/get_display_name.rs b/crates/ruma-client-api/src/profile/get_display_name.rs index 0377e3e8..349c49fd 100644 --- a/crates/ruma-client-api/src/profile/get_display_name.rs +++ b/crates/ruma-client-api/src/profile/get_display_name.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuseriddisplayname - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-client-api/src/profile/get_profile.rs b/crates/ruma-client-api/src/profile/get_profile.rs index 984bd5c0..c122d439 100644 --- a/crates/ruma-client-api/src/profile/get_profile.rs +++ b/crates/ruma-client-api/src/profile/get_profile.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuserid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{MxcUri, UserId}; ruma_api! { diff --git a/crates/ruma-client-api/src/profile/set_avatar_url.rs b/crates/ruma-client-api/src/profile/set_avatar_url.rs index 3ff0107a..2aa34874 100644 --- a/crates/ruma-client-api/src/profile/set_avatar_url.rs +++ b/crates/ruma-client-api/src/profile/set_avatar_url.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3profileuseridavatar_url - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{MxcUri, UserId}; ruma_api! { @@ -82,7 +82,7 @@ pub mod v3 { #[cfg(all(test, feature = "server"))] mod tests { use matches::assert_matches; - use ruma_api::IncomingRequest as _; + use ruma_common::api::IncomingRequest as _; use super::IncomingRequest; diff --git a/crates/ruma-client-api/src/profile/set_display_name.rs b/crates/ruma-client-api/src/profile/set_display_name.rs index 4646b6ad..a6622e59 100644 --- a/crates/ruma-client-api/src/profile/set_display_name.rs +++ b/crates/ruma-client-api/src/profile/set_display_name.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3profileuseriddisplayname - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-client-api/src/push/delete_pushrule.rs b/crates/ruma-client-api/src/push/delete_pushrule.rs index 23b6f9d5..bc7349d1 100644 --- a/crates/ruma-client-api/src/push/delete_pushrule.rs +++ b/crates/ruma-client-api/src/push/delete_pushrule.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3pushrulesscopekindruleid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::push::RuleKind; diff --git a/crates/ruma-client-api/src/push/get_notifications.rs b/crates/ruma-client-api/src/push/get_notifications.rs index 5224472b..64725671 100644 --- a/crates/ruma-client-api/src/push/get_notifications.rs +++ b/crates/ruma-client-api/src/push/get_notifications.rs @@ -6,8 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3notifications use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::{push::Action, MilliSecondsSinceUnixEpoch}; + use ruma_common::{api::ruma_api, push::Action, MilliSecondsSinceUnixEpoch}; use ruma_events::AnySyncRoomEvent; use ruma_identifiers::RoomId; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/push/get_pushers.rs b/crates/ruma-client-api/src/push/get_pushers.rs index c6d371a4..91725e77 100644 --- a/crates/ruma-client-api/src/push/get_pushers.rs +++ b/crates/ruma-client-api/src/push/get_pushers.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3pushers - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use serde::{Deserialize, Serialize}; use crate::push::{PusherData, PusherKind}; diff --git a/crates/ruma-client-api/src/push/get_pushrule.rs b/crates/ruma-client-api/src/push/get_pushrule.rs index 5b85d28b..f57d5363 100644 --- a/crates/ruma-client-api/src/push/get_pushrule.rs +++ b/crates/ruma-client-api/src/push/get_pushrule.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3pushrulesscopekindruleid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::push::{PushRule, RuleKind}; diff --git a/crates/ruma-client-api/src/push/get_pushrule_actions.rs b/crates/ruma-client-api/src/push/get_pushrule_actions.rs index 937b7ba4..312e774f 100644 --- a/crates/ruma-client-api/src/push/get_pushrule_actions.rs +++ b/crates/ruma-client-api/src/push/get_pushrule_actions.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3pushrulesscopekindruleidactions - use ruma_api::ruma_api; - use ruma_common::push::Action; + use ruma_common::{api::ruma_api, push::Action}; use crate::push::RuleKind; diff --git a/crates/ruma-client-api/src/push/get_pushrule_enabled.rs b/crates/ruma-client-api/src/push/get_pushrule_enabled.rs index 53007e05..3844f588 100644 --- a/crates/ruma-client-api/src/push/get_pushrule_enabled.rs +++ b/crates/ruma-client-api/src/push/get_pushrule_enabled.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3pushrulesscopekindruleidenabled - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::push::RuleKind; diff --git a/crates/ruma-client-api/src/push/get_pushrules_all.rs b/crates/ruma-client-api/src/push/get_pushrules_all.rs index 25322e65..ff9e8f16 100644 --- a/crates/ruma-client-api/src/push/get_pushrules_all.rs +++ b/crates/ruma-client-api/src/push/get_pushrules_all.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3pushrules - use ruma_api::ruma_api; - use ruma_common::push::Ruleset; + use ruma_common::{api::ruma_api, push::Ruleset}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/push/get_pushrules_global_scope.rs b/crates/ruma-client-api/src/push/get_pushrules_global_scope.rs index 0d9d8ea8..054f6fa8 100644 --- a/crates/ruma-client-api/src/push/get_pushrules_global_scope.rs +++ b/crates/ruma-client-api/src/push/get_pushrules_global_scope.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3pushrules - use ruma_api::ruma_api; - use ruma_common::push::Ruleset; + use ruma_common::{api::ruma_api, push::Ruleset}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/push/set_pusher.rs b/crates/ruma-client-api/src/push/set_pusher.rs index faf26f6c..5d80e768 100644 --- a/crates/ruma-client-api/src/push/set_pusher.rs +++ b/crates/ruma-client-api/src/push/set_pusher.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3pushersset - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use serde::{Deserialize, Serialize}; use crate::push::{PusherData, PusherKind}; diff --git a/crates/ruma-client-api/src/push/set_pushrule.rs b/crates/ruma-client-api/src/push/set_pushrule.rs index 02324f45..2b9f25d1 100644 --- a/crates/ruma-client-api/src/push/set_pushrule.rs +++ b/crates/ruma-client-api/src/push/set_pushrule.rs @@ -5,8 +5,10 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3pushrulesscopekindruleid - use ruma_api::ruma_api; - use ruma_common::push::{Action, PushCondition}; + use ruma_common::{ + api::ruma_api, + push::{Action, PushCondition}, + }; use crate::push::RuleKind; diff --git a/crates/ruma-client-api/src/push/set_pushrule_actions.rs b/crates/ruma-client-api/src/push/set_pushrule_actions.rs index 7963099e..74df8bcd 100644 --- a/crates/ruma-client-api/src/push/set_pushrule_actions.rs +++ b/crates/ruma-client-api/src/push/set_pushrule_actions.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3pushrulesscopekindruleidactions - use ruma_api::ruma_api; - use ruma_common::push::Action; + use ruma_common::{api::ruma_api, push::Action}; use crate::push::RuleKind; diff --git a/crates/ruma-client-api/src/push/set_pushrule_enabled.rs b/crates/ruma-client-api/src/push/set_pushrule_enabled.rs index 31d7a334..0e503168 100644 --- a/crates/ruma-client-api/src/push/set_pushrule_enabled.rs +++ b/crates/ruma-client-api/src/push/set_pushrule_enabled.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3pushrulesscopekindruleidenabled - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::push::RuleKind; diff --git a/crates/ruma-client-api/src/read_marker/set_read_marker.rs b/crates/ruma-client-api/src/read_marker/set_read_marker.rs index dfdaadae..97939327 100644 --- a/crates/ruma-client-api/src/read_marker/set_read_marker.rs +++ b/crates/ruma-client-api/src/read_marker/set_read_marker.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidread_markers - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; ruma_api! { diff --git a/crates/ruma-client-api/src/receipt/create_receipt.rs b/crates/ruma-client-api/src/receipt/create_receipt.rs index ac6b6cd0..10d42c4a 100644 --- a/crates/ruma-client-api/src/receipt/create_receipt.rs +++ b/crates/ruma-client-api/src/receipt/create_receipt.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidreceiptreceipttypeeventid - use ruma_api::ruma_api; - use ruma_common::receipt::ReceiptType; + use ruma_common::{api::ruma_api, receipt::ReceiptType}; use ruma_identifiers::{EventId, RoomId}; ruma_api! { diff --git a/crates/ruma-client-api/src/redact/redact_event.rs b/crates/ruma-client-api/src/redact/redact_event.rs index 513fa8b8..ea54071c 100644 --- a/crates/ruma-client-api/src/redact/redact_event.rs +++ b/crates/ruma-client-api/src/redact/redact_event.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3roomsroomidredacteventidtxnid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId, TransactionId}; ruma_api! { diff --git a/crates/ruma-client-api/src/room/aliases.rs b/crates/ruma-client-api/src/room/aliases.rs index f214dc96..f3234dc9 100644 --- a/crates/ruma-client-api/src/room/aliases.rs +++ b/crates/ruma-client-api/src/room/aliases.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidaliases - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomAliasId, RoomId}; ruma_api! { diff --git a/crates/ruma-client-api/src/room/create_room.rs b/crates/ruma-client-api/src/room/create_room.rs index 0b2e69a9..11a66703 100644 --- a/crates/ruma-client-api/src/room/create_room.rs +++ b/crates/ruma-client-api/src/room/create_room.rs @@ -6,8 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3createroom use assign::assign; - use ruma_api::ruma_api; - use ruma_common::room::RoomType; + use ruma_common::{api::ruma_api, room::RoomType}; use ruma_events::{ room::{ create::{PreviousRoom, RoomCreateEventContent}, diff --git a/crates/ruma-client-api/src/room/get_room_event.rs b/crates/ruma-client-api/src/room/get_room_event.rs index f01c80f3..020ff131 100644 --- a/crates/ruma-client-api/src/room/get_room_event.rs +++ b/crates/ruma-client-api/src/room/get_room_event.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomideventeventid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::AnyRoomEvent; use ruma_identifiers::{EventId, RoomId}; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/room/report_content.rs b/crates/ruma-client-api/src/room/report_content.rs index 320d79c3..8e6dc85c 100644 --- a/crates/ruma-client-api/src/room/report_content.rs +++ b/crates/ruma-client-api/src/room/report_content.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidreporteventid use js_int::Int; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; ruma_api! { diff --git a/crates/ruma-client-api/src/room/upgrade_room.rs b/crates/ruma-client-api/src/room/upgrade_room.rs index d03b72a9..c040cea3 100644 --- a/crates/ruma-client-api/src/room/upgrade_room.rs +++ b/crates/ruma-client-api/src/room/upgrade_room.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidupgrade - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, RoomVersionId}; ruma_api! { diff --git a/crates/ruma-client-api/src/search/search_events.rs b/crates/ruma-client-api/src/search/search_events.rs index e3e841c5..67911e3d 100644 --- a/crates/ruma-client-api/src/search/search_events.rs +++ b/crates/ruma-client-api/src/search/search_events.rs @@ -8,7 +8,7 @@ pub mod v3 { use std::collections::BTreeMap; use js_int::{uint, UInt}; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{AnyRoomEvent, AnyStateEvent}; use ruma_identifiers::{EventId, MxcUri, RoomId, UserId}; use ruma_serde::{Outgoing, Raw, StringEnum}; diff --git a/crates/ruma-client-api/src/server/get_user_info.rs b/crates/ruma-client-api/src/server/get_user_info.rs index c17fb0fb..dcb6f329 100644 --- a/crates/ruma-client-api/src/server/get_user_info.rs +++ b/crates/ruma-client-api/src/server/get_user_info.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::MilliSecondsSinceUnixEpoch; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use ruma_identifiers::UserId; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-client-api/src/session/get_login_types.rs b/crates/ruma-client-api/src/session/get_login_types.rs index 96f473f6..d96439e5 100644 --- a/crates/ruma-client-api/src/session/get_login_types.rs +++ b/crates/ruma-client-api/src/session/get_login_types.rs @@ -7,7 +7,7 @@ pub mod v3 { use std::borrow::Cow; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::MxcUri; use ruma_serde::{JsonObject, StringEnum}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; diff --git a/crates/ruma-client-api/src/session/login.rs b/crates/ruma-client-api/src/session/login.rs index 18ca71ae..3c7e4ea9 100644 --- a/crates/ruma-client-api/src/session/login.rs +++ b/crates/ruma-client-api/src/session/login.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3login - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{DeviceId, ServerName, UserId}; use ruma_serde::{JsonObject, Outgoing}; use serde::{ @@ -358,8 +358,10 @@ pub mod v3 { #[test] #[cfg(feature = "client")] fn serialize_login_request_body() { - use ruma_api::{MatrixVersion, OutgoingRequest, SendAccessToken}; - use ruma_common::thirdparty::Medium; + use ruma_common::{ + api::{MatrixVersion, OutgoingRequest, SendAccessToken}, + thirdparty::Medium, + }; use serde_json::Value as JsonValue; use super::{LoginInfo, Password, Request, Token}; diff --git a/crates/ruma-client-api/src/session/login_fallback.rs b/crates/ruma-client-api/src/session/login_fallback.rs index 77d172a6..bbc45623 100644 --- a/crates/ruma-client-api/src/session/login_fallback.rs +++ b/crates/ruma-client-api/src/session/login_fallback.rs @@ -2,7 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#login-fallback -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use ruma_identifiers::DeviceId; ruma_api! { diff --git a/crates/ruma-client-api/src/session/logout.rs b/crates/ruma-client-api/src/session/logout.rs index df4c876b..43d1f87e 100644 --- a/crates/ruma-client-api/src/session/logout.rs +++ b/crates/ruma-client-api/src/session/logout.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3logout - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/session/logout_all.rs b/crates/ruma-client-api/src/session/logout_all.rs index 71d0e0fb..40858e44 100644 --- a/crates/ruma-client-api/src/session/logout_all.rs +++ b/crates/ruma-client-api/src/session/logout_all.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3logoutall - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/session/sso_login.rs b/crates/ruma-client-api/src/session/sso_login.rs index dd8395c9..905f1ac1 100644 --- a/crates/ruma-client-api/src/session/sso_login.rs +++ b/crates/ruma-client-api/src/session/sso_login.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3loginssoredirect - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { @@ -52,7 +52,7 @@ pub mod v3 { #[cfg(all(test, feature = "client"))] mod tests { - use ruma_api::{MatrixVersion, OutgoingRequest, SendAccessToken}; + use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken}; use super::Request; diff --git a/crates/ruma-client-api/src/session/sso_login_with_provider.rs b/crates/ruma-client-api/src/session/sso_login_with_provider.rs index fd2bfbcd..ce25c006 100644 --- a/crates/ruma-client-api/src/session/sso_login_with_provider.rs +++ b/crates/ruma-client-api/src/session/sso_login_with_provider.rs @@ -7,7 +7,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3loginssoredirectidpid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { @@ -58,7 +58,7 @@ pub mod v3 { #[cfg(all(test, feature = "client"))] mod tests { - use ruma_api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}; + use ruma_common::api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}; use super::Request; diff --git a/crates/ruma-client-api/src/space/get_hierarchy.rs b/crates/ruma-client-api/src/space/get_hierarchy.rs index cce491df..a4339e5e 100644 --- a/crates/ruma-client-api/src/space/get_hierarchy.rs +++ b/crates/ruma-client-api/src/space/get_hierarchy.rs @@ -6,7 +6,7 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv1roomsroomidhierarchy use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use crate::space::SpaceHierarchyRoomsChunk; diff --git a/crates/ruma-client-api/src/state/get_state_events.rs b/crates/ruma-client-api/src/state/get_state_events.rs index 2722c181..d16deb08 100644 --- a/crates/ruma-client-api/src/state/get_state_events.rs +++ b/crates/ruma-client-api/src/state/get_state_events.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidstate - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::AnyStateEvent; use ruma_identifiers::RoomId; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/state/get_state_events_for_key.rs b/crates/ruma-client-api/src/state/get_state_events_for_key.rs index baf70467..6cce72f9 100644 --- a/crates/ruma-client-api/src/state/get_state_events_for_key.rs +++ b/crates/ruma-client-api/src/state/get_state_events_for_key.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidstateeventtypestatekey - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{AnyStateEventContent, EventType}; use ruma_identifiers::RoomId; use ruma_serde::{Outgoing, Raw}; @@ -66,18 +66,18 @@ pub mod v3 { } #[cfg(feature = "client")] - impl<'a> ruma_api::OutgoingRequest for Request<'a> { + impl<'a> ruma_common::api::OutgoingRequest for Request<'a> { type EndpointError = crate::Error; type IncomingResponse = ::Incoming; - const METADATA: ruma_api::Metadata = METADATA; + const METADATA: ruma_common::api::Metadata = METADATA; fn try_into_http_request( self, base_url: &str, - access_token: ruma_api::SendAccessToken<'_>, - considering_versions: &'_ [ruma_api::MatrixVersion], - ) -> Result, ruma_api::error::IntoHttpError> { + access_token: ruma_common::api::SendAccessToken<'_>, + considering_versions: &'_ [ruma_common::api::MatrixVersion], + ) -> Result, ruma_common::api::error::IntoHttpError> { use std::borrow::Cow; use http::header; @@ -90,7 +90,7 @@ pub mod v3 { let mut url = format!( "{}{}", base_url.strip_suffix('/').unwrap_or(base_url), - ruma_api::select_path( + ruma_common::api::select_path( considering_versions, &METADATA, None, @@ -117,7 +117,7 @@ pub mod v3 { "Bearer {}", access_token .get_required_for_endpoint() - .ok_or(ruma_api::error::IntoHttpError::NeedsAuthentication)?, + .ok_or(ruma_common::api::error::IntoHttpError::NeedsAuthentication)?, ), ) .body(T::default()) @@ -126,16 +126,16 @@ pub mod v3 { } #[cfg(feature = "server")] - impl ruma_api::IncomingRequest for IncomingRequest { + impl ruma_common::api::IncomingRequest for IncomingRequest { type EndpointError = crate::Error; type OutgoingResponse = Response; - const METADATA: ruma_api::Metadata = METADATA; + const METADATA: ruma_common::api::Metadata = METADATA; fn try_from_http_request( _request: http::Request, path_args: &[S], - ) -> Result + ) -> Result where B: AsRef<[u8]>, S: AsRef, diff --git a/crates/ruma-client-api/src/state/send_state_event.rs b/crates/ruma-client-api/src/state/send_state_event.rs index 6bdc35db..dd7bdd16 100644 --- a/crates/ruma-client-api/src/state/send_state_event.rs +++ b/crates/ruma-client-api/src/state/send_state_event.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3roomsroomidstateeventtypestatekey - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{AnyStateEventContent, StateEventContent}; use ruma_identifiers::{EventId, RoomId}; use ruma_serde::{Outgoing, Raw}; @@ -91,18 +91,18 @@ pub mod v3 { } #[cfg(feature = "client")] - impl<'a> ruma_api::OutgoingRequest for Request<'a> { + impl<'a> ruma_common::api::OutgoingRequest for Request<'a> { type EndpointError = crate::Error; type IncomingResponse = Response; - const METADATA: ruma_api::Metadata = METADATA; + const METADATA: ruma_common::api::Metadata = METADATA; fn try_into_http_request( self, base_url: &str, - access_token: ruma_api::SendAccessToken<'_>, - considering_versions: &'_ [ruma_api::MatrixVersion], - ) -> Result, ruma_api::error::IntoHttpError> { + access_token: ruma_common::api::SendAccessToken<'_>, + considering_versions: &'_ [ruma_common::api::MatrixVersion], + ) -> Result, ruma_common::api::error::IntoHttpError> { use std::borrow::Cow; use http::header::{self, HeaderValue}; @@ -114,7 +114,7 @@ pub mod v3 { let mut url = format!( "{}{}", base_url.strip_suffix('/').unwrap_or(base_url), - ruma_api::select_path( + ruma_common::api::select_path( considering_versions, &METADATA, None, @@ -142,7 +142,7 @@ pub mod v3 { "Bearer {}", access_token .get_required_for_endpoint() - .ok_or(ruma_api::error::IntoHttpError::NeedsAuthentication)? + .ok_or(ruma_common::api::error::IntoHttpError::NeedsAuthentication)? ))?, ) .body(ruma_serde::json_to_buf(&self.body)?)?; @@ -152,16 +152,16 @@ pub mod v3 { } #[cfg(feature = "server")] - impl ruma_api::IncomingRequest for IncomingRequest { + impl ruma_common::api::IncomingRequest for IncomingRequest { type EndpointError = crate::Error; type OutgoingResponse = Response; - const METADATA: ruma_api::Metadata = METADATA; + const METADATA: ruma_common::api::Metadata = METADATA; fn try_from_http_request( request: http::Request, path_args: &[S], - ) -> Result + ) -> Result where B: AsRef<[u8]>, S: AsRef, diff --git a/crates/ruma-client-api/src/sync/sync_events.rs b/crates/ruma-client-api/src/sync/sync_events.rs index 04a59bc6..3d2a87d3 100644 --- a/crates/ruma-client-api/src/sync/sync_events.rs +++ b/crates/ruma-client-api/src/sync/sync_events.rs @@ -8,8 +8,7 @@ pub mod v3 { use std::{collections::BTreeMap, time::Duration}; use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::presence::PresenceState; + use ruma_common::{api::ruma_api, presence::PresenceState}; use ruma_events::{ presence::PresenceEvent, AnyGlobalAccountDataEvent, AnyRoomAccountDataEvent, AnyStrippedStateEvent, AnySyncEphemeralRoomEvent, AnySyncRoomEvent, AnySyncStateEvent, @@ -618,7 +617,7 @@ pub mod v3 { mod client_tests { use std::time::Duration; - use ruma_api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}; + use ruma_common::api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}; use super::{Filter, PresenceState, Request}; @@ -655,8 +654,7 @@ pub mod v3 { use std::time::Duration; use matches::assert_matches; - use ruma_api::IncomingRequest as _; - use ruma_common::presence::PresenceState; + use ruma_common::{api::IncomingRequest as _, presence::PresenceState}; use super::{IncomingFilter, IncomingRequest}; diff --git a/crates/ruma-client-api/src/tag/create_tag.rs b/crates/ruma-client-api/src/tag/create_tag.rs index 7455c8b8..9131c4a4 100644 --- a/crates/ruma-client-api/src/tag/create_tag.rs +++ b/crates/ruma-client-api/src/tag/create_tag.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3useruseridroomsroomidtagstag - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::tag::TagInfo; use ruma_identifiers::{RoomId, UserId}; diff --git a/crates/ruma-client-api/src/tag/delete_tag.rs b/crates/ruma-client-api/src/tag/delete_tag.rs index 80b95dfd..a8ab1a0b 100644 --- a/crates/ruma-client-api/src/tag/delete_tag.rs +++ b/crates/ruma-client-api/src/tag/delete_tag.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3useruseridroomsroomidtagstag - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, UserId}; ruma_api! { diff --git a/crates/ruma-client-api/src/tag/get_tags.rs b/crates/ruma-client-api/src/tag/get_tags.rs index 9c584f98..37ddcaa7 100644 --- a/crates/ruma-client-api/src/tag/get_tags.rs +++ b/crates/ruma-client-api/src/tag/get_tags.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridroomsroomidtags - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::tag::Tags; use ruma_identifiers::{RoomId, UserId}; @@ -56,7 +56,7 @@ pub mod v3 { #[cfg(all(test, feature = "server"))] mod server_tests { use assign::assign; - use ruma_api::OutgoingResponse; + use ruma_common::api::OutgoingResponse; use ruma_events::tag::{TagInfo, Tags}; use serde_json::json; diff --git a/crates/ruma-client-api/src/thirdparty/get_location_for_protocol.rs b/crates/ruma-client-api/src/thirdparty/get_location_for_protocol.rs index 31ebf632..0b550dfe 100644 --- a/crates/ruma-client-api/src/thirdparty/get_location_for_protocol.rs +++ b/crates/ruma-client-api/src/thirdparty/get_location_for_protocol.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::thirdparty::Location; + use ruma_common::{api::ruma_api, thirdparty::Location}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/thirdparty/get_location_for_room_alias.rs b/crates/ruma-client-api/src/thirdparty/get_location_for_room_alias.rs index c0deef80..0579adc4 100644 --- a/crates/ruma-client-api/src/thirdparty/get_location_for_room_alias.rs +++ b/crates/ruma-client-api/src/thirdparty/get_location_for_room_alias.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3thirdpartylocation - use ruma_api::ruma_api; - use ruma_common::thirdparty::Location; + use ruma_common::{api::ruma_api, thirdparty::Location}; use ruma_identifiers::RoomAliasId; ruma_api! { diff --git a/crates/ruma-client-api/src/thirdparty/get_protocol.rs b/crates/ruma-client-api/src/thirdparty/get_protocol.rs index 1438a2e8..f15926b8 100644 --- a/crates/ruma-client-api/src/thirdparty/get_protocol.rs +++ b/crates/ruma-client-api/src/thirdparty/get_protocol.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3thirdpartyprotocolprotocol - use ruma_api::ruma_api; - use ruma_common::thirdparty::Protocol; + use ruma_common::{api::ruma_api, thirdparty::Protocol}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/thirdparty/get_protocols.rs b/crates/ruma-client-api/src/thirdparty/get_protocols.rs index eecced9b..48fd7163 100644 --- a/crates/ruma-client-api/src/thirdparty/get_protocols.rs +++ b/crates/ruma-client-api/src/thirdparty/get_protocols.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::thirdparty::Protocol; + use ruma_common::{api::ruma_api, thirdparty::Protocol}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/thirdparty/get_user_for_protocol.rs b/crates/ruma-client-api/src/thirdparty/get_user_for_protocol.rs index d4ffc989..9b474520 100644 --- a/crates/ruma-client-api/src/thirdparty/get_user_for_protocol.rs +++ b/crates/ruma-client-api/src/thirdparty/get_user_for_protocol.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::thirdparty::User; + use ruma_common::{api::ruma_api, thirdparty::User}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/thirdparty/get_user_for_user_id.rs b/crates/ruma-client-api/src/thirdparty/get_user_for_user_id.rs index dd85b7da..adca1482 100644 --- a/crates/ruma-client-api/src/thirdparty/get_user_for_user_id.rs +++ b/crates/ruma-client-api/src/thirdparty/get_user_for_user_id.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3thirdpartyuser - use ruma_api::ruma_api; - use ruma_common::thirdparty::User; + use ruma_common::{api::ruma_api, thirdparty::User}; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-client-api/src/to_device/send_event_to_device.rs b/crates/ruma-client-api/src/to_device/send_event_to_device.rs index e4c53092..63479088 100644 --- a/crates/ruma-client-api/src/to_device/send_event_to_device.rs +++ b/crates/ruma-client-api/src/to_device/send_event_to_device.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::to_device::DeviceIdOrAllDevices; + use ruma_common::{api::ruma_api, to_device::DeviceIdOrAllDevices}; use ruma_events::AnyToDeviceEventContent; use ruma_identifiers::{TransactionId, UserId}; use ruma_serde::Raw; diff --git a/crates/ruma-client-api/src/typing/create_typing_event.rs b/crates/ruma-client-api/src/typing/create_typing_event.rs index 8d084429..fcaa9935 100644 --- a/crates/ruma-client-api/src/typing/create_typing_event.rs +++ b/crates/ruma-client-api/src/typing/create_typing_event.rs @@ -7,7 +7,7 @@ pub mod v3 { use std::time::Duration; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, UserId}; use serde::{de::Error, Deserialize, Deserializer, Serialize}; diff --git a/crates/ruma-client-api/src/uiaa.rs b/crates/ruma-client-api/src/uiaa.rs index bf759747..93d28109 100644 --- a/crates/ruma-client-api/src/uiaa.rs +++ b/crates/ruma-client-api/src/uiaa.rs @@ -5,11 +5,13 @@ use std::{borrow::Cow, fmt}; use bytes::BufMut; -use ruma_api::{ - error::{DeserializationError, IntoHttpError}, - EndpointError, OutgoingResponse, +use ruma_common::{ + api::{ + error::{DeserializationError, IntoHttpError}, + EndpointError, OutgoingResponse, + }, + thirdparty::Medium, }; -use ruma_common::thirdparty::Medium; use ruma_identifiers::{ClientSecret, SessionId}; use ruma_serde::{from_raw_json_value, JsonObject, Outgoing, StringEnum}; use serde::{ diff --git a/crates/ruma-client-api/src/uiaa/get_uiaa_fallback_page.rs b/crates/ruma-client-api/src/uiaa/get_uiaa_fallback_page.rs index 6a33248e..d56343a2 100644 --- a/crates/ruma-client-api/src/uiaa/get_uiaa_fallback_page.rs +++ b/crates/ruma-client-api/src/uiaa/get_uiaa_fallback_page.rs @@ -5,7 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#fallback - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/user_directory/search_users.rs b/crates/ruma-client-api/src/user_directory/search_users.rs index 7f50db98..6f92d132 100644 --- a/crates/ruma-client-api/src/user_directory/search_users.rs +++ b/crates/ruma-client-api/src/user_directory/search_users.rs @@ -6,7 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3user_directorysearch use js_int::{uint, UInt}; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{MxcUri, UserId}; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-client-api/src/voip/get_turn_server_info.rs b/crates/ruma-client-api/src/voip/get_turn_server_info.rs index 8e3a85d6..0a1df9a6 100644 --- a/crates/ruma-client-api/src/voip/get_turn_server_info.rs +++ b/crates/ruma-client-api/src/voip/get_turn_server_info.rs @@ -7,7 +7,7 @@ pub mod v3 { use std::time::Duration; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/tests/headers.rs b/crates/ruma-client-api/tests/headers.rs index 4704e3c8..43fbf4bf 100644 --- a/crates/ruma-client-api/tests/headers.rs +++ b/crates/ruma-client-api/tests/headers.rs @@ -1,8 +1,8 @@ #![cfg(feature = "client")] use http::HeaderMap; -use ruma_api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}; use ruma_client_api::discover::discover_homeserver; +use ruma_common::api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}; #[test] fn get_request_headers() { diff --git a/crates/ruma-client-api/tests/uiaa.rs b/crates/ruma-client-api/tests/uiaa.rs index 7014a30f..806374d3 100644 --- a/crates/ruma-client-api/tests/uiaa.rs +++ b/crates/ruma-client-api/tests/uiaa.rs @@ -1,6 +1,5 @@ use assign::assign; use matches::assert_matches; -use ruma_api::{EndpointError, OutgoingResponse}; use ruma_client_api::{ error::{ErrorBody, ErrorKind}, uiaa::{ @@ -8,6 +7,7 @@ use ruma_client_api::{ UiaaResponse, }, }; +use ruma_common::api::{EndpointError, OutgoingResponse}; use serde_json::{ from_slice as from_json_slice, from_str as from_json_str, from_value as from_json_value, json, to_value as to_json_value, value::to_raw_value as to_raw_json_value, Value as JsonValue, diff --git a/crates/ruma-client/Cargo.toml b/crates/ruma-client/Cargo.toml index 55abbc70..68ddad48 100644 --- a/crates/ruma-client/Cargo.toml +++ b/crates/ruma-client/Cargo.toml @@ -41,9 +41,8 @@ hyper-rustls-crate = { package = "hyper-rustls", version = "0.22.1", optional = hyper-tls = { version = "0.5.0", optional = true } isahc-crate = { package = "isahc", version = "1.3.1", optional = true } reqwest = { version = "0.11.4", optional = true, default-features = false } -ruma-api = { version = "0.20.0", path = "../ruma-api" } ruma-client-api = { version = "0.13.0", path = "../ruma-client-api", optional = true, features = ["client"] } -ruma-common = { version = "0.8.0", path = "../ruma-common" } +ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api"] } ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } serde = { version = "1.0.118", features = ["derive"] } diff --git a/crates/ruma-client/src/client.rs b/crates/ruma-client/src/client.rs index ede3aa94..7e965c9e 100644 --- a/crates/ruma-client/src/client.rs +++ b/crates/ruma-client/src/client.rs @@ -6,14 +6,16 @@ use std::{ use assign::assign; use async_stream::try_stream; use futures_core::stream::Stream; -use ruma_api::{MatrixVersion, OutgoingRequest, SendAccessToken}; use ruma_client_api::{ account::register::{self, RegistrationKind}, session::login::{self, v3::LoginInfo}, sync::sync_events, uiaa::UserIdentifier, }; -use ruma_common::presence::PresenceState; +use ruma_common::{ + api::{MatrixVersion, OutgoingRequest, SendAccessToken}, + presence::PresenceState, +}; use ruma_identifiers::{DeviceId, UserId}; use crate::{ diff --git a/crates/ruma-client/src/client/builder.rs b/crates/ruma-client/src/client/builder.rs index d1d3d22f..1916536c 100644 --- a/crates/ruma-client/src/client/builder.rs +++ b/crates/ruma-client/src/client/builder.rs @@ -1,7 +1,7 @@ use std::sync::{Arc, Mutex}; -use ruma_api::{MatrixVersion, SendAccessToken}; use ruma_client_api::discover::get_supported_versions; +use ruma_common::api::{MatrixVersion, SendAccessToken}; use super::{Client, ClientData}; use crate::{DefaultConstructibleHttpClient, Error, HttpClient, HttpClientExt}; diff --git a/crates/ruma-client/src/error.rs b/crates/ruma-client/src/error.rs index 13169ebc..2661b30d 100644 --- a/crates/ruma-client/src/error.rs +++ b/crates/ruma-client/src/error.rs @@ -2,7 +2,7 @@ use std::fmt::{self, Debug, Display, Formatter}; -use ruma_api::error::{FromHttpResponseError, IntoHttpError}; +use ruma_common::api::error::{FromHttpResponseError, IntoHttpError}; /// An error that can occur during client operations. #[derive(Debug)] diff --git a/crates/ruma-client/src/http_client.rs b/crates/ruma-client/src/http_client.rs index 87f3bff5..14f1cc34 100644 --- a/crates/ruma-client/src/http_client.rs +++ b/crates/ruma-client/src/http_client.rs @@ -5,7 +5,7 @@ use std::{future::Future, pin::Pin}; use async_trait::async_trait; use bytes::BufMut; -use ruma_api::{MatrixVersion, OutgoingRequest, SendAccessToken}; +use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken}; use ruma_identifiers::UserId; use crate::{add_user_id_to_query, ResponseError, ResponseResult}; diff --git a/crates/ruma-client/src/lib.rs b/crates/ruma-client/src/lib.rs index f9e8adf8..1af20943 100644 --- a/crates/ruma-client/src/lib.rs +++ b/crates/ruma-client/src/lib.rs @@ -67,8 +67,8 @@ //! # .await?; //! use std::convert::TryFrom; //! -//! use ruma_api::MatrixVersion; //! use ruma_client_api::alias::get_alias; +//! use ruma_common::api::MatrixVersion; //! use ruma_identifiers::{room_alias_id, room_id}; //! //! let response = client @@ -104,7 +104,7 @@ use std::{any::type_name, future::Future}; -use ruma_api::{MatrixVersion, OutgoingRequest, SendAccessToken}; +use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken}; use ruma_identifiers::UserId; use tracing::{info_span, Instrument}; @@ -175,7 +175,9 @@ where let res = info_span!("deserialize_response", response_type = type_name::()) - .in_scope(move || ruma_api::IncomingResponse::try_from_http_response(http_res))?; + .in_scope(move || { + ruma_common::api::IncomingResponse::try_from_http_response(http_res) + })?; Ok(res) } diff --git a/crates/ruma-common/Cargo.toml b/crates/ruma-common/Cargo.toml index b86a47c1..1fbeefd5 100644 --- a/crates/ruma-common/Cargo.toml +++ b/crates/ruma-common/Cargo.toml @@ -14,21 +14,37 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [features] +# These feature gates exist only for the tests. Disabling them results in a +# compile error. +default = ["client", "server"] +client = [] +server = [] + +api = ["bytes", "http", "percent-encoding", "ruma-macros", "thiserror"] compat = [] unstable-exhaustive-types = [] unstable-pre-spec = [] unstable-msc2677 = [] [dependencies] +bytes = { version = "1.0.1", optional = true } +http = { version = "0.2.2", optional = true } indexmap = { version = "1.6.2", features = ["serde-1"] } js_int = { version = "0.2.0", features = ["serde"] } +percent-encoding = { version = "2.1.0", optional = true } ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } +ruma-macros = { version = "=0.1.0", path = "../ruma-macros", optional = true } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } serde = { version = "1.0.118", features = ["derive"] } serde_json = { version = "1.0.60", features = ["raw_value"] } +thiserror = { version = "1.0.26", optional = true } tracing = "0.1.25" wildmatch = "2.0.0" [dev-dependencies] +bytes = "1.0.1" +http = "0.2.2" maplit = "1.0.2" matches = "0.1.8" +ruma-events = { version = "0.26.0", path = "../ruma-events" } +trybuild = "1.0.38" diff --git a/crates/ruma-common/README.md b/crates/ruma-common/README.md index 9ce0ba00..6b0544c2 100644 --- a/crates/ruma-common/README.md +++ b/crates/ruma-common/README.md @@ -5,3 +5,11 @@ ![license: MIT](https://img.shields.io/crates/l/ruma-common.svg) Common types for other Ruma crates. + +The feature-gated modules are defined as follow: + +### `api` module + +Behind the `api` feature, core types used to define the requests and responses for each endpoint in +the various [Matrix](https://matrix.org/) API specifications. These types can be shared by client +and server code for all Matrix APIs. diff --git a/crates/ruma-api/src/lib.rs b/crates/ruma-common/src/api.rs similarity index 93% rename from crates/ruma-api/src/lib.rs rename to crates/ruma-common/src/api.rs index 0967f6c9..1f8fd1c6 100644 --- a/crates/ruma-api/src/lib.rs +++ b/crates/ruma-common/src/api.rs @@ -1,29 +1,23 @@ -#![doc(html_favicon_url = "https://www.ruma.io/favicon.ico")] -#![doc(html_logo_url = "https://www.ruma.io/images/logo.png")] //! Core types used to define the requests and responses for each endpoint in the various //! [Matrix API specifications][apis]. //! //! When implementing a new Matrix API, each endpoint has a request type which implements -//! `Endpoint`, and a response type connected via an associated type. +//! [`IncomingRequest`] and [`OutgoingRequest`], and a response type connected via an associated +//! type. //! -//! An implementation of `Endpoint` contains all the information about the HTTP method, the path and -//! input parameters for requests, and the structure of a successful response. -//! Such types can then be used by client code to make requests, and by server code to fulfill -//! those requests. +//! An implementation of [`IncomingRequest`] or [`OutgoingRequest`] contains all the information +//! about the HTTP method, the path and input parameters for requests, and the structure of a +//! successful response. Such types can then be used by client code to make requests, and by server +//! code to fulfill those requests. //! //! [apis]: https://spec.matrix.org/v1.2/#matrix-apis -#![warn(missing_docs)] - -#[cfg(not(all(feature = "client", feature = "server")))] -compile_error!("ruma_api's Cargo features only exist as a workaround are not meant to be disabled"); - use std::{convert::TryInto as _, error::Error as StdError, fmt}; use bytes::BufMut; use ruma_identifiers::UserId; -/// Generates a `ruma_api::Endpoint` from a concise definition. +/// Generates [`IncomingRequest`] and [`OutgoingRequest`] from a concise definition. /// /// The macro expects the following structure as input: /// @@ -35,7 +29,7 @@ use ruma_identifiers::UserId; /// name: &'static str, /// path: &'static str, /// rate_limited: bool, -/// authentication: ruma_api::AuthScheme, +/// authentication: ruma_common::api::AuthScheme, /// } /// /// request: { @@ -53,10 +47,10 @@ use ruma_identifiers::UserId; /// } /// ``` /// -/// This will generate a `ruma_api::Metadata` value to be used for the `ruma_api::Endpoint`'s -/// associated constant, single `Request` and `Response` structs, and the necessary trait -/// implementations to convert the request into a `http::Request` and to create a response from -/// a `http::Response` and vice versa. +/// This will generate a [`Metadata`] value to be used for the associated constants of +/// [`IncomingRequest`] and [`OutgoingRequest`], single `Request` and `Response` structs, and +/// the necessary trait implementations to convert the request into a `http::Request` and to +/// create a response from a `http::Response` and vice versa. /// /// The details of each of the three sections of the macros are documented below. /// @@ -128,7 +122,7 @@ use ruma_identifiers::UserId; /// /// ``` /// pub mod some_endpoint { -/// use ruma_api::ruma_api; +/// use ruma_common::api::ruma_api; /// /// ruma_api! { /// metadata: { @@ -164,7 +158,7 @@ use ruma_identifiers::UserId; /// } /// /// pub mod newtype_body_endpoint { -/// use ruma_api::ruma_api; +/// use ruma_common::api::ruma_api; /// use serde::{Deserialize, Serialize}; /// /// #[derive(Clone, Debug, Deserialize, Serialize)] @@ -199,7 +193,7 @@ pub use ruma_macros::ruma_api; pub mod error; /// This module is used to support the generated code from ruma-macros. -/// It is not considered part of ruma-api's public API. +/// It is not considered part of ruma-common's public API. #[doc(hidden)] pub mod exports { pub use bytes; @@ -304,7 +298,7 @@ pub trait IncomingResponse: Sized { ) -> Result>; } -/// An extension to `OutgoingRequest` which provides Appservice specific methods. +/// An extension to [`OutgoingRequest`] which provides Appservice specific methods. pub trait OutgoingRequestAppserviceExt: OutgoingRequest { /// Tries to convert this request into an `http::Request` and appends a virtual `user_id` to /// [assert Appservice identity][id_assert]. diff --git a/crates/ruma-api/src/error.rs b/crates/ruma-common/src/api/error.rs similarity index 99% rename from crates/ruma-api/src/error.rs rename to crates/ruma-common/src/api/error.rs index 02c4fbb3..aa010bed 100644 --- a/crates/ruma-api/src/error.rs +++ b/crates/ruma-common/src/api/error.rs @@ -8,7 +8,7 @@ use bytes::BufMut; use serde_json::{from_slice as from_json_slice, Value as JsonValue}; use thiserror::Error; -use crate::{EndpointError, MatrixVersion, OutgoingResponse}; +use super::{EndpointError, MatrixVersion, OutgoingResponse}; /// A general-purpose Matrix error type consisting of an HTTP status code and a JSON body. /// diff --git a/crates/ruma-api/src/metadata.rs b/crates/ruma-common/src/api/metadata.rs similarity index 95% rename from crates/ruma-api/src/metadata.rs rename to crates/ruma-common/src/api/metadata.rs index df750f8f..ca5c3a03 100644 --- a/crates/ruma-api/src/metadata.rs +++ b/crates/ruma-common/src/api/metadata.rs @@ -6,7 +6,7 @@ use std::{ use http::Method; -use crate::{error::UnknownVersionError, AuthScheme}; +use super::{error::UnknownVersionError, AuthScheme}; /// Metadata about an API endpoint. #[derive(Clone, Debug)] @@ -48,13 +48,13 @@ pub struct Metadata { /// /// Deprecation often precedes one matrix version before removal. /// - /// This will make [`try_into_http_request`](crate::OutgoingRequest::try_into_http_request) + /// This will make [`try_into_http_request`](super::OutgoingRequest::try_into_http_request) /// emit a warning, see the corresponding documentation for more information. pub deprecated: Option, /// The matrix version that removed this endpoint. /// - /// This will make [`try_into_http_request`](crate::OutgoingRequest::try_into_http_request) + /// This will make [`try_into_http_request`](super::OutgoingRequest::try_into_http_request) /// emit an error, see the corresponding documentation for more information. pub removed: Option, } @@ -71,7 +71,7 @@ pub struct Metadata { /// /// Ruma keeps track of when endpoints are added, deprecated, and removed. It'll automatically /// select the right endpoint stability variation to use depending on which Matrix versions you -/// pass to [`try_into_http_request`](crate::OutgoingRequest::try_into_http_request), see its +/// pass to [`try_into_http_request`](super::OutgoingRequest::try_into_http_request), see its /// respective documentation for more information. #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] diff --git a/crates/ruma-common/src/lib.rs b/crates/ruma-common/src/lib.rs index 84534d48..509ede1d 100644 --- a/crates/ruma-common/src/lib.rs +++ b/crates/ruma-common/src/lib.rs @@ -1,10 +1,17 @@ #![doc(html_favicon_url = "https://www.ruma.io/favicon.ico")] #![doc(html_logo_url = "https://www.ruma.io/images/logo.png")] -//! Common types for other ruma crates. +//! Common types for the Ruma crates. #![warn(missing_docs)] #![cfg_attr(docsrs, feature(doc_auto_cfg))] +#[cfg(not(all(feature = "client", feature = "server")))] +compile_error!( + "ruma_common's `client` and `server` Cargo features only exist as a workaround are not meant to be disabled" +); + +#[cfg(feature = "api")] +pub mod api; pub mod authentication; pub mod directory; pub mod encryption; diff --git a/crates/ruma-api/tests/conversions.rs b/crates/ruma-common/tests/api/conversions.rs similarity index 98% rename from crates/ruma-api/tests/conversions.rs rename to crates/ruma-common/tests/api/conversions.rs index 1505b71b..4623b4fd 100644 --- a/crates/ruma-api/tests/conversions.rs +++ b/crates/ruma-common/tests/api/conversions.rs @@ -1,6 +1,6 @@ #![allow(clippy::exhaustive_structs)] -use ruma_api::{ +use ruma_common::api::{ ruma_api, IncomingRequest as _, MatrixVersion, OutgoingRequest as _, OutgoingRequestAppserviceExt, SendAccessToken, }; @@ -117,7 +117,7 @@ fn request_with_user_id_serde() { } mod without_query { - use ruma_api::MatrixVersion; + use ruma_common::api::MatrixVersion; use super::{ruma_api, user_id, OutgoingRequestAppserviceExt, SendAccessToken, UserId}; diff --git a/crates/ruma-api/tests/header_override.rs b/crates/ruma-common/tests/api/header_override.rs similarity index 98% rename from crates/ruma-api/tests/header_override.rs rename to crates/ruma-common/tests/api/header_override.rs index fb83070a..f3dc0d28 100644 --- a/crates/ruma-api/tests/header_override.rs +++ b/crates/ruma-common/tests/api/header_override.rs @@ -1,7 +1,7 @@ #![allow(clippy::exhaustive_structs)] use http::header::{Entry, CONTENT_TYPE}; -use ruma_api::{ +use ruma_common::api::{ ruma_api, MatrixVersion, OutgoingRequest as _, OutgoingResponse as _, SendAccessToken, }; diff --git a/crates/ruma-api/tests/manual_endpoint_impl.rs b/crates/ruma-common/tests/api/manual_endpoint_impl.rs similarity index 98% rename from crates/ruma-api/tests/manual_endpoint_impl.rs rename to crates/ruma-common/tests/api/manual_endpoint_impl.rs index 753adf25..4edbf3bd 100644 --- a/crates/ruma-api/tests/manual_endpoint_impl.rs +++ b/crates/ruma-common/tests/api/manual_endpoint_impl.rs @@ -4,7 +4,7 @@ use bytes::BufMut; use http::{header::CONTENT_TYPE, method::Method}; -use ruma_api::{ +use ruma_common::api::{ error::{FromHttpRequestError, FromHttpResponseError, IntoHttpError, MatrixError, ServerError}, AuthScheme, EndpointError, IncomingRequest, IncomingResponse, MatrixVersion, Metadata, OutgoingRequest, OutgoingResponse, SendAccessToken, @@ -53,7 +53,7 @@ impl OutgoingRequest for Request { let url = format!( "{}{}", base_url, - ruma_api::select_path( + ruma_common::api::select_path( considering_versions, &METADATA, Some(format_args!("/_matrix/client/unstable/directory/room/{}", self.room_alias)), diff --git a/crates/ruma-common/tests/api/mod.rs b/crates/ruma-common/tests/api/mod.rs new file mode 100644 index 00000000..6fdca848 --- /dev/null +++ b/crates/ruma-common/tests/api/mod.rs @@ -0,0 +1,12 @@ +#![cfg(feature = "api")] + +mod conversions; +mod header_override; +mod manual_endpoint_impl; +mod no_fields; +mod optional_headers; +mod path_arg_ordering; +mod ruma_api; +mod ruma_api_lifetime; +mod ruma_api_macros; +mod select_path; diff --git a/crates/ruma-api/tests/no_fields.rs b/crates/ruma-common/tests/api/no_fields.rs similarity index 91% rename from crates/ruma-api/tests/no_fields.rs rename to crates/ruma-common/tests/api/no_fields.rs index b49db326..6376cebb 100644 --- a/crates/ruma-api/tests/no_fields.rs +++ b/crates/ruma-common/tests/api/no_fields.rs @@ -1,7 +1,9 @@ -use ruma_api::{MatrixVersion, OutgoingRequest as _, OutgoingResponse as _, SendAccessToken}; +use ruma_common::api::{ + MatrixVersion, OutgoingRequest as _, OutgoingResponse as _, SendAccessToken, +}; mod get { - ruma_api::ruma_api! { + ruma_common::api::ruma_api! { metadata: { description: "Does something.", method: GET, @@ -17,7 +19,7 @@ mod get { } mod post { - ruma_api::ruma_api! { + ruma_common::api::ruma_api! { metadata: { description: "Does something.", method: POST, diff --git a/crates/ruma-api/tests/optional_headers.rs b/crates/ruma-common/tests/api/optional_headers.rs similarity index 93% rename from crates/ruma-api/tests/optional_headers.rs rename to crates/ruma-common/tests/api/optional_headers.rs index 8301fcf3..28e1cea8 100644 --- a/crates/ruma-api/tests/optional_headers.rs +++ b/crates/ruma-common/tests/api/optional_headers.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/path_arg_ordering.rs b/crates/ruma-common/tests/api/path_arg_ordering.rs similarity index 95% rename from crates/ruma-api/tests/path_arg_ordering.rs rename to crates/ruma-common/tests/api/path_arg_ordering.rs index 4bb433b4..e3d4cd2c 100644 --- a/crates/ruma-api/tests/path_arg_ordering.rs +++ b/crates/ruma-common/tests/api/path_arg_ordering.rs @@ -1,4 +1,4 @@ -use ruma_api::{ruma_api, IncomingRequest}; +use ruma_common::api::{ruma_api, IncomingRequest}; ruma_api! { metadata: { diff --git a/crates/ruma-common/tests/api/ruma_api.rs b/crates/ruma-common/tests/api/ruma_api.rs new file mode 100644 index 00000000..43493ddb --- /dev/null +++ b/crates/ruma-common/tests/api/ruma_api.rs @@ -0,0 +1,13 @@ +#[test] +fn ui() { + let t = trybuild::TestCases::new(); + t.pass("tests/api/ui/01-api-sanity-check.rs"); + t.compile_fail("tests/api/ui/02-invalid-path.rs"); + t.pass("tests/api/ui/03-move-value.rs"); + t.compile_fail("tests/api/ui/04-attributes.rs"); + t.pass("tests/api/ui/05-request-only.rs"); + t.pass("tests/api/ui/06-response-only.rs"); + t.compile_fail("tests/api/ui/07-error-type-attribute.rs"); + t.compile_fail("tests/api/ui/08-deprecated-without-added.rs"); + t.compile_fail("tests/api/ui/09-removed-without-deprecated.rs"); +} diff --git a/crates/ruma-api/tests/ruma_api_lifetime.rs b/crates/ruma-common/tests/api/ruma_api_lifetime.rs similarity index 95% rename from crates/ruma-api/tests/ruma_api_lifetime.rs rename to crates/ruma-common/tests/api/ruma_api_lifetime.rs index 1b483f93..00d09db6 100644 --- a/crates/ruma-api/tests/ruma_api_lifetime.rs +++ b/crates/ruma-common/tests/api/ruma_api_lifetime.rs @@ -7,7 +7,7 @@ pub struct OtherThing<'t> { } mod empty_response { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomAliasId, RoomId}; ruma_api! { @@ -34,7 +34,7 @@ mod empty_response { } mod nested_types { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomAliasId; ruma_api! { @@ -60,7 +60,7 @@ mod nested_types { } mod full_request_response { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use super::{IncomingOtherThing, OtherThing}; @@ -94,7 +94,7 @@ mod full_request_response { } mod full_request_response_with_query_map { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { @@ -126,7 +126,7 @@ mod full_request_response_with_query_map { } mod query_fields { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/ruma_api_macros.rs b/crates/ruma-common/tests/api/ruma_api_macros.rs similarity index 96% rename from crates/ruma-api/tests/ruma_api_macros.rs rename to crates/ruma-common/tests/api/ruma_api_macros.rs index 32c72d8c..cc769462 100644 --- a/crates/ruma-api/tests/ruma_api_macros.rs +++ b/crates/ruma-common/tests/api/ruma_api_macros.rs @@ -1,7 +1,7 @@ #![allow(clippy::exhaustive_structs)] pub mod some_endpoint { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{tag::TagEvent, AnyRoomEvent}; use ruma_identifiers::UserId; use ruma_serde::Raw; @@ -56,7 +56,7 @@ pub mod some_endpoint { } pub mod newtype_body_endpoint { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] pub struct MyCustomType { @@ -86,7 +86,7 @@ pub mod newtype_body_endpoint { } pub mod raw_body_endpoint { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] pub struct MyCustomType { @@ -116,7 +116,7 @@ pub mod raw_body_endpoint { } pub mod query_map_endpoint { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/select_path.rs b/crates/ruma-common/tests/api/select_path.rs similarity index 96% rename from crates/ruma-api/tests/select_path.rs rename to crates/ruma-common/tests/api/select_path.rs index 55b77c99..620b7f10 100644 --- a/crates/ruma-api/tests/select_path.rs +++ b/crates/ruma-common/tests/api/select_path.rs @@ -1,6 +1,6 @@ use http::Method; use matches::assert_matches; -use ruma_api::{ +use ruma_common::api::{ error::IntoHttpError, select_path, MatrixVersion::{V1_0, V1_1, V1_2}, @@ -15,7 +15,7 @@ const BASE: Metadata = Metadata { r0_path: Some("/r0/path"), stable_path: Some("/stable/path"), rate_limited: false, - authentication: ruma_api::AuthScheme::None, + authentication: ruma_common::api::AuthScheme::None, added: None, deprecated: None, removed: None, diff --git a/crates/ruma-api/tests/ui/01-api-sanity-check.rs b/crates/ruma-common/tests/api/ui/01-api-sanity-check.rs similarity index 96% rename from crates/ruma-api/tests/ui/01-api-sanity-check.rs rename to crates/ruma-common/tests/api/ui/01-api-sanity-check.rs index 3ad0940d..e3103c1b 100644 --- a/crates/ruma-api/tests/ui/01-api-sanity-check.rs +++ b/crates/ruma-common/tests/api/ui/01-api-sanity-check.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use ruma_events::{tag::TagEvent, AnyRoomEvent}; use ruma_serde::Raw; @@ -56,7 +56,7 @@ ruma_api! { } fn main() { - use ruma_api::MatrixVersion; + use ruma_common::api::MatrixVersion; assert_eq!(METADATA.unstable_path, Some("/_matrix/some/msc1234/endpoint/:baz")); assert_eq!(METADATA.r0_path, Some("/_matrix/some/r0/endpoint/:baz")); diff --git a/crates/ruma-api/tests/ui/02-invalid-path.rs b/crates/ruma-common/tests/api/ui/02-invalid-path.rs similarity index 95% rename from crates/ruma-api/tests/ui/02-invalid-path.rs rename to crates/ruma-common/tests/api/ui/02-invalid-path.rs index 2ef34817..ecf8b843 100644 --- a/crates/ruma-api/tests/ui/02-invalid-path.rs +++ b/crates/ruma-common/tests/api/ui/02-invalid-path.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/ui/02-invalid-path.stderr b/crates/ruma-common/tests/api/ui/02-invalid-path.stderr similarity index 81% rename from crates/ruma-api/tests/ui/02-invalid-path.stderr rename to crates/ruma-common/tests/api/ui/02-invalid-path.stderr index 9f76c9a8..3a367959 100644 --- a/crates/ruma-api/tests/ui/02-invalid-path.stderr +++ b/crates/ruma-common/tests/api/ui/02-invalid-path.stderr @@ -1,11 +1,11 @@ error: path may only contain printable ASCII characters with no spaces - --> tests/ui/02-invalid-path.rs:8:24 + --> $DIR/02-invalid-path.rs:8:24 | 8 | unstable_path: "µ/°/§/€", | ^^^^^^^^^ error: path may only contain printable ASCII characters with no spaces - --> tests/ui/02-invalid-path.rs:26:24 + --> $DIR/02-invalid-path.rs:26:24 | 26 | unstable_path: "path/to/invalid space/endpoint", | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/crates/ruma-api/tests/ui/03-move-value.rs b/crates/ruma-common/tests/api/ui/03-move-value.rs similarity index 96% rename from crates/ruma-api/tests/ui/03-move-value.rs rename to crates/ruma-common/tests/api/ui/03-move-value.rs index ef747468..821e1587 100644 --- a/crates/ruma-api/tests/ui/03-move-value.rs +++ b/crates/ruma-common/tests/api/ui/03-move-value.rs @@ -2,7 +2,7 @@ // consume the request/response. mod newtype_body { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] @@ -43,7 +43,7 @@ mod newtype_body { } mod raw_body { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; ruma_api! { @@ -81,7 +81,7 @@ mod raw_body { } mod plain { - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] diff --git a/crates/ruma-api/tests/ui/04-attributes.rs b/crates/ruma-common/tests/api/ui/04-attributes.rs similarity index 95% rename from crates/ruma-api/tests/ui/04-attributes.rs rename to crates/ruma-common/tests/api/ui/04-attributes.rs index 136b04fb..f23a1025 100644 --- a/crates/ruma-api/tests/ui/04-attributes.rs +++ b/crates/ruma-common/tests/api/ui/04-attributes.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/ui/04-attributes.stderr b/crates/ruma-common/tests/api/ui/04-attributes.stderr similarity index 100% rename from crates/ruma-api/tests/ui/04-attributes.stderr rename to crates/ruma-common/tests/api/ui/04-attributes.stderr diff --git a/crates/ruma-api/tests/ui/05-request-only.rs b/crates/ruma-common/tests/api/ui/05-request-only.rs similarity index 98% rename from crates/ruma-api/tests/ui/05-request-only.rs rename to crates/ruma-common/tests/api/ui/05-request-only.rs index f00cd42b..8a4cc0b0 100644 --- a/crates/ruma-api/tests/ui/05-request-only.rs +++ b/crates/ruma-common/tests/api/ui/05-request-only.rs @@ -1,5 +1,5 @@ use bytes::BufMut; -use ruma_api::{ +use ruma_common::api::{ error::{FromHttpResponseError, IntoHttpError, MatrixError}, ruma_api, IncomingResponse, OutgoingResponse, }; diff --git a/crates/ruma-api/tests/ui/06-response-only.rs b/crates/ruma-common/tests/api/ui/06-response-only.rs similarity index 94% rename from crates/ruma-api/tests/ui/06-response-only.rs rename to crates/ruma-common/tests/api/ui/06-response-only.rs index b9c69452..3f72b080 100644 --- a/crates/ruma-api/tests/ui/06-response-only.rs +++ b/crates/ruma-common/tests/api/ui/06-response-only.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/ui/07-error-type-attribute.rs b/crates/ruma-common/tests/api/ui/07-error-type-attribute.rs similarity index 82% rename from crates/ruma-api/tests/ui/07-error-type-attribute.rs rename to crates/ruma-common/tests/api/ui/07-error-type-attribute.rs index 7159fad5..c865dc1a 100644 --- a/crates/ruma-api/tests/ui/07-error-type-attribute.rs +++ b/crates/ruma-common/tests/api/ui/07-error-type-attribute.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; ruma_api! { metadata: { @@ -15,7 +15,7 @@ ruma_api! { response: {} #[derive(Default)] - error: ruma_api::error::MatrixError + error: ruma_common::api::error::MatrixError } fn main() {} diff --git a/crates/ruma-api/tests/ui/07-error-type-attribute.stderr b/crates/ruma-common/tests/api/ui/07-error-type-attribute.stderr similarity index 100% rename from crates/ruma-api/tests/ui/07-error-type-attribute.stderr rename to crates/ruma-common/tests/api/ui/07-error-type-attribute.stderr diff --git a/crates/ruma-api/tests/ui/08-deprecated-without-added.rs b/crates/ruma-common/tests/api/ui/08-deprecated-without-added.rs similarity index 92% rename from crates/ruma-api/tests/ui/08-deprecated-without-added.rs rename to crates/ruma-common/tests/api/ui/08-deprecated-without-added.rs index 510427ae..169966e4 100644 --- a/crates/ruma-api/tests/ui/08-deprecated-without-added.rs +++ b/crates/ruma-common/tests/api/ui/08-deprecated-without-added.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/ui/08-deprecated-without-added.stderr b/crates/ruma-common/tests/api/ui/08-deprecated-without-added.stderr similarity index 88% rename from crates/ruma-api/tests/ui/08-deprecated-without-added.stderr rename to crates/ruma-common/tests/api/ui/08-deprecated-without-added.stderr index a08a9b57..9260e510 100644 --- a/crates/ruma-api/tests/ui/08-deprecated-without-added.stderr +++ b/crates/ruma-common/tests/api/ui/08-deprecated-without-added.stderr @@ -1,5 +1,5 @@ error: deprecated version is defined while added version is not defined - --> tests/ui/08-deprecated-without-added.rs:3:1 + --> $DIR/08-deprecated-without-added.rs:3:1 | 3 | / ruma_api! { 4 | | metadata: { diff --git a/crates/ruma-api/tests/ui/09-removed-without-deprecated copy.rs b/crates/ruma-common/tests/api/ui/09-removed-without-deprecated copy.rs similarity index 91% rename from crates/ruma-api/tests/ui/09-removed-without-deprecated copy.rs rename to crates/ruma-common/tests/api/ui/09-removed-without-deprecated copy.rs index 4702abe9..2aef086b 100644 --- a/crates/ruma-api/tests/ui/09-removed-without-deprecated copy.rs +++ b/crates/ruma-common/tests/api/ui/09-removed-without-deprecated copy.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/ui/09-removed-without-deprecated.rs b/crates/ruma-common/tests/api/ui/09-removed-without-deprecated.rs similarity index 92% rename from crates/ruma-api/tests/ui/09-removed-without-deprecated.rs rename to crates/ruma-common/tests/api/ui/09-removed-without-deprecated.rs index 7bb3861c..a635f8d2 100644 --- a/crates/ruma-api/tests/ui/09-removed-without-deprecated.rs +++ b/crates/ruma-common/tests/api/ui/09-removed-without-deprecated.rs @@ -1,4 +1,4 @@ -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-api/tests/ui/09-removed-without-deprecated.stderr b/crates/ruma-common/tests/api/ui/09-removed-without-deprecated.stderr similarity index 87% rename from crates/ruma-api/tests/ui/09-removed-without-deprecated.stderr rename to crates/ruma-common/tests/api/ui/09-removed-without-deprecated.stderr index c554a000..6a472502 100644 --- a/crates/ruma-api/tests/ui/09-removed-without-deprecated.stderr +++ b/crates/ruma-common/tests/api/ui/09-removed-without-deprecated.stderr @@ -1,5 +1,5 @@ error: removed version is defined while deprecated version is not defined - --> tests/ui/09-removed-without-deprecated.rs:3:1 + --> $DIR/09-removed-without-deprecated.rs:3:1 | 3 | / ruma_api! { 4 | | metadata: { diff --git a/crates/ruma-common/tests/tests.rs b/crates/ruma-common/tests/tests.rs new file mode 100644 index 00000000..b32f9e29 --- /dev/null +++ b/crates/ruma-common/tests/tests.rs @@ -0,0 +1 @@ +mod api; diff --git a/crates/ruma-federation-api/Cargo.toml b/crates/ruma-federation-api/Cargo.toml index fbf3927f..d9294df3 100644 --- a/crates/ruma-federation-api/Cargo.toml +++ b/crates/ruma-federation-api/Cargo.toml @@ -24,8 +24,7 @@ server = [] [dependencies] js_int = { version = "0.2.0", features = ["serde"] } -ruma-api = { version = "0.20.0", path = "../ruma-api" } -ruma-common = { version = "0.8.0", path = "../ruma-common" } +ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api"] } ruma-events = { version = "0.26.0", path = "../ruma-events" } ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } diff --git a/crates/ruma-federation-api/src/authorization/get_event_authorization.rs b/crates/ruma-federation-api/src/authorization/get_event_authorization.rs index 34c2babe..04a2200b 100644 --- a/crates/ruma-federation-api/src/authorization/get_event_authorization.rs +++ b/crates/ruma-federation-api/src/authorization/get_event_authorization.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1event_authroomideventid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/backfill/get_backfill.rs b/crates/ruma-federation-api/src/backfill/get_backfill.rs index 6b3bd4fa..85e69ac5 100644 --- a/crates/ruma-federation-api/src/backfill/get_backfill.rs +++ b/crates/ruma-federation-api/src/backfill/get_backfill.rs @@ -8,8 +8,7 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1backfillroomid use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::MilliSecondsSinceUnixEpoch; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use ruma_identifiers::{EventId, RoomId, ServerName}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/device/get_devices.rs b/crates/ruma-federation-api/src/device/get_devices.rs index 3541df7b..558c76d2 100644 --- a/crates/ruma-federation-api/src/device/get_devices.rs +++ b/crates/ruma-federation-api/src/device/get_devices.rs @@ -8,8 +8,10 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1userdevicesuserid use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::encryption::{CrossSigningKey, DeviceKeys}; + use ruma_common::{ + api::ruma_api, + encryption::{CrossSigningKey, DeviceKeys}, + }; use ruma_identifiers::{DeviceId, UserId}; use ruma_serde::Raw; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/directory/get_public_rooms.rs b/crates/ruma-federation-api/src/directory/get_public_rooms.rs index 72c9061c..54a9531d 100644 --- a/crates/ruma-federation-api/src/directory/get_public_rooms.rs +++ b/crates/ruma-federation-api/src/directory/get_public_rooms.rs @@ -8,8 +8,10 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#post_matrixfederationv1publicrooms use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::directory::{IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork}; + use ruma_common::{ + api::ruma_api, + directory::{IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork}, + }; ruma_api! { metadata: { diff --git a/crates/ruma-federation-api/src/directory/get_public_rooms_filtered.rs b/crates/ruma-federation-api/src/directory/get_public_rooms_filtered.rs index 2fb97a8f..911b785f 100644 --- a/crates/ruma-federation-api/src/directory/get_public_rooms_filtered.rs +++ b/crates/ruma-federation-api/src/directory/get_public_rooms_filtered.rs @@ -8,9 +8,9 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#post_matrixfederationv1publicrooms use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::directory::{ - Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork, + use ruma_common::{ + api::ruma_api, + directory::{Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork}, }; ruma_api! { diff --git a/crates/ruma-federation-api/src/discovery/discover_homeserver.rs b/crates/ruma-federation-api/src/discovery/discover_homeserver.rs index e7d25782..877af61f 100644 --- a/crates/ruma-federation-api/src/discovery/discover_homeserver.rs +++ b/crates/ruma-federation-api/src/discovery/discover_homeserver.rs @@ -2,7 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#getwell-knownmatrixserver -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use ruma_identifiers::ServerName; ruma_api! { diff --git a/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs index 96746990..40181fed 100644 --- a/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs +++ b/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs @@ -8,8 +8,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixkeyv2queryservernamekeyid - use ruma_api::ruma_api; - use ruma_common::MilliSecondsSinceUnixEpoch; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use ruma_identifiers::ServerName; use ruma_serde::Raw; diff --git a/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs index 35ce262d..29539fdd 100644 --- a/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs +++ b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs @@ -10,8 +10,7 @@ pub mod v2 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::MilliSecondsSinceUnixEpoch; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use ruma_identifiers::{ServerName, ServerSigningKeyId}; use ruma_serde::Raw; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/discovery/get_server_keys.rs b/crates/ruma-federation-api/src/discovery/get_server_keys.rs index 894f41b0..480425d7 100644 --- a/crates/ruma-federation-api/src/discovery/get_server_keys.rs +++ b/crates/ruma-federation-api/src/discovery/get_server_keys.rs @@ -10,7 +10,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixkeyv2serverkeyid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_serde::Raw; use crate::discovery::ServerSigningKeys; diff --git a/crates/ruma-federation-api/src/discovery/get_server_version.rs b/crates/ruma-federation-api/src/discovery/get_server_version.rs index 9cfe4b98..92694e0f 100644 --- a/crates/ruma-federation-api/src/discovery/get_server_version.rs +++ b/crates/ruma-federation-api/src/discovery/get_server_version.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1version - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use serde::{Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-federation-api/src/event/get_event.rs b/crates/ruma-federation-api/src/event/get_event.rs index 20ea9c26..f84f67b1 100644 --- a/crates/ruma-federation-api/src/event/get_event.rs +++ b/crates/ruma-federation-api/src/event/get_event.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1eventeventid - use ruma_api::ruma_api; - use ruma_common::MilliSecondsSinceUnixEpoch; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use ruma_identifiers::{EventId, ServerName}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/event/get_missing_events.rs b/crates/ruma-federation-api/src/event/get_missing_events.rs index 412e4afa..7fed92a8 100644 --- a/crates/ruma-federation-api/src/event/get_missing_events.rs +++ b/crates/ruma-federation-api/src/event/get_missing_events.rs @@ -8,7 +8,7 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#post_matrixfederationv1get_missing_eventsroomid use js_int::{uint, UInt}; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/event/get_room_state.rs b/crates/ruma-federation-api/src/event/get_room_state.rs index 6fe7faea..d7101597 100644 --- a/crates/ruma-federation-api/src/event/get_room_state.rs +++ b/crates/ruma-federation-api/src/event/get_room_state.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1stateroomid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/event/get_room_state_ids.rs b/crates/ruma-federation-api/src/event/get_room_state_ids.rs index 901cdd62..d3b3076c 100644 --- a/crates/ruma-federation-api/src/event/get_room_state_ids.rs +++ b/crates/ruma-federation-api/src/event/get_room_state_ids.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1state_idsroomid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; ruma_api! { diff --git a/crates/ruma-federation-api/src/keys/claim_keys.rs b/crates/ruma-federation-api/src/keys/claim_keys.rs index ee250353..6cca6f32 100644 --- a/crates/ruma-federation-api/src/keys/claim_keys.rs +++ b/crates/ruma-federation-api/src/keys/claim_keys.rs @@ -9,8 +9,7 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::encryption::OneTimeKey; + use ruma_common::{api::ruma_api, encryption::OneTimeKey}; use ruma_identifiers::{DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId}; use ruma_serde::{Base64, Raw}; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/keys/get_keys.rs b/crates/ruma-federation-api/src/keys/get_keys.rs index cb539d15..03c5984e 100644 --- a/crates/ruma-federation-api/src/keys/get_keys.rs +++ b/crates/ruma-federation-api/src/keys/get_keys.rs @@ -9,8 +9,10 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::encryption::{CrossSigningKey, DeviceKeys}; + use ruma_common::{ + api::ruma_api, + encryption::{CrossSigningKey, DeviceKeys}, + }; use ruma_identifiers::{DeviceId, UserId}; use ruma_serde::Raw; diff --git a/crates/ruma-federation-api/src/knock/create_knock_event_template.rs b/crates/ruma-federation-api/src/knock/create_knock_event_template.rs index 6b06d2f2..38efef60 100644 --- a/crates/ruma-federation-api/src/knock/create_knock_event_template.rs +++ b/crates/ruma-federation-api/src/knock/create_knock_event_template.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1make_knockroomiduserid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, RoomVersionId, UserId}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/knock/send_knock.rs b/crates/ruma-federation-api/src/knock/send_knock.rs index dce4f894..8c7ef535 100644 --- a/crates/ruma-federation-api/src/knock/send_knock.rs +++ b/crates/ruma-federation-api/src/knock/send_knock.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv1send_knockroomideventid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::AnyStrippedStateEvent; use ruma_identifiers::{EventId, RoomId}; use ruma_serde::Raw; diff --git a/crates/ruma-federation-api/src/membership/create_invite/v1.rs b/crates/ruma-federation-api/src/membership/create_invite/v1.rs index 3c7b80a4..ea0d2c35 100644 --- a/crates/ruma-federation-api/src/membership/create_invite/v1.rs +++ b/crates/ruma-federation-api/src/membership/create_invite/v1.rs @@ -2,8 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv1inviteroomideventid -use ruma_api::ruma_api; -use ruma_common::MilliSecondsSinceUnixEpoch; +use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use ruma_events::{room::member::RoomMemberEventContent, AnyStrippedStateEvent, EventType}; use ruma_identifiers::{EventId, RoomId, ServerName, UserId}; use ruma_serde::Raw; diff --git a/crates/ruma-federation-api/src/membership/create_invite/v2.rs b/crates/ruma-federation-api/src/membership/create_invite/v2.rs index 5bafbb40..f7b4ef48 100644 --- a/crates/ruma-federation-api/src/membership/create_invite/v2.rs +++ b/crates/ruma-federation-api/src/membership/create_invite/v2.rs @@ -2,7 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv2inviteroomideventid -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use ruma_events::AnyStrippedStateEvent; use ruma_identifiers::{EventId, RoomId, RoomVersionId}; use ruma_serde::Raw; diff --git a/crates/ruma-federation-api/src/membership/create_join_event/v1.rs b/crates/ruma-federation-api/src/membership/create_join_event/v1.rs index 7b3b648b..b3315b1c 100644 --- a/crates/ruma-federation-api/src/membership/create_join_event/v1.rs +++ b/crates/ruma-federation-api/src/membership/create_join_event/v1.rs @@ -2,7 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv1send_joinroomideventid -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; @@ -59,7 +59,7 @@ impl Response { #[cfg(all(test, feature = "server", not(feature = "unstable-pre-spec")))] mod tests { - use ruma_api::OutgoingResponse; + use ruma_common::api::OutgoingResponse; use serde_json::{from_slice as from_json_slice, json, Value as JsonValue}; use super::{super::RoomState, Response}; diff --git a/crates/ruma-federation-api/src/membership/create_join_event/v2.rs b/crates/ruma-federation-api/src/membership/create_join_event/v2.rs index 0bcf08f7..45999bd5 100644 --- a/crates/ruma-federation-api/src/membership/create_join_event/v2.rs +++ b/crates/ruma-federation-api/src/membership/create_join_event/v2.rs @@ -2,7 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv2send_joinroomideventid -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs b/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs index 833957c9..906ca79d 100644 --- a/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs +++ b/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs @@ -3,8 +3,7 @@ //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv1send_leaveroomideventid use js_int::UInt; -use ruma_api::ruma_api; -use ruma_common::MilliSecondsSinceUnixEpoch; +use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use ruma_events::{room::member::RoomMemberEventContent, EventType}; use ruma_identifiers::{EventId, RoomId, ServerName, UserId}; use ruma_serde::Raw; diff --git a/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs b/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs index 108f263b..46c2d7db 100644 --- a/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs +++ b/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs @@ -2,7 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv2send_leaveroomideventid -use ruma_api::ruma_api; +use ruma_common::api::ruma_api; use ruma_identifiers::{EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; @@ -53,7 +53,7 @@ impl Response { #[cfg(all(test, feature = "server"))] mod tests { - use ruma_api::OutgoingResponse; + use ruma_common::api::OutgoingResponse; use super::Response; diff --git a/crates/ruma-federation-api/src/membership/prepare_join_event.rs b/crates/ruma-federation-api/src/membership/prepare_join_event.rs index 69eb9591..fa029b71 100644 --- a/crates/ruma-federation-api/src/membership/prepare_join_event.rs +++ b/crates/ruma-federation-api/src/membership/prepare_join_event.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1make_joinroomiduserid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, RoomVersionId, UserId}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/membership/prepare_leave_event.rs b/crates/ruma-federation-api/src/membership/prepare_leave_event.rs index f9a0bba7..9c349d36 100644 --- a/crates/ruma-federation-api/src/membership/prepare_leave_event.rs +++ b/crates/ruma-federation-api/src/membership/prepare_leave_event.rs @@ -8,7 +8,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1make_leaveroomiduserid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomId, RoomVersionId, UserId}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs b/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs index 8559d7de..315f228e 100644 --- a/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs +++ b/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1openiduserinfo - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-federation-api/src/query/get_custom_information.rs b/crates/ruma-federation-api/src/query/get_custom_information.rs index 5d8110a1..032b1e0b 100644 --- a/crates/ruma-federation-api/src/query/get_custom_information.rs +++ b/crates/ruma-federation-api/src/query/get_custom_information.rs @@ -9,7 +9,7 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use serde_json::Value as JsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/query/get_profile_information.rs b/crates/ruma-federation-api/src/query/get_profile_information.rs index 43d88323..8aba227b 100644 --- a/crates/ruma-federation-api/src/query/get_profile_information.rs +++ b/crates/ruma-federation-api/src/query/get_profile_information.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1queryprofile - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{MxcUri, UserId}; use ruma_serde::StringEnum; diff --git a/crates/ruma-federation-api/src/query/get_room_information.rs b/crates/ruma-federation-api/src/query/get_room_information.rs index 5c7c95e5..a4689241 100644 --- a/crates/ruma-federation-api/src/query/get_room_information.rs +++ b/crates/ruma-federation-api/src/query/get_room_information.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1querydirectory - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{RoomAliasId, RoomId, ServerName}; ruma_api! { diff --git a/crates/ruma-federation-api/src/space/get_hierarchy.rs b/crates/ruma-federation-api/src/space/get_hierarchy.rs index 29a7cb1f..4c028243 100644 --- a/crates/ruma-federation-api/src/space/get_hierarchy.rs +++ b/crates/ruma-federation-api/src/space/get_hierarchy.rs @@ -7,7 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1hierarchyroomid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::RoomId; use crate::space::{SpaceHierarchyChildSummary, SpaceHierarchyParentSummary}; diff --git a/crates/ruma-federation-api/src/thirdparty/bind_callback.rs b/crates/ruma-federation-api/src/thirdparty/bind_callback.rs index c4df5de3..fd967d9b 100644 --- a/crates/ruma-federation-api/src/thirdparty/bind_callback.rs +++ b/crates/ruma-federation-api/src/thirdparty/bind_callback.rs @@ -11,8 +11,7 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::thirdparty::Medium; + use ruma_common::{api::ruma_api, thirdparty::Medium}; use ruma_identifiers::{RoomId, ServerName, ServerSigningKeyId, UserId}; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs b/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs index 563554d3..6b1ee154 100644 --- a/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs +++ b/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs @@ -11,7 +11,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv1exchange_third_party_inviteroomid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_events::{room::member::ThirdPartyInvite, EventType}; use ruma_identifiers::{RoomId, UserId}; diff --git a/crates/ruma-federation-api/src/transactions/send_transaction_message.rs b/crates/ruma-federation-api/src/transactions/send_transaction_message.rs index 093ab90d..1b168af2 100644 --- a/crates/ruma-federation-api/src/transactions/send_transaction_message.rs +++ b/crates/ruma-federation-api/src/transactions/send_transaction_message.rs @@ -9,8 +9,7 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_api::ruma_api; - use ruma_common::MilliSecondsSinceUnixEpoch; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; use ruma_identifiers::{EventId, ServerName, TransactionId}; use ruma_serde::Raw; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-identity-service-api/Cargo.toml b/crates/ruma-identity-service-api/Cargo.toml index a90310b5..781adee3 100644 --- a/crates/ruma-identity-service-api/Cargo.toml +++ b/crates/ruma-identity-service-api/Cargo.toml @@ -19,8 +19,7 @@ server = [] [dependencies] js_int = { version = "0.2.0", features = ["serde"] } -ruma-api = { version = "0.20.0", path = "../ruma-api" } -ruma-common = { version = "0.8.0", path = "../ruma-common" } +ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api"] } ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } serde = { version = "1.0.118", features = ["derive"] } diff --git a/crates/ruma-identity-service-api/src/association/bind_3pid.rs b/crates/ruma-identity-service-api/src/association/bind_3pid.rs index a769229c..c3417c96 100644 --- a/crates/ruma-identity-service-api/src/association/bind_3pid.rs +++ b/crates/ruma-identity-service-api/src/association/bind_3pid.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv23pidbind - use ruma_api::ruma_api; - use ruma_common::{thirdparty::Medium, MilliSecondsSinceUnixEpoch}; + use ruma_common::{api::ruma_api, thirdparty::Medium, MilliSecondsSinceUnixEpoch}; use ruma_identifiers::{ClientSecret, ServerSignatures, SessionId, UserId}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/association/check_3pid_validity.rs b/crates/ruma-identity-service-api/src/association/check_3pid_validity.rs index c5409d83..9595e560 100644 --- a/crates/ruma-identity-service-api/src/association/check_3pid_validity.rs +++ b/crates/ruma-identity-service-api/src/association/check_3pid_validity.rs @@ -8,8 +8,7 @@ pub mod v2 { //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv23pidgetvalidated3pid use js_int::UInt; - use ruma_api::ruma_api; - use ruma_common::thirdparty::Medium; + use ruma_common::{api::ruma_api, thirdparty::Medium}; use ruma_identifiers::{ClientSecret, SessionId}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs b/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs index 40519e8d..a8d3d4d7 100644 --- a/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs +++ b/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs @@ -8,7 +8,7 @@ pub mod v2 { //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2validateemailrequesttoken use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/association/email/validate_email.rs b/crates/ruma-identity-service-api/src/association/email/validate_email.rs index ad62bd97..644615b4 100644 --- a/crates/ruma-identity-service-api/src/association/email/validate_email.rs +++ b/crates/ruma-identity-service-api/src/association/email/validate_email.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2validateemailsubmittoken - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs b/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs index 90a1fbc7..123b698c 100644 --- a/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs +++ b/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2validateemailsubmittoken - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs b/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs index ce4c16fb..df2a6615 100644 --- a/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs +++ b/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs @@ -8,7 +8,7 @@ pub mod v2 { //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2validatemsisdnrequesttoken use js_int::UInt; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs index 027204c1..61893971 100644 --- a/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs +++ b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2validatemsisdnsubmittoken - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs index b75ae175..3c7ea2ce 100644 --- a/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs +++ b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2validatemsisdnsubmittoken - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ClientSecret, SessionId}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/association/unbind_3pid.rs b/crates/ruma-identity-service-api/src/association/unbind_3pid.rs index 55ac702e..c209b56d 100644 --- a/crates/ruma-identity-service-api/src/association/unbind_3pid.rs +++ b/crates/ruma-identity-service-api/src/association/unbind_3pid.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv23pidunbind - use ruma_api::ruma_api; - use ruma_common::thirdparty::Medium; + use ruma_common::{api::ruma_api, thirdparty::Medium}; use ruma_identifiers::{user_id::UserId, ClientSecret, SessionId}; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-identity-service-api/src/authentication/get_account_information.rs b/crates/ruma-identity-service-api/src/authentication/get_account_information.rs index 3a6a7bfd..d9343b62 100644 --- a/crates/ruma-identity-service-api/src/authentication/get_account_information.rs +++ b/crates/ruma-identity-service-api/src/authentication/get_account_information.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2account - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/authentication/logout.rs b/crates/ruma-identity-service-api/src/authentication/logout.rs index 5943b2d4..44893ef2 100644 --- a/crates/ruma-identity-service-api/src/authentication/logout.rs +++ b/crates/ruma-identity-service-api/src/authentication/logout.rs @@ -8,7 +8,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2accountlogout - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/authentication/register.rs b/crates/ruma-identity-service-api/src/authentication/register.rs index 7b3f0912..443a7c45 100644 --- a/crates/ruma-identity-service-api/src/authentication/register.rs +++ b/crates/ruma-identity-service-api/src/authentication/register.rs @@ -9,8 +9,7 @@ pub mod v2 { use std::time::Duration; - use ruma_api::ruma_api; - use ruma_common::authentication::TokenType; + use ruma_common::{api::ruma_api, authentication::TokenType}; use ruma_identifiers::ServerName; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/invitation/sign_invitation_ed25519.rs b/crates/ruma-identity-service-api/src/invitation/sign_invitation_ed25519.rs index df370060..b1300527 100644 --- a/crates/ruma-identity-service-api/src/invitation/sign_invitation_ed25519.rs +++ b/crates/ruma-identity-service-api/src/invitation/sign_invitation_ed25519.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2sign-ed25519 - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::{ServerSignatures, UserId}; use ruma_serde::Base64; diff --git a/crates/ruma-identity-service-api/src/invitation/store_invitation.rs b/crates/ruma-identity-service-api/src/invitation/store_invitation.rs index 3f447d2c..900e4c90 100644 --- a/crates/ruma-identity-service-api/src/invitation/store_invitation.rs +++ b/crates/ruma-identity-service-api/src/invitation/store_invitation.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2store-invite - use ruma_api::ruma_api; - use ruma_common::{room::RoomType, thirdparty::Medium}; + use ruma_common::{api::ruma_api, room::RoomType, thirdparty::Medium}; use ruma_identifiers::{MxcUri, RoomAliasId, RoomId, RoomName, UserId}; use serde::{ser::SerializeSeq, Deserialize, Serialize}; diff --git a/crates/ruma-identity-service-api/src/keys/check_public_key_validity.rs b/crates/ruma-identity-service-api/src/keys/check_public_key_validity.rs index c41b1b79..c4f4203d 100644 --- a/crates/ruma-identity-service-api/src/keys/check_public_key_validity.rs +++ b/crates/ruma-identity-service-api/src/keys/check_public_key_validity.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2pubkeyisvalid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_serde::Base64; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/keys/get_public_key.rs b/crates/ruma-identity-service-api/src/keys/get_public_key.rs index 3190869d..cb0abb8b 100644 --- a/crates/ruma-identity-service-api/src/keys/get_public_key.rs +++ b/crates/ruma-identity-service-api/src/keys/get_public_key.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2pubkeykeyid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::ServerSigningKeyId; use ruma_serde::Base64; diff --git a/crates/ruma-identity-service-api/src/keys/validate_ephemeral_key.rs b/crates/ruma-identity-service-api/src/keys/validate_ephemeral_key.rs index c5bbcfeb..739ca7a4 100644 --- a/crates/ruma-identity-service-api/src/keys/validate_ephemeral_key.rs +++ b/crates/ruma-identity-service-api/src/keys/validate_ephemeral_key.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2pubkeyephemeralisvalid - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_serde::Base64; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/lookup/get_hash_parameters.rs b/crates/ruma-identity-service-api/src/lookup/get_hash_parameters.rs index 0af7dbde..f86e0ea1 100644 --- a/crates/ruma-identity-service-api/src/lookup/get_hash_parameters.rs +++ b/crates/ruma-identity-service-api/src/lookup/get_hash_parameters.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2hash_details - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use crate::lookup::IdentifierHashingAlgorithm; diff --git a/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs b/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs index db3eeba3..97677dc7 100644 --- a/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs +++ b/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs @@ -9,7 +9,7 @@ pub mod v2 { use std::collections::BTreeMap; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use ruma_identifiers::UserId; use crate::lookup::IdentifierHashingAlgorithm; diff --git a/crates/ruma-identity-service-api/src/status.rs b/crates/ruma-identity-service-api/src/status.rs index 6effd46b..b1633997 100644 --- a/crates/ruma-identity-service-api/src/status.rs +++ b/crates/ruma-identity-service-api/src/status.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2 - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/tos/accept_terms_of_service.rs b/crates/ruma-identity-service-api/src/tos/accept_terms_of_service.rs index 8f700ed9..1c844f29 100644 --- a/crates/ruma-identity-service-api/src/tos/accept_terms_of_service.rs +++ b/crates/ruma-identity-service-api/src/tos/accept_terms_of_service.rs @@ -7,7 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2terms - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/tos/get_terms_of_service.rs b/crates/ruma-identity-service-api/src/tos/get_terms_of_service.rs index c2ba605d..2768d1ad 100644 --- a/crates/ruma-identity-service-api/src/tos/get_terms_of_service.rs +++ b/crates/ruma-identity-service-api/src/tos/get_terms_of_service.rs @@ -9,7 +9,7 @@ pub mod v2 { use std::collections::BTreeMap; - use ruma_api::ruma_api; + use ruma_common::api::ruma_api; use serde::{Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-macros/src/api.rs b/crates/ruma-macros/src/api.rs index b2b7517b..5b721258 100644 --- a/crates/ruma-macros/src/api.rs +++ b/crates/ruma-macros/src/api.rs @@ -1,6 +1,4 @@ -//! Methods and types for generating [ruma-api] endpoints. -//! -//! [ruma-api]: https://github.com/ruma/ruma/tree/main/ruma-api +//! Methods and types for generating API endpoints. use proc_macro2::TokenStream; use quote::quote; diff --git a/crates/ruma-macros/src/api/util.rs b/crates/ruma-macros/src/api/util.rs index ceff9b74..f82fbe7c 100644 --- a/crates/ruma-macros/src/api/util.rs +++ b/crates/ruma-macros/src/api/util.rs @@ -8,9 +8,9 @@ use quote::{format_ident, quote, ToTokens}; use syn::{parse_quote, visit::Visit, Attribute, Lifetime, NestedMeta, Type}; pub fn import_ruma_api() -> TokenStream { - if let Ok(FoundCrate::Name(name)) = crate_name("ruma-api") { + if let Ok(FoundCrate::Name(name)) = crate_name("ruma-common") { let import = format_ident!("{}", name); - quote! { ::#import } + quote! { ::#import::api } } else if let Ok(FoundCrate::Name(name)) = crate_name("ruma") { let import = format_ident!("{}", name); quote! { ::#import::api } @@ -21,7 +21,7 @@ pub fn import_ruma_api() -> TokenStream { let import = format_ident!("{}", name); quote! { ::#import::ruma::api } } else { - quote! { ::ruma_api } + quote! { ::ruma_common::api } } } diff --git a/crates/ruma-macros/src/api/version.rs b/crates/ruma-macros/src/api/version.rs index e72e6cc7..c7687bf7 100644 --- a/crates/ruma-macros/src/api/version.rs +++ b/crates/ruma-macros/src/api/version.rs @@ -41,6 +41,6 @@ impl Parse for MatrixVersionLiteral { impl ToTokens for MatrixVersionLiteral { fn to_tokens(&self, tokens: &mut TokenStream) { let variant = format_ident!("V{}_{}", u8::from(self.major), self.minor); - tokens.extend(quote! { ::ruma_api::MatrixVersion::#variant }); + tokens.extend(quote! { ::ruma_common::api::MatrixVersion::#variant }); } } diff --git a/crates/ruma-macros/src/lib.rs b/crates/ruma-macros/src/lib.rs index 669a011c..5de1219d 100644 --- a/crates/ruma-macros/src/lib.rs +++ b/crates/ruma-macros/src/lib.rs @@ -396,11 +396,12 @@ pub fn fake_derive_serde(_input: TokenStream) -> TokenStream { TokenStream::new() } -/// A procedural macro for easily generating [ruma-api]-compatible endpoints. +/// A procedural macro for easily generating API endpoints. /// -/// Note that for technical reasons, the `ruma_api!` macro is only documented in ruma-api, not here. +/// Note that for technical reasons, the `ruma_api!` macro is only documented in [ruma-common], not +/// here. /// -/// [ruma-api]: https://github.com/ruma/ruma/tree/main/ruma-api +/// [ruma-common]: https://github.com/ruma/ruma/tree/main/ruma-common #[proc_macro] pub fn ruma_api(input: TokenStream) -> TokenStream { let api = parse_macro_input!(input as Api); diff --git a/crates/ruma-push-gateway-api/Cargo.toml b/crates/ruma-push-gateway-api/Cargo.toml index 0891207c..19641228 100644 --- a/crates/ruma-push-gateway-api/Cargo.toml +++ b/crates/ruma-push-gateway-api/Cargo.toml @@ -19,8 +19,7 @@ server = [] [dependencies] js_int = { version = "0.2.0", features = ["serde"] } -ruma-api = { version = "0.20.0", path = "../ruma-api" } -ruma-common = { version = "0.8.0", path = "../ruma-common" } +ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api"] } ruma-events = { version = "0.26.0", path = "../ruma-events" } ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } diff --git a/crates/ruma-push-gateway-api/src/send_event_notification.rs b/crates/ruma-push-gateway-api/src/send_event_notification.rs index df2a6f22..b9baa903 100644 --- a/crates/ruma-push-gateway-api/src/send_event_notification.rs +++ b/crates/ruma-push-gateway-api/src/send_event_notification.rs @@ -9,8 +9,8 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/push-gateway-api/#post_matrixpushv1notify use js_int::UInt; - use ruma_api::ruma_api; use ruma_common::{ + api::ruma_api, push::{PusherData, Tweak}, SecondsSinceUnixEpoch, }; diff --git a/crates/ruma/Cargo.toml b/crates/ruma/Cargo.toml index 86fb7268..13f3fa9e 100644 --- a/crates/ruma/Cargo.toml +++ b/crates/ruma/Cargo.toml @@ -15,7 +15,7 @@ all-features = true rustdoc-args = ["--cfg", "docsrs"] [features] -api = ["ruma-api"] +api = ["ruma-common/api"] client = ["ruma-client"] events = ["ruma-events"] signatures = ["ruma-signatures"] @@ -154,7 +154,6 @@ ruma-events = { version = "0.26.0", path = "../ruma-events", optional = true } ruma-signatures = { version = "0.10.0", path = "../ruma-signatures", optional = true } ruma-state-res = { version = "0.6.0", path = "../ruma-state-res", optional = true } -ruma-api = { version = "0.20.0", path = "../ruma-api", optional = true } ruma-appservice-api = { version = "0.5.0", path = "../ruma-appservice-api", optional = true } ruma-client-api = { version = "0.13.0", path = "../ruma-client-api", optional = true } ruma-federation-api = { version = "0.4.0", path = "../ruma-federation-api", optional = true } diff --git a/crates/ruma/examples/hello_isahc.rs b/crates/ruma/examples/hello_isahc.rs index 1f6bbba4..8f2192b0 100644 --- a/crates/ruma/examples/hello_isahc.rs +++ b/crates/ruma/examples/hello_isahc.rs @@ -8,7 +8,7 @@ use ruma::{ events::room::message::RoomMessageEventContent, RoomAliasId, }; -use ruma_api::MatrixVersion; +use ruma_common::api::MatrixVersion; async fn hello_world( homeserver_url: String, diff --git a/crates/ruma/src/lib.rs b/crates/ruma/src/lib.rs index 22e27acb..f26ecc77 100644 --- a/crates/ruma/src/lib.rs +++ b/crates/ruma/src/lib.rs @@ -94,7 +94,7 @@ pub use ruma_state_res as state_res; /// [apis]: https://spec.matrix.org/v1.2/#matrix-apis #[cfg(feature = "api")] pub mod api { - pub use ruma_api::*; + pub use ruma_common::api::*; #[cfg(feature = "ruma-appservice-api")] #[cfg_attr( @@ -159,7 +159,10 @@ pub use assign::assign; pub use js_int::{int, uint, Int, UInt}; #[cfg(feature = "client-ext-client-api")] pub use ruma_client::Client; -pub use ruma_common::*; +pub use ruma_common::{ + authentication, directory, encryption, power_levels, presence, push, receipt, room, thirdparty, + to_device, MilliSecondsSinceUnixEpoch, PrivOwnedStr, SecondsSinceUnixEpoch, +}; pub use ruma_identifiers::{ device_id, device_key_id, event_id, matrix_uri, mxc_uri, room_alias_id, room_id, room_version_id, server_name, server_signing_key_id, user_id, ClientSecret, DeviceId,