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

Stop relying on features activated through dev-dependencies

Browse Source
This commit is contained in:
Jonas Platte 2021-01-04 01:51:36 +01:00
parent 1c47963bef
commit 8de0776796
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ruma-events-macros/src/event_content.rs
View File

@ -17,7 +17,6 @@ mod kw {
/// Parses attributes for `*EventContent` derives. /// Parses attributes for `*EventContent` derives.
/// ///
/// `#[ruma_event(type = "m.room.alias")]` /// `#[ruma_event(type = "m.room.alias")]`
#[derive(Eq, PartialEq)]
enum EventMeta { enum EventMeta {
/// Variant holds the "m.whatever" event type. /// Variant holds the "m.whatever" event type.
Type(LitStr), Type(LitStr),
@ -60,7 +59,7 @@ struct MetaAttrs(Vec<EventMeta>);
impl MetaAttrs { impl MetaAttrs {
fn is_custom(&self) -> bool { fn is_custom(&self) -> bool {
self.0.iter().any(|a| a == &EventMeta::CustomRedacted) self.0.iter().any(|a| matches!(a, &EventMeta::CustomRedacted))
} }
fn get_event_type(&self) -> Option<&LitStr> { fn get_event_type(&self) -> Option<&LitStr> {
@ -127,8 +126,10 @@ pub fn expand_event_content(
let mut fields = named let mut fields = named
.iter() .iter()
.filter(|f| { .filter(|f| {
f.attrs.iter().find_map(|a| a.parse_args::<EventMeta>().ok()) matches!(
== Some(EventMeta::SkipRedacted) f.attrs.iter().find_map(|a| a.parse_args::<EventMeta>().ok()),
Some(EventMeta::SkipRedacted)
)
}) })
.cloned() .cloned()
.collect::<Vec<_>>(); .collect::<Vec<_>>();