From 7708deda4ec718fc15a4dfb1f599dff0f495d5dd Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Wed, 23 Jun 2021 16:17:13 +0200
Subject: [PATCH] Allow our proc-macros to be used when re-exported from
 matrix-sdk

---
 crates/ruma-api-macros/src/util.rs   | 6 ++++++
 crates/ruma-events-macros/src/lib.rs | 6 ++++++
 crates/ruma-serde-macros/src/util.rs | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/crates/ruma-api-macros/src/util.rs b/crates/ruma-api-macros/src/util.rs
index 78d49305..daae5cdb 100644
--- a/crates/ruma-api-macros/src/util.rs
+++ b/crates/ruma-api-macros/src/util.rs
@@ -31,6 +31,12 @@ pub(crate) fn import_ruma_api() -> TokenStream {
     } else if let Ok(FoundCrate::Name(name)) = crate_name("ruma") {
         let import = format_ident!("{}", name);
         quote! { ::#import::api }
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("matrix-sdk") {
+        let import = format_ident!("{}", name);
+        quote! { ::#import::ruma::api }
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("matrix-sdk-appservice") {
+        let import = format_ident!("{}", name);
+        quote! { ::#import::ruma::api }
     } else {
         quote! { ::ruma_api }
     }
diff --git a/crates/ruma-events-macros/src/lib.rs b/crates/ruma-events-macros/src/lib.rs
index 5db57123..02b7f5d0 100644
--- a/crates/ruma-events-macros/src/lib.rs
+++ b/crates/ruma-events-macros/src/lib.rs
@@ -97,6 +97,12 @@ pub(crate) fn import_ruma_events() -> pm2::TokenStream {
     } else if let Ok(FoundCrate::Name(name)) = crate_name("ruma") {
         let import = format_ident!("{}", name);
         quote! { ::#import::events }
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("matrix-sdk") {
+        let import = format_ident!("{}", name);
+        quote! { ::#import::ruma::events }
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("matrix-sdk-appservice") {
+        let import = format_ident!("{}", name);
+        quote! { ::#import::ruma::events }
     } else {
         quote! { ::ruma_events }
     }
diff --git a/crates/ruma-serde-macros/src/util.rs b/crates/ruma-serde-macros/src/util.rs
index 1615064c..13e073c9 100644
--- a/crates/ruma-serde-macros/src/util.rs
+++ b/crates/ruma-serde-macros/src/util.rs
@@ -15,6 +15,12 @@ pub fn import_ruma_serde() -> TokenStream {
     } else if let Ok(FoundCrate::Name(name)) = crate_name("ruma") {
         let import = format_ident!("{}", name);
         quote! { ::#import::serde }
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("matrix-sdk") {
+        let import = format_ident!("{}", name);
+        quote! { ::#import::ruma::serde }
+    } else if let Ok(FoundCrate::Name(name)) = crate_name("matrix-sdk-appservice") {
+        let import = format_ident!("{}", name);
+        quote! { ::#import::ruma::serde }
     } else {
         quote! { ::ruma_serde }
     }