From af954220bdb85438fa0b1174969718bf0f29a210 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Wed, 6 Feb 2019 20:36:39 +0100
Subject: [PATCH] Replace serde_derive by re-exports in serde

---
 Cargo.toml                                           | 8 +++++---
 src/r0/account/change_password.rs                    | 2 +-
 src/r0/account/register.rs                           | 2 +-
 src/r0/account/request_password_change_token.rs      | 2 +-
 src/r0/account/request_register_token.rs             | 2 +-
 src/r0/alias/create_alias.rs                         | 2 +-
 src/r0/alias/delete_alias.rs                         | 2 +-
 src/r0/alias/get_alias.rs                            | 2 +-
 src/r0/config/set_global_account_data.rs             | 2 +-
 src/r0/config/set_room_account_data.rs               | 2 +-
 src/r0/contact/create_contact.rs                     | 2 +-
 src/r0/contact/get_contacts.rs                       | 2 +-
 src/r0/contact/request_contact_verification_token.rs | 2 +-
 src/r0/context/get_context.rs                        | 2 +-
 src/r0/directory/get_public_rooms.rs                 | 2 +-
 src/r0/filter.rs                                     | 2 +-
 src/r0/filter/create_filter.rs                       | 2 +-
 src/r0/filter/get_filter.rs                          | 2 +-
 src/r0/media/create_content.rs                       | 2 +-
 src/r0/media/get_content.rs                          | 2 +-
 src/r0/media/get_content_thumbnail.rs                | 2 +-
 src/r0/membership.rs                                 | 2 +-
 src/r0/membership/ban_user.rs                        | 2 +-
 src/r0/membership/forget_room.rs                     | 2 +-
 src/r0/membership/invite_user.rs                     | 2 +-
 src/r0/membership/join_room_by_id.rs                 | 2 +-
 src/r0/membership/join_room_by_id_or_alias.rs        | 2 +-
 src/r0/membership/joined_rooms.rs                    | 2 +-
 src/r0/membership/kick_user.rs                       | 2 +-
 src/r0/membership/leave_room.rs                      | 2 +-
 src/r0/membership/unban_user.rs                      | 2 +-
 src/r0/presence/get_presence.rs                      | 2 +-
 src/r0/presence/get_subscribed_presences.rs          | 2 +-
 src/r0/presence/set_presence.rs                      | 2 +-
 src/r0/presence/update_presence_subscriptions.rs     | 2 +-
 src/r0/profile/get_avatar_url.rs                     | 2 +-
 src/r0/profile/get_display_name.rs                   | 2 +-
 src/r0/profile/get_profile.rs                        | 2 +-
 src/r0/profile/set_avatar_url.rs                     | 2 +-
 src/r0/profile/set_display_name.rs                   | 2 +-
 src/r0/receipt/create_receipt.rs                     | 2 +-
 src/r0/redact/redact_event.rs                        | 2 +-
 src/r0/room/create_room.rs                           | 2 +-
 src/r0/search/search_events.rs                       | 2 +-
 src/r0/send/send_message_event.rs                    | 2 +-
 src/r0/send/send_state_event_for_empty_key.rs        | 2 +-
 src/r0/send/send_state_event_for_key.rs              | 2 +-
 src/r0/server/get_user_info.rs                       | 2 +-
 src/r0/session/login.rs                              | 2 +-
 src/r0/sync/get_member_events.rs                     | 2 +-
 src/r0/sync/get_message_events.rs                    | 2 +-
 src/r0/sync/get_state_events.rs                      | 2 +-
 src/r0/sync/get_state_events_for_empty_key.rs        | 2 +-
 src/r0/sync/get_state_events_for_key.rs              | 2 +-
 src/r0/sync/sync_events.rs                           | 2 +-
 src/r0/tag/create_tag.rs                             | 2 +-
 src/r0/tag/delete_tag.rs                             | 2 +-
 src/r0/tag/get_tags.rs                               | 2 +-
 src/r0/typing/create_typing_event.rs                 | 2 +-
 src/r0/voip/get_turn_server_info.rs                  | 2 +-
 src/unversioned/get_supported_versions.rs            | 2 +-
 61 files changed, 65 insertions(+), 63 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2a0f07b4..10254c97 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,8 +20,10 @@ ruma-api-macros = "0.3.0"
 ruma-events = "0.11.0"
 ruma-identifiers = "0.11.0"
 ruma-signatures = "0.4.1"
-serde = "1.0.80"
-serde_derive = "1.0.80"
-serde_json = "1.0.33"
+serde_json = "1.0.38"
 serde_urlencoded = "0.5.4"
 url = "1.7.2"
+
+[dependencies.serde]
+version = "1.0.87"
+features = ["derive"]
diff --git a/src/r0/account/change_password.rs b/src/r0/account/change_password.rs
index 727ca075..40cb2160 100644
--- a/src/r0/account/change_password.rs
+++ b/src/r0/account/change_password.rs
@@ -1,7 +1,7 @@
 //! [POST /_matrix/client/r0/account/password](https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-account-password)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/account/register.rs b/src/r0/account/register.rs
index 4fef1d71..a5ce5f74 100644
--- a/src/r0/account/register.rs
+++ b/src/r0/account/register.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/account/request_password_change_token.rs b/src/r0/account/request_password_change_token.rs
index aa844c7d..27e8e122 100644
--- a/src/r0/account/request_password_change_token.rs
+++ b/src/r0/account/request_password_change_token.rs
@@ -1,7 +1,7 @@
 //! [POST /_matrix/client/r0/account/password/email/requestToken](https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-account-password-email-requesttoken)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/account/request_register_token.rs b/src/r0/account/request_register_token.rs
index b2176cd3..f476575b 100644
--- a/src/r0/account/request_register_token.rs
+++ b/src/r0/account/request_register_token.rs
@@ -1,7 +1,7 @@
 //! [POST /_matrix/client/r0/register/email/requestToken](https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-register-email-requesttoken)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/alias/create_alias.rs b/src/r0/alias/create_alias.rs
index 2d1d95a9..324e758a 100644
--- a/src/r0/alias/create_alias.rs
+++ b/src/r0/alias/create_alias.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomAliasId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/alias/delete_alias.rs b/src/r0/alias/delete_alias.rs
index f79c89ae..3eddf7dc 100644
--- a/src/r0/alias/delete_alias.rs
+++ b/src/r0/alias/delete_alias.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::RoomAliasId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/alias/get_alias.rs b/src/r0/alias/get_alias.rs
index 764cd941..290409fc 100644
--- a/src/r0/alias/get_alias.rs
+++ b/src/r0/alias/get_alias.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomAliasId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/config/set_global_account_data.rs b/src/r0/config/set_global_account_data.rs
index 6ae42124..fad88b97 100644
--- a/src/r0/config/set_global_account_data.rs
+++ b/src/r0/config/set_global_account_data.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 ruma_api! {
diff --git a/src/r0/config/set_room_account_data.rs b/src/r0/config/set_room_account_data.rs
index 261af7a9..11b6f5eb 100644
--- a/src/r0/config/set_room_account_data.rs
+++ b/src/r0/config/set_room_account_data.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 ruma_api! {
diff --git a/src/r0/contact/create_contact.rs b/src/r0/contact/create_contact.rs
index a6956828..ec4bb64c 100644
--- a/src/r0/contact/create_contact.rs
+++ b/src/r0/contact/create_contact.rs
@@ -1,7 +1,7 @@
 //! [POST /_matrix/client/r0/account/3pid](https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-account-3pid)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/contact/get_contacts.rs b/src/r0/contact/get_contacts.rs
index 5b64e712..7a57e06b 100644
--- a/src/r0/contact/get_contacts.rs
+++ b/src/r0/contact/get_contacts.rs
@@ -1,7 +1,7 @@
 //! [GET /_matrix/client/r0/account/3pid](https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-client-r0-account-3pid)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/contact/request_contact_verification_token.rs b/src/r0/contact/request_contact_verification_token.rs
index 9b9c818b..3a35aa62 100644
--- a/src/r0/contact/request_contact_verification_token.rs
+++ b/src/r0/contact/request_contact_verification_token.rs
@@ -1,7 +1,7 @@
 //! [POST /_matrix/client/r0/account/3pid/email/requestToken](https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-account-3pid-email-requesttoken)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/context/get_context.rs b/src/r0/context/get_context.rs
index e515bb9c..a91f5660 100644
--- a/src/r0/context/get_context.rs
+++ b/src/r0/context/get_context.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::collections::only;
 use ruma_identifiers::{EventId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/directory/get_public_rooms.rs b/src/r0/directory/get_public_rooms.rs
index 858002c2..01b16309 100644
--- a/src/r0/directory/get_public_rooms.rs
+++ b/src/r0/directory/get_public_rooms.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomAliasId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/filter.rs b/src/r0/filter.rs
index 1ec49ab3..3be8cd30 100644
--- a/src/r0/filter.rs
+++ b/src/r0/filter.rs
@@ -4,7 +4,7 @@ pub mod create_filter;
 pub mod get_filter;
 
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 /// Format to use for returned events
 #[derive(Copy, Clone, Debug, Deserialize, Serialize)]
diff --git a/src/r0/filter/create_filter.rs b/src/r0/filter/create_filter.rs
index 315cd50f..548eb805 100644
--- a/src/r0/filter/create_filter.rs
+++ b/src/r0/filter/create_filter.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use super::FilterDefinition;
 
diff --git a/src/r0/filter/get_filter.rs b/src/r0/filter/get_filter.rs
index 0426fccc..23688b06 100644
--- a/src/r0/filter/get_filter.rs
+++ b/src/r0/filter/get_filter.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use super::FilterDefinition;
 
diff --git a/src/r0/media/create_content.rs b/src/r0/media/create_content.rs
index a3558613..d0bfa4aa 100644
--- a/src/r0/media/create_content.rs
+++ b/src/r0/media/create_content.rs
@@ -1,7 +1,7 @@
 //! [POST /_matrix/media/r0/upload](https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-media-r0-upload)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/media/get_content.rs b/src/r0/media/get_content.rs
index 5b7ea625..e4a3e2e2 100644
--- a/src/r0/media/get_content.rs
+++ b/src/r0/media/get_content.rs
@@ -3,7 +3,7 @@
 //! [GET /_matrix/media/r0/download/{serverName}/{mediaId}](https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-media-r0-download-servername-mediaid)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/media/get_content_thumbnail.rs b/src/r0/media/get_content_thumbnail.rs
index d11dfaa7..a516c0c4 100644
--- a/src/r0/media/get_content_thumbnail.rs
+++ b/src/r0/media/get_content_thumbnail.rs
@@ -1,7 +1,7 @@
 //! [GET /_matrix/media/r0/thumbnail/{serverName}/{mediaId}](https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-media-r0-thumbnail-servername-mediaid)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 /// The desired resizing method.
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
diff --git a/src/r0/membership.rs b/src/r0/membership.rs
index 86ffb6f7..b1b9ebb5 100644
--- a/src/r0/membership.rs
+++ b/src/r0/membership.rs
@@ -11,7 +11,7 @@ pub mod leave_room;
 pub mod unban_user;
 
 use ruma_signatures::Signatures;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 // TODO: spec requires a nesting ThirdPartySigned { signed: Signed { mxid: ..., ... } }
 //       for join_room_by_id_or_alias but not for join_room_by_id, inconsistency?
diff --git a/src/r0/membership/ban_user.rs b/src/r0/membership/ban_user.rs
index 80c57d35..4c891846 100644
--- a/src/r0/membership/ban_user.rs
+++ b/src/r0/membership/ban_user.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/forget_room.rs b/src/r0/membership/forget_room.rs
index f86d8d1e..a37402f7 100644
--- a/src/r0/membership/forget_room.rs
+++ b/src/r0/membership/forget_room.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/invite_user.rs b/src/r0/membership/invite_user.rs
index 0a52943e..c24de8f8 100644
--- a/src/r0/membership/invite_user.rs
+++ b/src/r0/membership/invite_user.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/join_room_by_id.rs b/src/r0/membership/join_room_by_id.rs
index 9b99866a..9534ba67 100644
--- a/src/r0/membership/join_room_by_id.rs
+++ b/src/r0/membership/join_room_by_id.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use super::ThirdPartySigned;
 
diff --git a/src/r0/membership/join_room_by_id_or_alias.rs b/src/r0/membership/join_room_by_id_or_alias.rs
index 7e39e233..ed0d4d9c 100644
--- a/src/r0/membership/join_room_by_id_or_alias.rs
+++ b/src/r0/membership/join_room_by_id_or_alias.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, RoomIdOrAliasId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use super::ThirdPartySigned;
 
diff --git a/src/r0/membership/joined_rooms.rs b/src/r0/membership/joined_rooms.rs
index 93da4aa6..f98beb48 100644
--- a/src/r0/membership/joined_rooms.rs
+++ b/src/r0/membership/joined_rooms.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/kick_user.rs b/src/r0/membership/kick_user.rs
index 54729193..eba79619 100644
--- a/src/r0/membership/kick_user.rs
+++ b/src/r0/membership/kick_user.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/leave_room.rs b/src/r0/membership/leave_room.rs
index c03b8729..772437ac 100644
--- a/src/r0/membership/leave_room.rs
+++ b/src/r0/membership/leave_room.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/unban_user.rs b/src/r0/membership/unban_user.rs
index 8511df83..af18b24f 100644
--- a/src/r0/membership/unban_user.rs
+++ b/src/r0/membership/unban_user.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/presence/get_presence.rs b/src/r0/presence/get_presence.rs
index a4ecf0a1..1c10573f 100644
--- a/src/r0/presence/get_presence.rs
+++ b/src/r0/presence/get_presence.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::presence::PresenceState;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/presence/get_subscribed_presences.rs b/src/r0/presence/get_subscribed_presences.rs
index 40cae333..be5be3f7 100644
--- a/src/r0/presence/get_subscribed_presences.rs
+++ b/src/r0/presence/get_subscribed_presences.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::presence::PresenceEvent;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/presence/set_presence.rs b/src/r0/presence/set_presence.rs
index d0c4d872..d030b907 100644
--- a/src/r0/presence/set_presence.rs
+++ b/src/r0/presence/set_presence.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::presence::PresenceState;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/presence/update_presence_subscriptions.rs b/src/r0/presence/update_presence_subscriptions.rs
index 4164272e..cc175539 100644
--- a/src/r0/presence/update_presence_subscriptions.rs
+++ b/src/r0/presence/update_presence_subscriptions.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/get_avatar_url.rs b/src/r0/profile/get_avatar_url.rs
index ef79761d..6d2a57d8 100644
--- a/src/r0/profile/get_avatar_url.rs
+++ b/src/r0/profile/get_avatar_url.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/get_display_name.rs b/src/r0/profile/get_display_name.rs
index ef65e3b5..420caee0 100644
--- a/src/r0/profile/get_display_name.rs
+++ b/src/r0/profile/get_display_name.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/get_profile.rs b/src/r0/profile/get_profile.rs
index 6608948a..cde5abcb 100644
--- a/src/r0/profile/get_profile.rs
+++ b/src/r0/profile/get_profile.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/set_avatar_url.rs b/src/r0/profile/set_avatar_url.rs
index 10c6e527..6130be3a 100644
--- a/src/r0/profile/set_avatar_url.rs
+++ b/src/r0/profile/set_avatar_url.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/set_display_name.rs b/src/r0/profile/set_display_name.rs
index 7a409513..95d926f1 100644
--- a/src/r0/profile/set_display_name.rs
+++ b/src/r0/profile/set_display_name.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/receipt/create_receipt.rs b/src/r0/receipt/create_receipt.rs
index 74af32bd..30016499 100644
--- a/src/r0/receipt/create_receipt.rs
+++ b/src/r0/receipt/create_receipt.rs
@@ -4,7 +4,7 @@ use std::fmt::{Display, Error as FmtError, Formatter};
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{EventId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/redact/redact_event.rs b/src/r0/redact/redact_event.rs
index b7889d26..eb9b2f29 100644
--- a/src/r0/redact/redact_event.rs
+++ b/src/r0/redact/redact_event.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{EventId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/room/create_room.rs b/src/r0/room/create_room.rs
index 55bb0eda..60ce8b31 100644
--- a/src/r0/room/create_room.rs
+++ b/src/r0/room/create_room.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/search/search_events.rs b/src/r0/search/search_events.rs
index 3511e4c6..65199321 100644
--- a/src/r0/search/search_events.rs
+++ b/src/r0/search/search_events.rs
@@ -5,7 +5,7 @@ use std::collections::HashMap;
 use ruma_api_macros::ruma_api;
 use ruma_events::collections::all::Event;
 use ruma_identifiers::{EventId, RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::r0::filter::RoomEventFilter;
 
diff --git a/src/r0/send/send_message_event.rs b/src/r0/send/send_message_event.rs
index 267912c6..a329d329 100644
--- a/src/r0/send/send_message_event.rs
+++ b/src/r0/send/send_message_event.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::{room::message::MessageEventContent, EventType};
 use ruma_identifiers::{EventId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/send/send_state_event_for_empty_key.rs b/src/r0/send/send_state_event_for_empty_key.rs
index 599ba80b..bfa4d4a3 100644
--- a/src/r0/send/send_state_event_for_empty_key.rs
+++ b/src/r0/send/send_state_event_for_empty_key.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::EventType;
 use ruma_identifiers::{EventId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 ruma_api! {
diff --git a/src/r0/send/send_state_event_for_key.rs b/src/r0/send/send_state_event_for_key.rs
index 7b2e6ad5..ecb74ff1 100644
--- a/src/r0/send/send_state_event_for_key.rs
+++ b/src/r0/send/send_state_event_for_key.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::EventType;
 use ruma_identifiers::{EventId, RoomId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 ruma_api! {
diff --git a/src/r0/server/get_user_info.rs b/src/r0/server/get_user_info.rs
index ca25bb72..60062a1c 100644
--- a/src/r0/server/get_user_info.rs
+++ b/src/r0/server/get_user_info.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/session/login.rs b/src/r0/session/login.rs
index a80273e2..48b6ec8c 100644
--- a/src/r0/session/login.rs
+++ b/src/r0/session/login.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::UserId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_member_events.rs b/src/r0/sync/get_member_events.rs
index 104ffc39..89c9bbae 100644
--- a/src/r0/sync/get_member_events.rs
+++ b/src/r0/sync/get_member_events.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::room::member::MemberEvent;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_message_events.rs b/src/r0/sync/get_message_events.rs
index 430b23cc..cdd24140 100644
--- a/src/r0/sync/get_message_events.rs
+++ b/src/r0/sync/get_message_events.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::collections::only;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_state_events.rs b/src/r0/sync/get_state_events.rs
index 67dd151c..c1923c56 100644
--- a/src/r0/sync/get_state_events.rs
+++ b/src/r0/sync/get_state_events.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::collections::only;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_state_events_for_empty_key.rs b/src/r0/sync/get_state_events_for_empty_key.rs
index d8642c72..de09da76 100644
--- a/src/r0/sync/get_state_events_for_empty_key.rs
+++ b/src/r0/sync/get_state_events_for_empty_key.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::EventType;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_state_events_for_key.rs b/src/r0/sync/get_state_events_for_key.rs
index b28131c0..dbe2f8bf 100644
--- a/src/r0/sync/get_state_events_for_key.rs
+++ b/src/r0/sync/get_state_events_for_key.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::EventType;
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/sync_events.rs b/src/r0/sync/sync_events.rs
index 2055173b..f9835d1e 100644
--- a/src/r0/sync/sync_events.rs
+++ b/src/r0/sync/sync_events.rs
@@ -8,7 +8,7 @@ use ruma_events::{
     stripped,
 };
 use ruma_identifiers::RoomId;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::r0::filter::FilterDefinition;
 
diff --git a/src/r0/tag/create_tag.rs b/src/r0/tag/create_tag.rs
index 1dadeb12..c6c2e33d 100644
--- a/src/r0/tag/create_tag.rs
+++ b/src/r0/tag/create_tag.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::tag::TagInfo;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/tag/delete_tag.rs b/src/r0/tag/delete_tag.rs
index 0db67d25..d9edaae2 100644
--- a/src/r0/tag/delete_tag.rs
+++ b/src/r0/tag/delete_tag.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/tag/get_tags.rs b/src/r0/tag/get_tags.rs
index dcf02617..11f7cdcc 100644
--- a/src/r0/tag/get_tags.rs
+++ b/src/r0/tag/get_tags.rs
@@ -3,7 +3,7 @@
 use ruma_api_macros::ruma_api;
 use ruma_events::tag::TagEventContent;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/typing/create_typing_event.rs b/src/r0/typing/create_typing_event.rs
index 49939327..b16fb8c7 100644
--- a/src/r0/typing/create_typing_event.rs
+++ b/src/r0/typing/create_typing_event.rs
@@ -2,7 +2,7 @@
 
 use ruma_api_macros::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/voip/get_turn_server_info.rs b/src/r0/voip/get_turn_server_info.rs
index 5d782893..b2c19c5d 100644
--- a/src/r0/voip/get_turn_server_info.rs
+++ b/src/r0/voip/get_turn_server_info.rs
@@ -1,7 +1,7 @@
 //! [GET /_matrix/client/r0/voip/turnServer](https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-client-r0-voip-turnserver)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/unversioned/get_supported_versions.rs b/src/unversioned/get_supported_versions.rs
index 6b48904c..88e747dc 100644
--- a/src/unversioned/get_supported_versions.rs
+++ b/src/unversioned/get_supported_versions.rs
@@ -1,7 +1,7 @@
 //! [GET /_matrix/client/versions](https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-client-versions)
 
 use ruma_api_macros::ruma_api;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {