From 418f92153d275590874145f0280b55b4c942f71f Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 15 Jun 2020 19:21:04 +0200 Subject: [PATCH] ruma-client-api: Re-add r0::push::Action as deprecated, update change log --- ruma-client-api/CHANGELOG.md | 7 ++++--- ruma-client-api/src/r0/push.rs | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ruma-client-api/CHANGELOG.md b/ruma-client-api/CHANGELOG.md index 597b3796..205548dc 100644 --- a/ruma-client-api/CHANGELOG.md +++ b/ruma-client-api/CHANGELOG.md @@ -13,7 +13,7 @@ Breaking changes: * Change `federated`s type from `Option` to `bool` * Add `predecessor` field * Update `r0::push::get_pushrules_all` and `r0::push::get_pushrules_global_scope` to use the - `Ruleset` type from `ruma_events` + `Ruleset` type from `ruma_common::push` (also available as `ruma::push`) * Fix event types in `r0::context::get_context` * Fix event types in `r0::sync::sync_events` @@ -25,8 +25,9 @@ Improvements: Deprecations: -* `r0::sync::sync_events::SetPresence` has been renamed to `PresenceState`. It is still available - under its previous name, but only for one release. +* `r0::sync::sync_events::SetPresence` has been moved and renamed. Use `presence::PresenceState` + from `ruma` or `ruma-common`. +* `r0::push::Action` has been moved. Import it from `ruma` or `ruma-common`. # 0.9.0 diff --git a/ruma-client-api/src/r0/push.rs b/ruma-client-api/src/r0/push.rs index 9d166675..fefc20c5 100644 --- a/ruma-client-api/src/r0/push.rs +++ b/ruma-client-api/src/r0/push.rs @@ -2,7 +2,7 @@ use std::convert::TryFrom; -use ruma_common::push::{Action, PushCondition}; +use ruma_common::push::PushCondition; use serde::{Deserialize, Serialize}; use strum::{Display, EnumString}; @@ -19,6 +19,9 @@ pub mod set_pushrule; pub mod set_pushrule_actions; pub mod set_pushrule_enabled; +#[deprecated = "use `push::Action` from `ruma` or `ruma-common` instead"] +pub use ruma_common::push::Action; + /// The kinds of push rules that are available #[derive( Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Display, EnumString,