diff --git a/Cargo.toml b/Cargo.toml index ab21dec0..cb75b2f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,6 @@ wildcard_dependencies = "warn" missing_errors_doc = "allow" missing_panics_doc = "allow" -assigning_clones = "allow" doc_markdown = "allow" manual_is_variant_and = "allow" mixed_attributes_style = "allow" diff --git a/src/api/client_server/device.rs b/src/api/client_server/device.rs index ae243244..f94cae6e 100644 --- a/src/api/client_server/device.rs +++ b/src/api/client_server/device.rs @@ -60,7 +60,7 @@ pub(crate) async fn update_device_route( .get_device_metadata(sender_user, &body.device_id)? .ok_or(Error::BadRequest(ErrorKind::NotFound, "Device not found."))?; - device.display_name = body.display_name.clone(); + device.display_name.clone_from(&body.display_name); services().users.update_device_metadata( sender_user, diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs index d50b99a7..49b4d4e2 100644 --- a/src/api/client_server/membership.rs +++ b/src/api/client_server/membership.rs @@ -221,7 +221,7 @@ pub(crate) async fn kick_user_route( .map_err(|_| Error::bad_database("Invalid member event in database."))?; event.membership = MembershipState::Leave; - event.reason = body.reason.clone(); + event.reason.clone_from(&body.reason); let mutex_state = Arc::clone( services() @@ -360,7 +360,7 @@ pub(crate) async fn unban_user_route( .map_err(|_| Error::bad_database("Invalid member event in database."))?; event.membership = MembershipState::Leave; - event.reason = body.reason.clone(); + event.reason.clone_from(&body.reason); let mutex_state = Arc::clone( services() diff --git a/src/database.rs b/src/database.rs index 4904ffd7..72d2e3c5 100644 --- a/src/database.rs +++ b/src/database.rs @@ -997,8 +997,8 @@ impl KeyValueDatabase { .get(content_rule_transformation[0]); if rule.is_some() { let mut rule = rule.unwrap().clone(); - rule.rule_id = - content_rule_transformation[1].to_owned(); + content_rule_transformation[1] + .clone_into(&mut rule.rule_id); rules_list .content .shift_remove(content_rule_transformation[0]); @@ -1027,7 +1027,7 @@ impl KeyValueDatabase { rules_list.underride.get(transformation[0]); if let Some(rule) = rule { let mut rule = rule.clone(); - rule.rule_id = transformation[1].to_owned(); + transformation[1].clone_into(&mut rule.rule_id); rules_list .underride .shift_remove(transformation[0]); diff --git a/src/service/pusher.rs b/src/service/pusher.rs index 903f1a73..82bc7497 100644 --- a/src/service/pusher.rs +++ b/src/service/pusher.rs @@ -256,11 +256,11 @@ impl Service { pusher.ids.pushkey.clone(), ); device.data.default_payload = http.default_payload.clone(); - device.data.format = http.format.clone(); + device.data.format.clone_from(&http.format); // Tweaks are only added if the format is NOT event_id_only if !event_id_only { - device.tweaks = tweaks.clone(); + device.tweaks.clone_from(&tweaks); } let d = vec![device]; diff --git a/src/service/users.rs b/src/service/users.rs index 5fd8cfbd..fe0ac1ac 100644 --- a/src/service/users.rs +++ b/src/service/users.rs @@ -87,11 +87,12 @@ impl Service { for (list_id, list) in &mut request.lists { if let Some(cached_list) = cached.lists.get(list_id) { if list.sort.is_empty() { - list.sort = cached_list.sort.clone(); + list.sort.clone_from(&cached_list.sort); }; if list.room_details.required_state.is_empty() { - list.room_details.required_state = - cached_list.room_details.required_state.clone(); + list.room_details + .required_state + .clone_from(&cached_list.room_details.required_state); }; list.room_details.timeline_limit = list .room_details @@ -140,8 +141,8 @@ impl Service { (..) => {} } if list.bump_event_types.is_empty() { - list.bump_event_types = - cached_list.bump_event_types.clone(); + list.bump_event_types + .clone_from(&cached_list.bump_event_types); }; } cached.lists.insert(list_id.clone(), list.clone());