chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ruma_identifiers_macros::device_id with ruma_identifiers::device_id

Browse Source 
The proc_macro is replaced by a macro_rules macro because it doesn't
actually need and proc_macro features.
This commit is contained in:
Jonas Platte 2020-08-04 23:41:35 +02:00
parent 68d2e088db
commit 0d0480e523
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruma-identifiers-macros/src/lib.rs
View File

@ -7,16 +7,6 @@ use ruma_identifiers_validation::{
}; };
use syn::{parse_macro_input, LitStr}; use syn::{parse_macro_input, LitStr};
#[proc_macro]
pub fn device_id(input: TokenStream) -> TokenStream {
let id = parse_macro_input!(input as LitStr);
let output = quote! {
::std::boxed::Box<::ruma::identifiers::DeviceId>::from(#id)
};
output.into()
}
#[proc_macro] #[proc_macro]
pub fn device_key_id(input: TokenStream) -> TokenStream { pub fn device_key_id(input: TokenStream) -> TokenStream {
let id = parse_macro_input!(input as LitStr); let id = parse_macro_input!(input as LitStr);

8
ruma-identifiers/src/lib.rs
View File

@ -73,3 +73,11 @@ where
T::try_from(&v).map_err(|_| de::Error::invalid_value(Unexpected::Str(&v), &expected_str)) T::try_from(&v).map_err(|_| de::Error::invalid_value(Unexpected::Str(&v), &expected_str))
}) })
} }
/// Shorthand for `Box::<DeviceId>::from`.
#[macro_export]
macro_rules! device_id {
($s:tt) => {
::std::boxed::Box<$crate::DeviceId>::from($s)
};
}