From 3329dc73455076c051a304030acc8a20c1bfda5d Mon Sep 17 00:00:00 2001 From: Devin R Date: Thu, 23 Jul 2020 08:04:44 -0400 Subject: [PATCH] Fix clippy warnings in identifiers and events-macros --- ruma-events-macros/src/event.rs | 5 +++-- ruma-identifiers/src/room_version_id.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ruma-events-macros/src/event.rs b/ruma-events-macros/src/event.rs index aac6657b..f1e84adf 100644 --- a/ruma-events-macros/src/event.rs +++ b/ruma-events-macros/src/event.rs @@ -10,8 +10,9 @@ use crate::event_parse::{to_kind_variation, EventKindVariation}; pub fn expand_event(input: DeriveInput) -> syn::Result { let ident = &input.ident; - let (_kind, var) = to_kind_variation(ident) - .ok_or(syn::Error::new(Span::call_site(), "not a valid ruma event struct identifier"))?; + let (_kind, var) = to_kind_variation(ident).ok_or_else(|| { + syn::Error::new(Span::call_site(), "not a valid ruma event struct identifier") + })?; let (impl_gen, ty_gen, where_clause) = input.generics.split_for_impl(); let is_generic = !input.generics.params.is_empty(); diff --git a/ruma-identifiers/src/room_version_id.rs b/ruma-identifiers/src/room_version_id.rs index 4d878cc5..4a75c1f1 100644 --- a/ruma-identifiers/src/room_version_id.rs +++ b/ruma-identifiers/src/room_version_id.rs @@ -390,7 +390,7 @@ mod tests { let deserialized = from_str::(r#""1""#).expect("Failed to convert RoomVersionId to JSON."); - assert_matches!(deserialized, RoomVersionId::Version1); + assert_eq!(deserialized, RoomVersionId::Version1); assert!(deserialized.is_official()); assert_eq!(