fix: Fix issues found by lints

Author: zecakeh

src/background_updates/status/v1.rs

@@ -1,8 +1,9 @@
 //! [GET /_synapse/admin/v1/background_updates/status](https://github.com/element-hq/synapse/blob/master/docs/usage/administration/admin_api/background_updates.md#status)
 
+use std::collections::HashMap;
+
 use ruma::api::{metadata, request, response, Metadata};
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 
 const METADATA: Metadata = metadata! {
     method: GET,
@@ -58,14 +59,14 @@ impl Response {
 
 #[test]
 fn test_status_background_updates() {
-    let name = "current update 1".to_string();
-    let total_item_count = 123456789;
-    let total_duration_ms = 2134567.12345;
+    let name = "current update 1";
+    let total_item_count = 123_456_789;
+    let total_duration_ms = 2_134_567.123_45;
     let average_items_per_ms = 2.5;
 
     // Create the current update
     let update = CurrentUpdate {
-        name: name.clone(),
+        name: name.to_owned(),
         total_item_count,
         total_duration_ms,
         average_items_per_ms,
@@ -77,7 +78,7 @@ fn test_status_background_updates() {
 
     // Create the hashmap
     let mut current_updates = HashMap::new();
-    current_updates.insert("master".to_string(), update);
+    current_updates.insert("master".to_owned(), update);
     let enabled = true;
 
     let response = Response::new(enabled, current_updates);

src/experimental_features.rs

@@ -1,3 +1,3 @@
-/// Endpoints in /_synapse/admin/v<x>/experimental_features/:user_id scope.
+/// Endpoints in `/_synapse/admin/v<x>/experimental_features/:user_id scope`.
 pub mod enable_features;
 pub mod list_features;

src/experimental_features/enable_features/v1.rs

@@ -59,9 +59,10 @@ impl Response {
 
 #[test]
 fn test_enable_features() {
-    use ruma::UserId;
     use std::convert::TryFrom;
 
+    use ruma::UserId;
+
     let features =
         ExperimentalFeatures { msc3026: Option::from(true), msc3881: None, msc3967: None };
 

src/experimental_features/list_features/v1.rs

@@ -1,12 +1,13 @@
 //! [GET /_synapse/admin/v1/experimental_features/:user_id](https://github.com/element-hq/synapse/blob/develop/docs/admin_api/experimental_features.md#listing-enabled-features)
 
-use crate::experimental_features::enable_features::v1::ExperimentalFeatures;
 use ruma::{
     api::{request, response, Metadata},
     metadata, OwnedUserId,
 };
 use serde::{Deserialize, Serialize};
 
+use crate::experimental_features::enable_features::v1::ExperimentalFeatures;
+
 const METADATA: Metadata = metadata! {
     method: GET,
     rate_limited: false,

src/rooms/room_details/v1.rs

@@ -4,7 +4,7 @@ use ruma::{
     events::room::{guest_access::GuestAccess, history_visibility::HistoryVisibility},
     room::RoomType,
     space::SpaceRoomJoinRule,
-    OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
+    uint, OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
 };
 
 const METADATA: Metadata = metadata! {
@@ -103,9 +103,9 @@ impl Response {
             topic: None,
             avatar: None,
             canonical_alias: None,
-            joined_members: 0u32.into(),
-            joined_local_members: 0u32.into(),
-            joined_local_devices: 0u32.into(),
+            joined_members: uint!(0),
+            joined_local_members: uint!(0),
+            joined_local_devices: uint!(0),
             version: None,
             creator: None,
             encryption: None,
@@ -114,7 +114,7 @@ impl Response {
             join_rules: None,
             guest_access: None,
             history_visibility: None,
-            state_events: 0u32.into(),
+            state_events: uint!(0),
             room_type: None,
             forgotten: false,
         }

src/serde.rs

@@ -11,7 +11,7 @@ where
     impl Visitor<'_> for BoolOrUIntVisitor {
         type Value = bool;
 
-        fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
             formatter.write_str("a boolean, or integer that's 0 or 1")
         }
 

src/users/create_or_modify/v2.rs

@@ -80,7 +80,7 @@ pub struct Response {
 // The error is necessary at least at all endpoints which need auth, because a invalid login
 // response such an error
 // TODO: Should this be the real error like at ruma client api error, is Void-Default enough?
-// TODO: ruma api serialisis Ok if status code < 400, alse error. That should be diskussed.
+// TODO: ruma api serialise is Ok if status code < 400, else error. That should be discussed.
 // The redirect 300 area is Ok too.
 
 impl Request {

src/users/deactivate_account/v1.rs

@@ -20,7 +20,7 @@ pub struct Request {
     #[ruma_api(path)]
     pub user_id: OwnedUserId,
 
-    /// Flag wether to erase the account.
+    /// Flag whether to erase the account.
     #[serde(default = "ruma::serde::default_false", skip_serializing_if = "ruma::serde::is_false")]
     pub erase: bool,
 }

src/users/get_details/v2.rs

@@ -1,11 +1,12 @@
 //! [GET /_synapse/admin/v2/users/:user_id](https://github.com/matrix-org/synapse/blob/master/docs/admin_api/user_admin_api.rst#query-user-account)
 
-pub use crate::users::UserDetails;
 use ruma::{
     api::{metadata, request, response, Metadata},
     OwnedUserId,
 };
 
+pub use crate::users::UserDetails;
+
 const METADATA: Metadata = metadata! {
     method: GET,
     rate_limited: false,

src/version/get_server_version/v1.rs

@@ -47,10 +47,10 @@ impl Response {
 fn test_response_with_python_version() {
     use serde_json;
 
-    let server_version = "1.2.3".to_string();
+    let server_version = "1.2.3";
 
     // Check create response case
-    let response = Response::new(server_version.clone());
+    let response = Response::new(server_version.to_owned());
     assert_eq!(response.server_version, server_version);
     assert_eq!(response.python_version, None);
 
@@ -64,8 +64,8 @@ fn test_response_with_python_version() {
     assert_eq!(deserialized.python_version, None);
 
     // Check backwards compatibility
-    let old_serialized = "{\"server_version\":\"1.2.3\",\"python_version\":\"4.5.6\"}".to_string();
-    let old_deserialized: Response = serde_json::from_str(&old_serialized).unwrap();
+    let old_serialized = "{\"server_version\":\"1.2.3\",\"python_version\":\"4.5.6\"}";
+    let old_deserialized: Response = serde_json::from_str(old_serialized).unwrap();
     assert_eq!(old_deserialized.server_version, "1.2.3");
-    assert_eq!(old_deserialized.python_version, Some("4.5.6".to_string()));
+    assert_eq!(old_deserialized.python_version.as_deref(), Some("4.5.6"));
 }