From d56d50e96f4242f9dedf31efa0092df6dd7de8fc Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Fri, 25 Mar 2022 16:29:20 +0100 Subject: [PATCH] Use field shorthands in tracing macros Automated using search `\b(\w+) = \?\1` => replace `?$1`. --- crates/matrix-sdk-crypto/src/backups/mod.rs | 2 +- .../matrix-sdk-crypto/src/gossiping/machine.rs | 16 ++++++++-------- crates/matrix-sdk-crypto/src/machine.rs | 5 +---- .../src/session_manager/group_sessions.rs | 6 +++--- crates/matrix-sdk-crypto/src/store/mod.rs | 2 +- .../src/verification/machine.rs | 2 +- crates/matrix-sdk/src/encryption/mod.rs | 2 +- 7 files changed, 16 insertions(+), 19 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/backups/mod.rs b/crates/matrix-sdk-crypto/src/backups/mod.rs index 5653c251d..f3b9d7a46 100644 --- a/crates/matrix-sdk-crypto/src/backups/mod.rs +++ b/crates/matrix-sdk-crypto/src/backups/mod.rs @@ -320,7 +320,7 @@ impl BackupMachine { info!( key_count = key_count, keys = ?session_record, - backup_key = ?backup_key, + ?backup_key, "Successfully created a room keys backup request" ); diff --git a/crates/matrix-sdk-crypto/src/gossiping/machine.rs b/crates/matrix-sdk-crypto/src/gossiping/machine.rs index e3ce15b26..aa807ee31 100644 --- a/crates/matrix-sdk-crypto/src/gossiping/machine.rs +++ b/crates/matrix-sdk-crypto/src/gossiping/machine.rs @@ -232,7 +232,7 @@ impl GossipMachine { // We ignore cancellations here since there's nothing to serve. RequestAction::RequestCancellation => return Ok(None), action => { - warn!(action = ?action, "Unknown secret request action"); + warn!(?action, "Unknown secret request action"); return Ok(None); } }; @@ -240,7 +240,7 @@ impl GossipMachine { let content = if let Some(secret) = self.store.export_secret(secret_name).await { SecretSendEventContent::new(event.content.request_id.to_owned(), secret) } else { - info!(secret_name = ?secret_name, "Can't serve a secret request, secret isn't found"); + info!(?secret_name, "Can't serve a secret request, secret isn't found"); return Ok(None); }; @@ -253,7 +253,7 @@ impl GossipMachine { info!( user_id = device.user_id().as_str(), device_id = device.device_id().as_str(), - secret_name = ?secret_name, + ?secret_name, "Sharing a secret with a device", ); @@ -277,7 +277,7 @@ impl GossipMachine { info!( user_id = device.user_id().as_str(), device_id = device.device_id().as_str(), - secret_name = ?secret_name, + ?secret_name, "Received a secret request that we won't serve, the device isn't trusted", ); @@ -287,7 +287,7 @@ impl GossipMachine { info!( user_id = device.user_id().as_str(), device_id = device.device_id().as_str(), - secret_name = ?secret_name, + ?secret_name, "Received a secret request that we won't serve, the device doesn't belong to us", ); @@ -297,7 +297,7 @@ impl GossipMachine { warn!( user_id = event.sender.as_str(), device_id = event.content.requesting_device_id.as_str(), - secret_name = ?secret_name, + ?secret_name, "Received a secret request form an unknown device", ); self.store.update_tracked_user(&event.sender, true).await?; @@ -390,7 +390,7 @@ impl GossipMachine { device_id = device.device_id().as_str(), session_id = key_info.session_id.as_str(), room_id = key_info.room_id.as_str(), - message_index = ?message_index, + ?message_index, "Serving a room key request", ); @@ -618,7 +618,7 @@ impl GossipMachine { secret_names: Vec, ) -> Vec { if !secret_names.is_empty() { - info!(secret_names = ?secret_names, "Creating new outgoing secret requests"); + info!(?secret_names, "Creating new outgoing secret requests"); secret_names .into_iter() diff --git a/crates/matrix-sdk-crypto/src/machine.rs b/crates/matrix-sdk-crypto/src/machine.rs index 9aa2629e2..1ca7241fc 100644 --- a/crates/matrix-sdk-crypto/src/machine.rs +++ b/crates/matrix-sdk-crypto/src/machine.rs @@ -249,10 +249,7 @@ impl OlmMachine { .master_public_key() .await .and_then(|m| m.get_first_key().map(|m| m.to_owned())); - debug!( - master_key = ?master_key, - "Restored the cross signing identity" - ); + debug!(?master_key, "Restored the cross signing identity"); i } None => { diff --git a/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs b/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs index 7353be8c8..4b49624ad 100644 --- a/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs +++ b/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs @@ -329,8 +329,8 @@ impl GroupSessionManager { let mut devices: HashMap, Vec> = HashMap::new(); trace!( - users = ?users, - history_visibility = ?history_visibility, + ?users, + ?history_visibility, session_id = outbound.session_id(), room_id = outbound.room_id().as_str(), "Calculating group session recipients" @@ -505,7 +505,7 @@ impl GroupSessionManager { info!( index = message_index, - recipients = ?recipients, + ?recipients, room_id = room_id.as_str(), session_id = outbound.session_id(), "Trying to encrypt a room key", diff --git a/crates/matrix-sdk-crypto/src/store/mod.rs b/crates/matrix-sdk-crypto/src/store/mod.rs index 60adf0b36..401de834d 100644 --- a/crates/matrix-sdk-crypto/src/store/mod.rs +++ b/crates/matrix-sdk-crypto/src/store/mod.rs @@ -505,7 +505,7 @@ impl Store { .await?; let status = identity.status().await; - info!(status = ?status, "Successfully imported the private cross signing keys"); + info!(?status, "Successfully imported the private cross signing keys"); let changes = Changes { private_identity: Some(identity.clone()), ..Default::default() }; diff --git a/crates/matrix-sdk-crypto/src/verification/machine.rs b/crates/matrix-sdk-crypto/src/verification/machine.rs index 3c620a7c5..3f275f954 100644 --- a/crates/matrix-sdk-crypto/src/verification/machine.rs +++ b/crates/matrix-sdk-crypto/src/verification/machine.rs @@ -357,7 +357,7 @@ impl VerificationMachine { trace!( sender = event.sender().as_str(), from_device = r.from_device().as_str(), - timestamp = ?timestamp, + ?timestamp, "The received verification request was too old or too far into the future", ); } diff --git a/crates/matrix-sdk/src/encryption/mod.rs b/crates/matrix-sdk/src/encryption/mod.rs index c9d32fb24..93d1f1791 100644 --- a/crates/matrix-sdk/src/encryption/mod.rs +++ b/crates/matrix-sdk/src/encryption/mod.rs @@ -402,7 +402,7 @@ impl Client { let room = rooms.into_iter().find(|r| r.direct_target().as_deref() == Some(user_id)); - trace!(room = ?room, "Found room"); + trace!(?room, "Found room"); room }