From d7463ce37df1c7c99d5205e2d11e32094863c8ff Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sun, 26 Jul 2020 16:24:36 +0200
Subject: [PATCH] Remove things that can't be properly deprecated

See https://github.com/rust-lang/rust/issues/47236
---
 ruma-client-api/CHANGELOG.md               | 9 +++------
 ruma-client-api/src/r0/push.rs             | 3 ---
 ruma-client-api/src/r0/sync/sync_events.rs | 3 ---
 ruma-events/CHANGELOG.md                   | 8 +++-----
 ruma-events/src/lib.rs                     | 6 ------
 ruma-events/src/presence.rs                | 3 ---
 6 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/ruma-client-api/CHANGELOG.md b/ruma-client-api/CHANGELOG.md
index c9036020..52036f9b 100644
--- a/ruma-client-api/CHANGELOG.md
+++ b/ruma-client-api/CHANGELOG.md
@@ -32,6 +32,9 @@ Breaking changes:
   ```
 * Rename `r0::search::search_events::{RoomEventJsons => ResultRoomEvents}`. The previous name was an
   error introduced in a mass search and replace
+* `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`.
 
 Improvements:
 
@@ -43,12 +46,6 @@ Improvements:
   * `r0::message::get_message_events`
 * Add `logout_devices` field to `r0::account::change_password`
 
-Deprecations:
-
-* `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
 
 Bug fixes:
diff --git a/ruma-client-api/src/r0/push.rs b/ruma-client-api/src/r0/push.rs
index e1c9fd90..b6bde065 100644
--- a/ruma-client-api/src/r0/push.rs
+++ b/ruma-client-api/src/r0/push.rs
@@ -19,9 +19,6 @@ 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,
diff --git a/ruma-client-api/src/r0/sync/sync_events.rs b/ruma-client-api/src/r0/sync/sync_events.rs
index cd47b3d9..05639434 100644
--- a/ruma-client-api/src/r0/sync/sync_events.rs
+++ b/ruma-client-api/src/r0/sync/sync_events.rs
@@ -93,9 +93,6 @@ ruma_api! {
     error: crate::Error
 }
 
-#[deprecated = "use `presence::PresenceState` from `ruma` or `ruma-common` instead"]
-pub use ruma_common::presence::PresenceState as SetPresence;
-
 /// A filter represented either as its full JSON definition or the ID of a saved filter.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[allow(clippy::large_enum_variant)]
diff --git a/ruma-events/CHANGELOG.md b/ruma-events/CHANGELOG.md
index c5fb4f8d..ad9b8370 100644
--- a/ruma-events/CHANGELOG.md
+++ b/ruma-events/CHANGELOG.md
@@ -12,17 +12,15 @@ Breaking changes:
   * This change removes the types `EventMatchCondition`, `RoomMemberCountCondition` and
     `SenderNotificationPermissionCondition`
 * Add PDU types: `pdu::{Pdu, PduStub}`
+* `presence::PresenceState` has been moved. Import it from `ruma` or `ruma-common`.
+* `EventJson` has been moved and renamed. Import it from `ruma` or `ruma-common`.
+
 
 Improvements:
 
 * Add `room::MessageFormat` and `room::FormattedBody`
 * Skip serialization of optional values on `room::encryption::EncryptionEventContent`
 
-Deprecations:
-
-* `presence::PresenceState` has been moved. Import it from `ruma` or `ruma-common`.
-* `EventJson` has been moved and renamed. Import it from `ruma` or `ruma-common`.
-
 # 0.21.3
 
 Bug fixes:
diff --git a/ruma-events/src/lib.rs b/ruma-events/src/lib.rs
index 01e2cb26..edbfe55f 100644
--- a/ruma-events/src/lib.rs
+++ b/ruma-events/src/lib.rs
@@ -130,9 +130,6 @@ use serde_json::value::RawValue as RawJsonValue;
 
 use self::room::redaction::{RedactionEvent, SyncRedactionEvent};
 
-#[deprecated = "Use ruma_serde::empty::Empty directly instead."]
-pub use ruma_serde::empty::Empty;
-
 mod algorithm;
 mod enums;
 mod error;
@@ -185,9 +182,6 @@ pub use self::{
     event_type::EventType,
 };
 
-#[deprecated = "Use ruma_common::Raw instead."]
-pub use ruma_common::Raw as EventJson;
-
 /// Extra information about an event that is not incorporated into the event's
 /// hash.
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
diff --git a/ruma-events/src/presence.rs b/ruma-events/src/presence.rs
index 327df381..7202b58c 100644
--- a/ruma-events/src/presence.rs
+++ b/ruma-events/src/presence.rs
@@ -7,9 +7,6 @@ use ruma_events_macros::{Event, EventContent};
 use ruma_identifiers::UserId;
 use serde::{Deserialize, Serialize};
 
-#[deprecated = "use `presence::PresenceState` from `ruma` or `ruma-common` instead"]
-pub use ruma_common::presence::PresenceState;
-
 /// Presence event.
 #[derive(Clone, Debug, Event)]
 pub struct PresenceEvent {