Make ruma-identifiers-macros depend on ruma-identifiers-validation rather than ruma-identifiers

ruma-identifiers-macros/Cargo.toml

@@ -10,7 +10,7 @@ version = "0.17.1"
 edition = "2018"
 
 [dependencies]
-ruma-identifiers = { version = "=0.17.1", path = "../ruma-identifiers" }
+ruma-identifiers-validation = { version = "0.1.0", path = "../ruma-identifiers-validation" }
 quote = "1.0.7"
 proc-macro2 = "1.0.19"
 syn = "1.0.35"

ruma-identifiers-macros/src/lib.rs

@@ -1,9 +1,9 @@
 use proc_macro::TokenStream;
-use std::convert::TryFrom;
 
 use quote::quote;
-use ruma_identifiers::{
+use ruma_identifiers_validation::{
-    DeviceKeyId, EventId, RoomAliasId, RoomId, RoomVersionId, ServerKeyId, ServerName, UserId,
+    device_key_id, event_id, room_alias_id, room_id, room_version_id, server_key_id, server_name,
+    user_id,
 };
 use syn::{parse_macro_input, LitStr};
 
@@ -20,7 +20,7 @@ pub fn device_id(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn device_key_id(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as LitStr);
-    assert!(DeviceKeyId::try_from(id.value()).is_ok(), "Invalid device key id");
+    assert!(device_key_id::validate(&id.value()).is_ok(), "Invalid device key id");
 
     let output = quote! {
         <::ruma::identifiers::DeviceKeyId as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()
@@ -32,7 +32,7 @@ pub fn device_key_id(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn event_id(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as LitStr);
-    assert!(EventId::try_from(id.value()).is_ok(), "Invalid event id");
+    assert!(event_id::validate(&id.value()).is_ok(), "Invalid event id");
 
     let output = quote! {
         <::ruma::identifiers::EventId as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()
@@ -44,7 +44,7 @@ pub fn event_id(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn room_alias_id(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as LitStr);
-    assert!(RoomAliasId::try_from(id.value()).is_ok(), "Invalid room_alias_id");
+    assert!(room_alias_id::validate(&id.value()).is_ok(), "Invalid room_alias_id");
 
     let output = quote! {
         <::ruma::identifiers::RoomAliasId as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()
@@ -56,7 +56,7 @@ pub fn room_alias_id(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn room_id(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as LitStr);
-    assert!(RoomId::try_from(id.value()).is_ok(), "Invalid room_id");
+    assert!(room_id::validate(&id.value()).is_ok(), "Invalid room_id");
 
     let output = quote! {
         <::ruma::identifiers::RoomId as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()
@@ -68,7 +68,7 @@ pub fn room_id(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn room_version_id(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as LitStr);
-    assert!(RoomVersionId::try_from(id.value()).is_ok(), "Invalid room_version_id");
+    assert!(room_version_id::validate(&id.value()).is_ok(), "Invalid room_version_id");
 
     let output = quote! {
         <::ruma::identifiers::RoomVersionId as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()
@@ -80,7 +80,7 @@ pub fn room_version_id(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn server_key_id(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as LitStr);
-    assert!(ServerKeyId::try_from(id.value()).is_ok(), "Invalid server_key_id");
+    assert!(server_key_id::validate(&id.value()).is_ok(), "Invalid server_key_id");
 
     let output = quote! {
         <::ruma::identifiers::ServerKeyId as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()
@@ -92,7 +92,7 @@ pub fn server_key_id(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn server_name(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as LitStr);
-    assert!(<&ServerName>::try_from(id.value().as_str()).is_ok(), "Invalid server_name");
+    assert!(server_name::validate(&id.value()).is_ok(), "Invalid server_name");
 
     let output = quote! {
         <::std::boxed::Box::<::ruma::identifiers::ServerName> as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()
@@ -104,7 +104,7 @@ pub fn server_name(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn user_id(input: TokenStream) -> TokenStream {
     let id = parse_macro_input!(input as LitStr);
-    assert!(UserId::try_from(id.value()).is_ok(), "Invalid user_id");
+    assert!(user_id::validate(&id.value()).is_ok(), "Invalid user_id");
 
     let output = quote! {
         <::ruma::identifiers::UserId as ::std::convert::TryFrom<&str>>::try_from(#id).unwrap()