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

identifiers: Clean up internal macros

Browse Source
This commit is contained in:
Jonas Platte 2021-11-26 00:10:19 +01:00
parent f448f6756e
commit a81769c3fd
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
crates/ruma-identifiers/src/macros.rs
View File

@ -24,32 +24,6 @@ macro_rules! partial_eq_string {
} }
} }
macro_rules! as_str_based_impls {
($id:ty) => {
impl AsRef<str> for $id {
fn as_ref(&self) -> &str {
self.as_str()
}
}
impl std::fmt::Display for $id {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.as_str())
}
}
#[cfg(feature = "serde")]
impl serde::Serialize for $id {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
serializer.serialize_str(self.as_str())
}
}
};
}
macro_rules! opaque_identifier_common_impls { macro_rules! opaque_identifier_common_impls {
($id:ty) => { ($id:ty) => {
impl $id { impl $id {
@ -80,12 +54,6 @@ macro_rules! opaque_identifier_common_impls {
} }
} }
impl std::fmt::Debug for $id {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
<str as std::fmt::Debug>::fmt(self.as_str(), f)
}
}
impl Clone for Box<$id> { impl Clone for Box<$id> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
(**self).to_owned() (**self).to_owned()
@ -100,9 +68,9 @@ macro_rules! opaque_identifier_common_impls {
} }
} }
impl From<&$id> for Box<$id> { impl AsRef<str> for $id {
fn from(id: &$id) -> Self { fn as_ref(&self) -> &str {
id.to_owned() self.as_str()
} }
} }
@ -112,6 +80,12 @@ macro_rules! opaque_identifier_common_impls {
} }
} }
impl From<&$id> for Box<$id> {
fn from(id: &$id) -> Self {
id.to_owned()
}
}
impl From<&$id> for std::rc::Rc<$id> { impl From<&$id> for std::rc::Rc<$id> {
fn from(s: &$id) -> std::rc::Rc<$id> { fn from(s: &$id) -> std::rc::Rc<$id> {
let rc = std::rc::Rc::<str>::from(s.as_str()); let rc = std::rc::Rc::<str>::from(s.as_str());
@ -150,7 +124,28 @@ macro_rules! opaque_identifier_common_impls {
} }
} }
as_str_based_impls!($id); impl std::fmt::Debug for $id {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
<str as std::fmt::Debug>::fmt(self.as_str(), f)
}
}
impl std::fmt::Display for $id {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}", self.as_str())
}
}
#[cfg(feature = "serde")]
impl serde::Serialize for $id {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
serializer.serialize_str(self.as_str())
}
}
partial_eq_string!($id); partial_eq_string!($id);
partial_eq_string!(Box<$id>); partial_eq_string!(Box<$id>);
}; };