From b89a18fa16137d464354d89830fbd3491cf8024f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <76261501+zecakeh@users.noreply.github.com> Date: Mon, 12 Apr 2021 18:57:04 +0200 Subject: [PATCH] client-api: Fix check warnings and tests with no feature enabled --- ruma-api-macros/src/api.rs | 3 +++ .../src/r0/directory/get_public_rooms.rs | 5 +++-- .../src/r0/message/get_message_events.rs | 2 +- .../src/r0/message/send_message_event.rs | 10 ++++++---- ruma-client-api/src/r0/session/login.rs | 13 ++++++++----- ruma-client-api/src/r0/session/sso_login.rs | 2 +- .../src/r0/state/get_state_events_for_key.rs | 6 +++--- ruma-client-api/src/r0/state/send_state_event.rs | 10 ++++++---- 8 files changed, 31 insertions(+), 20 deletions(-) diff --git a/ruma-api-macros/src/api.rs b/ruma-api-macros/src/api.rs index 2b5693ae..ce703e77 100644 --- a/ruma-api-macros/src/api.rs +++ b/ruma-api-macros/src/api.rs @@ -84,5 +84,8 @@ pub fn expand_all(api: Api) -> syn::Result { #request #response + + #[cfg(not(any(feature = "client", feature = "server")))] + type _SilenceUnusedError = #error_ty; }) } diff --git a/ruma-client-api/src/r0/directory/get_public_rooms.rs b/ruma-client-api/src/r0/directory/get_public_rooms.rs index bc4f2556..17d563b5 100644 --- a/ruma-client-api/src/r0/directory/get_public_rooms.rs +++ b/ruma-client-api/src/r0/directory/get_public_rooms.rs @@ -69,16 +69,17 @@ impl Response { } } -#[cfg(test)] +#[cfg(all(test, any(feature = "client", feature = "server")))] mod tests { use std::convert::TryInto; use js_int::uint; - use ruma_api::OutgoingRequest as _; #[cfg(feature = "client")] #[test] fn construct_request_from_refs() { + use ruma_api::OutgoingRequest; + let req: http::Request> = super::Request { limit: Some(uint!(10)), since: Some("hello"), diff --git a/ruma-client-api/src/r0/message/get_message_events.rs b/ruma-client-api/src/r0/message/get_message_events.rs index 69311972..3aef2627 100644 --- a/ruma-client-api/src/r0/message/get_message_events.rs +++ b/ruma-client-api/src/r0/message/get_message_events.rs @@ -131,7 +131,7 @@ pub enum Direction { Forward, } -#[cfg(test)] +#[cfg(all(test, feature = "client"))] mod tests { use js_int::uint; use ruma_api::OutgoingRequest; diff --git a/ruma-client-api/src/r0/message/send_message_event.rs b/ruma-client-api/src/r0/message/send_message_event.rs index ab308c4f..31600ef7 100644 --- a/ruma-client-api/src/r0/message/send_message_event.rs +++ b/ruma-client-api/src/r0/message/send_message_event.rs @@ -1,7 +1,7 @@ //! [PUT /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId}](https://matrix.org/docs/spec/client_server/r0.6.1#put-matrix-client-r0-rooms-roomid-send-eventtype-txnid) -use ruma_api::{ruma_api, Metadata}; -use ruma_events::{AnyMessageEventContent, EventContent as _}; +use ruma_api::ruma_api; +use ruma_events::AnyMessageEventContent; use ruma_identifiers::{EventId, RoomId}; use ruma_serde::Outgoing; @@ -63,7 +63,7 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> { type EndpointError = crate::Error; type IncomingResponse = Response; - const METADATA: Metadata = METADATA; + const METADATA: ruma_api::Metadata = METADATA; fn try_into_http_request( self, @@ -72,6 +72,7 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> { ) -> Result>, ruma_api::error::IntoHttpError> { use http::header::{HeaderValue, AUTHORIZATION, CONTENT_TYPE}; use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC}; + use ruma_events::EventContent; let http_request = http::Request::builder() .method(http::Method::PUT) @@ -101,7 +102,7 @@ impl ruma_api::IncomingRequest for IncomingRequest { type EndpointError = crate::Error; type OutgoingResponse = Response; - const METADATA: Metadata = METADATA; + const METADATA: ruma_api::Metadata = METADATA; fn try_from_http_request( request: http::Request>, @@ -109,6 +110,7 @@ impl ruma_api::IncomingRequest for IncomingRequest { use std::convert::TryFrom; use ruma_api::try_deserialize; + use ruma_events::EventContent; use serde_json::value::RawValue as RawJsonValue; let path_segments: Vec<&str> = request.uri().path()[1..].split('/').collect(); diff --git a/ruma-client-api/src/r0/session/login.rs b/ruma-client-api/src/r0/session/login.rs index d2040ac6..a64f9fb0 100644 --- a/ruma-client-api/src/r0/session/login.rs +++ b/ruma-client-api/src/r0/session/login.rs @@ -154,12 +154,9 @@ mod user_serde; #[cfg(test)] mod tests { use matches::assert_matches; - use ruma_api::OutgoingRequest; - use serde_json::{from_value as from_json_value, json, Value as JsonValue}; + use serde_json::{from_value as from_json_value, json}; - use super::{ - IncomingLoginInfo, IncomingUserIdentifier, LoginInfo, Medium, Request, UserIdentifier, - }; + use super::{IncomingLoginInfo, IncomingUserIdentifier}; #[test] fn deserialize_login_type() { @@ -202,7 +199,13 @@ mod tests { } #[test] + #[cfg(feature = "client")] fn serialize_login_request_body() { + use ruma_api::OutgoingRequest; + use serde_json::Value as JsonValue; + + use super::{LoginInfo, Medium, Request, UserIdentifier}; + let req: http::Request> = Request { login_info: LoginInfo::Token { token: "0xdeadbeef" }, device_id: None, diff --git a/ruma-client-api/src/r0/session/sso_login.rs b/ruma-client-api/src/r0/session/sso_login.rs index 6e7ffd1f..b3a04e2a 100644 --- a/ruma-client-api/src/r0/session/sso_login.rs +++ b/ruma-client-api/src/r0/session/sso_login.rs @@ -44,7 +44,7 @@ impl Response { } } -#[cfg(test)] +#[cfg(all(test, feature = "client"))] mod tests { use ruma_api::OutgoingRequest; diff --git a/ruma-client-api/src/r0/state/get_state_events_for_key.rs b/ruma-client-api/src/r0/state/get_state_events_for_key.rs index fdb58db1..7ee0994f 100644 --- a/ruma-client-api/src/r0/state/get_state_events_for_key.rs +++ b/ruma-client-api/src/r0/state/get_state_events_for_key.rs @@ -1,6 +1,6 @@ //! [GET /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-rooms-roomid-state-eventtype-statekey) -use ruma_api::{ruma_api, Metadata}; +use ruma_api::ruma_api; use ruma_events::EventType; use ruma_identifiers::RoomId; use ruma_serde::Outgoing; @@ -61,7 +61,7 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> { type EndpointError = crate::Error; type IncomingResponse = ::Incoming; - const METADATA: Metadata = METADATA; + const METADATA: ruma_api::Metadata = METADATA; fn try_into_http_request( self, @@ -106,7 +106,7 @@ impl ruma_api::IncomingRequest for IncomingRequest { type EndpointError = crate::Error; type OutgoingResponse = Response; - const METADATA: Metadata = METADATA; + const METADATA: ruma_api::Metadata = METADATA; fn try_from_http_request( request: http::Request>, diff --git a/ruma-client-api/src/r0/state/send_state_event.rs b/ruma-client-api/src/r0/state/send_state_event.rs index 83e76164..8bfb8ee7 100644 --- a/ruma-client-api/src/r0/state/send_state_event.rs +++ b/ruma-client-api/src/r0/state/send_state_event.rs @@ -1,7 +1,7 @@ //! [PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.6.1#put-matrix-client-r0-rooms-roomid-state-eventtype-statekey) -use ruma_api::{ruma_api, Metadata}; -use ruma_events::{AnyStateEventContent, EventContent as _}; +use ruma_api::ruma_api; +use ruma_events::AnyStateEventContent; use ruma_identifiers::{EventId, RoomId}; use ruma_serde::Outgoing; @@ -59,7 +59,7 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> { type EndpointError = crate::Error; type IncomingResponse = Response; - const METADATA: Metadata = METADATA; + const METADATA: ruma_api::Metadata = METADATA; fn try_into_http_request( self, @@ -70,6 +70,7 @@ impl<'a> ruma_api::OutgoingRequest for Request<'a> { use http::header::{HeaderValue, AUTHORIZATION, CONTENT_TYPE}; use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC}; + use ruma_events::EventContent; let mut url = format!( "{}/_matrix/client/r0/rooms/{}/state/{}", @@ -105,7 +106,7 @@ impl ruma_api::IncomingRequest for IncomingRequest { type EndpointError = crate::Error; type OutgoingResponse = Response; - const METADATA: Metadata = METADATA; + const METADATA: ruma_api::Metadata = METADATA; fn try_from_http_request( request: http::Request>, @@ -113,6 +114,7 @@ impl ruma_api::IncomingRequest for IncomingRequest { use std::convert::TryFrom; use ruma_api::try_deserialize; + use ruma_events::EventContent; use serde_json::value::RawValue as RawJsonValue; let path_segments: Vec<&str> = request.uri().path()[1..].split('/').collect();