From ebae8ceeb0220071e950ada987bb3500ae7d8545 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Tue, 14 May 2024 17:08:36 -0700 Subject: [PATCH] enable `implicit_clone` lint --- Cargo.toml | 1 + src/api/client_server/alias.rs | 2 +- src/api/client_server/backup.rs | 2 +- src/api/client_server/read_marker.rs | 2 +- src/api/client_server/state.rs | 4 ++-- src/api/client_server/sync.rs | 2 +- src/api/ruma_wrapper/axum.rs | 2 +- src/api/server_server.rs | 4 ++-- src/database/key_value/globals.rs | 2 +- src/database/key_value/rooms/alias.rs | 2 +- src/database/key_value/rooms/state.rs | 2 +- src/service/admin.rs | 4 ++-- src/service/media.rs | 8 ++++---- src/service/rooms/event_handler.rs | 2 +- src/service/rooms/spaces.rs | 4 ++-- src/service/rooms/timeline.rs | 2 +- src/service/sending.rs | 2 +- 17 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c04bb52c..ef81655c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,6 +39,7 @@ if_not_else = "warn" if_then_some_else_none = "warn" ignored_unit_patterns = "warn" impl_trait_in_params = "warn" +implicit_clone = "warn" let_underscore_must_use = "warn" lossy_float_literal = "warn" mem_forget = "warn" diff --git a/src/api/client_server/alias.rs b/src/api/client_server/alias.rs index 45eff66c..6bba5f6b 100644 --- a/src/api/client_server/alias.rs +++ b/src/api/client_server/alias.rs @@ -121,7 +121,7 @@ pub(crate) async fn get_alias_helper( .send_federation_request( room_alias.server_name(), federation::query::get_room_information::v1::Request { - room_alias: room_alias.to_owned(), + room_alias: room_alias.clone(), }, ) .await?; diff --git a/src/api/client_server/backup.rs b/src/api/client_server/backup.rs index 709ed73a..cf7f5468 100644 --- a/src/api/client_server/backup.rs +++ b/src/api/client_server/backup.rs @@ -91,7 +91,7 @@ pub(crate) async fn get_backup_info_route( etag: services() .key_backups .get_etag(sender_user, &body.version)?, - version: body.version.to_owned(), + version: body.version.clone(), }) } diff --git a/src/api/client_server/read_marker.rs b/src/api/client_server/read_marker.rs index fb614bc9..a1a7bbbf 100644 --- a/src/api/client_server/read_marker.rs +++ b/src/api/client_server/read_marker.rs @@ -140,7 +140,7 @@ pub(crate) async fn create_receipt_route( receipts.insert(ReceiptType::Read, user_receipts); let mut receipt_content = BTreeMap::new(); - receipt_content.insert(body.event_id.to_owned(), receipts); + receipt_content.insert(body.event_id.clone(), receipts); services().rooms.edus.read_receipt.readreceipt_update( sender_user, diff --git a/src/api/client_server/state.rs b/src/api/client_server/state.rs index 35d78dc3..8ac33241 100644 --- a/src/api/client_server/state.rs +++ b/src/api/client_server/state.rs @@ -31,7 +31,7 @@ pub(crate) async fn send_state_event_for_key_route( &body.room_id, &body.event_type, &body.body.body, // Yes, I hate it too - body.state_key.to_owned(), + body.state_key.clone(), ) .await?; @@ -64,7 +64,7 @@ pub(crate) async fn send_state_event_for_empty_key_route( &body.room_id, &body.event_type.to_string().into(), &body.body.body, - body.state_key.to_owned(), + body.state_key.clone(), ) .await?; diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs index 08bf754e..4d11f272 100644 --- a/src/api/client_server/sync.rs +++ b/src/api/client_server/sync.rs @@ -82,7 +82,7 @@ pub(crate) async fn sync_events_route( Entry::Vacant(v) => { let (tx, rx) = tokio::sync::watch::channel(None); - v.insert((body.since.to_owned(), rx.clone())); + v.insert((body.since.clone(), rx.clone())); tokio::spawn(sync_helper_wrapper( sender_user.clone(), diff --git a/src/api/ruma_wrapper/axum.rs b/src/api/ruma_wrapper/axum.rs index c1ebaa7a..30a4caf0 100644 --- a/src/api/ruma_wrapper/axum.rs +++ b/src/api/ruma_wrapper/axum.rs @@ -217,7 +217,7 @@ where let keys_result = services() .rooms .event_handler - .fetch_signing_keys(&x_matrix.origin, vec![x_matrix.key.to_owned()]) + .fetch_signing_keys(&x_matrix.origin, vec![x_matrix.key.clone()]) .await; let keys = match keys_result { diff --git a/src/api/server_server.rs b/src/api/server_server.rs index 781ee74c..fdb35374 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -727,7 +727,7 @@ pub(crate) async fn send_transaction_message_route( .roomid_mutex_federation .write() .await - .entry(room_id.to_owned()) + .entry(room_id.clone()) .or_default(), ); let mutex_lock = mutex.lock().await; @@ -1374,7 +1374,7 @@ pub(crate) async fn create_join_event_template_route( .roomid_mutex_state .write() .await - .entry(body.room_id.to_owned()) + .entry(body.room_id.clone()) .or_default(), ); let state_lock = mutex_state.lock().await; diff --git a/src/database/key_value/globals.rs b/src/database/key_value/globals.rs index 1f47a445..10748ccd 100644 --- a/src/database/key_value/globals.rs +++ b/src/database/key_value/globals.rs @@ -191,7 +191,7 @@ lasttimelinecount_cache: {lasttimelinecount_cache}\n" self.global.insert(b"keypair", &keypair)?; Ok::<_, Error>(keypair) }, - |s| Ok(s.to_vec()), + |s| Ok(s.clone()), )?; let mut parts = keypair_bytes.splitn(2, |&b| b == 0xff); diff --git a/src/database/key_value/rooms/alias.rs b/src/database/key_value/rooms/alias.rs index 6f230323..a4666834 100644 --- a/src/database/key_value/rooms/alias.rs +++ b/src/database/key_value/rooms/alias.rs @@ -15,7 +15,7 @@ impl service::rooms::alias::Data for KeyValueDatabase { fn remove_alias(&self, alias: &RoomAliasId) -> Result<()> { if let Some(room_id) = self.alias_roomid.get(alias.alias().as_bytes())? { - let mut prefix = room_id.to_vec(); + let mut prefix = room_id.clone(); prefix.push(0xff); for (key, _) in self.aliasid_alias.scan_prefix(prefix) { diff --git a/src/database/key_value/rooms/state.rs b/src/database/key_value/rooms/state.rs index 6865d7b9..fd0c81e6 100644 --- a/src/database/key_value/rooms/state.rs +++ b/src/database/key_value/rooms/state.rs @@ -63,7 +63,7 @@ impl service::rooms::state::Data for KeyValueDatabase { } for event_id in event_ids { - let mut key = prefix.to_owned(); + let mut key = prefix.clone(); key.extend_from_slice(event_id.as_bytes()); self.roomid_pduleaves.insert(&key, event_id.as_bytes())?; } diff --git a/src/service/admin.rs b/src/service/admin.rs index d692c809..58ef401a 100644 --- a/src/service/admin.rs +++ b/src/service/admin.rs @@ -230,7 +230,7 @@ impl Service { .roomid_mutex_state .write() .await - .entry(grapevine_room.to_owned()) + .entry(grapevine_room.clone()) .or_default(), ); @@ -1273,7 +1273,7 @@ impl Service { // Set power level let mut users = BTreeMap::new(); - users.insert(grapevine_user.to_owned(), 100.into()); + users.insert(grapevine_user.clone(), 100.into()); users.insert(user_id.to_owned(), 100.into()); services() diff --git a/src/service/media.rs b/src/service/media.rs index 3dc764e1..c19497cf 100644 --- a/src/service/media.rs +++ b/src/service/media.rs @@ -128,7 +128,7 @@ impl Service { Ok(Some(FileMeta { content_disposition, content_type, - file: file.to_vec(), + file: file.clone(), })) } else if let Ok((content_disposition, content_type, key)) = self.db.search_file_metadata(mxc.clone(), 0, 0) @@ -145,7 +145,7 @@ impl Service { return Ok(Some(FileMeta { content_disposition, content_type, - file: file.to_vec(), + file: file.clone(), })); } @@ -211,14 +211,14 @@ impl Service { Ok(Some(FileMeta { content_disposition, content_type, - file: thumbnail_bytes.to_vec(), + file: thumbnail_bytes.clone(), })) } else { // Couldn't parse file to generate thumbnail, send original Ok(Some(FileMeta { content_disposition, content_type, - file: file.to_vec(), + file: file.clone(), })) } } else { diff --git a/src/service/rooms/event_handler.rs b/src/service/rooms/event_handler.rs index 261811d4..92538227 100644 --- a/src/service/rooms/event_handler.rs +++ b/src/service/rooms/event_handler.rs @@ -99,7 +99,7 @@ impl Service { // 1. Skip the PDU if we already have it as a timeline event if let Some(pdu_id) = services().rooms.timeline.get_pdu_id(event_id)? { - return Ok(Some(pdu_id.to_vec())); + return Ok(Some(pdu_id.clone())); } let create_event = services() diff --git a/src/service/rooms/spaces.rs b/src/service/rooms/spaces.rs index 10fba1c2..74891e30 100644 --- a/src/service/rooms/spaces.rs +++ b/src/service/rooms/spaces.rs @@ -81,7 +81,7 @@ impl Service { .roomid_spacechunk_cache .lock() .await - .get_mut(¤t_room.to_owned()) + .get_mut(¤t_room.clone()) .as_ref() { if let Some(cached) = cached { @@ -202,7 +202,7 @@ impl Service { .send_federation_request( server, federation::space::get_hierarchy::v1::Request { - room_id: current_room.to_owned(), + room_id: current_room.clone(), suggested_only, }, ) diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs index 7be88ecb..6947eabb 100644 --- a/src/service/rooms/timeline.rs +++ b/src/service/rooms/timeline.rs @@ -1180,7 +1180,7 @@ impl Service { .roomid_mutex_federation .write() .await - .entry(room_id.to_owned()) + .entry(room_id.clone()) .or_default(), ); let mutex_lock = mutex.lock().await; diff --git a/src/service/sending.rs b/src/service/sending.rs index 30c04b1b..9f82a716 100644 --- a/src/service/sending.rs +++ b/src/service/sending.rs @@ -409,7 +409,7 @@ impl Service { )?; for ((outgoing_kind, event), key) in requests.into_iter().zip(keys) { self.sender - .send((outgoing_kind.to_owned(), event, key)) + .send((outgoing_kind.clone(), event, key)) .unwrap(); }