diff --git a/crates/ruma-client-api/src/push/set_pushrule.rs b/crates/ruma-client-api/src/push/set_pushrule.rs index 6cfcf008..9702837c 100644 --- a/crates/ruma-client-api/src/push/set_pushrule.rs +++ b/crates/ruma-client-api/src/push/set_pushrule.rs @@ -7,10 +7,7 @@ pub mod v3 { use ruma_common::{ api::ruma_api, - push::{ - Action, NewConditionalPushRule, NewPatternedPushRule, NewPushRule, NewSimplePushRule, - PushCondition, - }, + push::{Action, NewPushRule, PushCondition}, serde::Incoming, }; use serde::{Deserialize, Serialize}; @@ -132,6 +129,10 @@ pub mod v3 { B: AsRef<[u8]>, S: AsRef, { + use ruma_common::push::{ + NewConditionalPushRule, NewPatternedPushRule, NewSimplePushRule, + }; + // Exhaustive enum to fail deserialization on unknown variants. #[derive(Debug, Deserialize)] #[serde(rename_all = "lowercase")] @@ -143,6 +144,12 @@ pub mod v3 { Content, } + #[derive(Deserialize)] + struct IncomingRequestQuery { + before: Option, + after: Option, + } + let (scope, kind, rule_id): (RuleScope, RuleKind, String) = serde::Deserialize::deserialize(serde::de::value::SeqDeserializer::< _, @@ -197,13 +204,6 @@ pub mod v3 { after: Option<&'a str>, } - #[derive(Debug, Deserialize)] - struct IncomingRequestQuery { - before: Option, - - after: Option, - } - #[derive(Debug, Serialize)] #[serde(untagged)] enum RequestBody {