From 98ddf25ae2fd821718a79d252eab9fff5d29e444 Mon Sep 17 00:00:00 2001 From: Devin Ragotzy Date: Mon, 10 Aug 2020 17:07:03 -0400 Subject: [PATCH] Allow the main ruma crate to re-export the ruma-api-macro things --- ruma-api-macros/src/api.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ruma-api-macros/src/api.rs b/ruma-api-macros/src/api.rs index 391ca02a..90a874c7 100644 --- a/ruma-api-macros/src/api.rs +++ b/ruma-api-macros/src/api.rs @@ -28,9 +28,12 @@ pub fn strip_serde_attrs(field: &Field) -> Field { } pub fn import_ruma_api() -> TokenStream { - if let Ok(name) = crate_name("ruma-api") { - let import = Ident::new(&name, Span::call_site()); + if let Ok(possibly_renamed) = crate_name("ruma-api") { + let import = Ident::new(&possibly_renamed, Span::call_site()); quote! { ::#import } + } else if let Ok(possibly_renamed) = crate_name("ruma") { + let import = Ident::new(&possibly_renamed, Span::call_site()); + quote! { ::#import::api } } else { quote! { ::ruma_api } }