Fix lots of clippy lints

2021-06-17 20:34:14 +02:00
parent af2ce5803e
commit f3e630c064
17 changed files with 140 additions and 202 deletions
--- a/src/client_server/membership.rs
+++ b/src/client_server/membership.rs
@@ -743,12 +743,10 @@ pub async fn invite_helper(
        let create_event_content = create_event
            .as_ref()
            .map(|create_event| {
-                Ok::<_, Error>(
-                    serde_json::from_value::<Raw<CreateEventContent>>(create_event.content.clone())
-                        .expect("Raw::from_value always works.")
-                        .deserialize()
-                        .map_err(|_| Error::bad_database("Invalid PowerLevels event in db."))?,
-                )
+                serde_json::from_value::<Raw<CreateEventContent>>(create_event.content.clone())
+                    .expect("Raw::from_value always works.")
+                    .deserialize()
+                    .map_err(|_| Error::bad_database("Invalid PowerLevels event in db."))
            })
            .transpose()?;