Skip to content

Commit 3d64235

Browse files
jplattepoljar
jplatte
authored and
poljar
committed
refactor: Clean up formatting in many places
Process: - set style_edition to 2024 in .rustfmt.toml - run `cargo fmt` - undo .rustfmt.toml change - run `cargo fmt` again - manually rewrap some strings
1 parent b4b0f3a commit 3d64235

File tree

44 files changed

+253
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+253
-106
lines changed

‎bindings/matrix-sdk-ffi/src/room_list.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ pub enum RoomListError {
4242
InvalidRoomId { error: String },
4343
#[error("Event cache ran into an error: {error}")]
4444
EventCache { error: String },
45-
#[error("The requested room doesn't match the membership requirements {expected:?}, observed {actual:?}")]
45+
#[error(
46+
"The requested room doesn't match the membership requirements {expected:?}, \
47+
observed {actual:?}"
48+
)]
4649
IncorrectRoomMembership { expected: Vec<Membership>, actual: Membership },
4750
}
4851

‎bindings/matrix-sdk-ffi/src/session_verification.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,10 @@ impl SessionVerificationController {
235235
if sender != self.user_identity.user_id() {
236236
if let Some(status) = self.encryption.cross_signing_status().await {
237237
if !status.is_complete() {
238-
warn!("Cannot verify other users until our own device's cross-signing status is complete: {status:?}");
238+
warn!(
239+
"Cannot verify other users until our own device's cross-signing status \
240+
is complete: {status:?}"
241+
);
239242
return;
240243
}
241244
}

‎bindings/matrix-sdk-ffi/src/timeline/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,10 @@ impl Timeline {
564564
let event_id = match event_or_transaction_id {
565565
EventOrTransactionId::EventId { event_id } => EventId::parse(event_id)?,
566566
EventOrTransactionId::TransactionId { .. } => {
567-
warn!("trying to apply an edit to a local echo that doesn't exist in this timeline, aborting");
567+
warn!(
568+
"trying to apply an edit to a local echo that doesn't exist \
569+
in this timeline, aborting"
570+
);
568571
return Ok(());
569572
}
570573
};

‎bindings/matrix-sdk-ffi/src/widget.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,15 @@ mod tests {
491491
cap_assert("org.matrix.msc2762.receive.event:org.matrix.rageshake_request");
492492
cap_assert("org.matrix.msc2762.receive.event:io.element.call.encryption_keys");
493493
cap_assert("org.matrix.msc2762.receive.state_event:m.room.create");
494-
cap_assert("org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#@my_user:my_domain.org");
495-
cap_assert("org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#@my_user:my_domain.org_ABCDEFGHI");
496-
cap_assert("org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#_@my_user:my_domain.org_ABCDEFGHI");
494+
cap_assert(
495+
"org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#@my_user:my_domain.org",
496+
);
497+
cap_assert(
498+
"org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#@my_user:my_domain.org_ABCDEFGHI",
499+
);
500+
cap_assert(
501+
"org.matrix.msc2762.send.state_event:org.matrix.msc3401.call.member#_@my_user:my_domain.org_ABCDEFGHI",
502+
);
497503
cap_assert("org.matrix.msc2762.send.event:org.matrix.rageshake_request");
498504
cap_assert("org.matrix.msc2762.send.event:io.element.call.encryption_keys");
499505
}

‎crates/matrix-sdk-base/src/latest_event.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,10 @@ impl<'de> Deserialize<'de> for LatestEvent {
227227
Err(err) => variant_errors.push(err),
228228
}
229229

230-
Err(serde::de::Error::custom(
231-
format!("data did not match any variant of serialized LatestEvent (using serde_json). Observed errors: {variant_errors:?}")
232-
))
230+
Err(serde::de::Error::custom(format!(
231+
"data did not match any variant of serialized LatestEvent (using serde_json). \
232+
Observed errors: {variant_errors:?}"
233+
)))
233234
}
234235
}
235236

‎crates/matrix-sdk-base/src/room/knock.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ impl Room {
5151
if event.content.membership == MembershipState::Knock {
5252
event_to_user_ids.push((event.event_id, event.state_key))
5353
} else {
54-
warn!("Could not mark knock event as seen: event {} for user {} is not in Knock membership state.", event.event_id, event.state_key);
54+
warn!(
55+
"Could not mark knock event as seen: event {} for user {} \
56+
is not in Knock membership state.",
57+
event.event_id, event.state_key
58+
);
5559
}
5660
}
5761
_ => warn!(

‎crates/matrix-sdk-common/src/deserialized_responses.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ const VERIFICATION_VIOLATION: &str =
4242
"Encrypted by a previously-verified user who is no longer verified.";
4343
const UNSIGNED_DEVICE: &str = "Encrypted by a device not verified by its owner.";
4444
const UNKNOWN_DEVICE: &str = "Encrypted by an unknown or deleted device.";
45-
const MISMATCHED_SENDER: &str =
46-
"The sender of the event does not match the owner of the device that created the Megolm session.";
45+
const MISMATCHED_SENDER: &str = "\
46+
The sender of the event does not match the owner of the device \
47+
that created the Megolm session.";
4748
pub const SENT_IN_CLEAR: &str = "Not encrypted.";
4849

4950
/// Represents the state of verification for a decrypted message sent by a
@@ -588,7 +589,11 @@ impl TimelineEvent {
588589
match latest_event.get_field::<MessageLikeEventType>("type") {
589590
Ok(None) => {
590591
let event_id = latest_event.get_field::<OwnedEventId>("event_id").ok().flatten();
591-
warn!(?event_id, "couldn't deserialize bundled latest thread event: missing `type` field in bundled latest thread event");
592+
warn!(
593+
?event_id,
594+
"couldn't deserialize bundled latest thread event: missing `type` field \
595+
in bundled latest thread event"
596+
);
592597
None
593598
}
594599

‎crates/matrix-sdk-common/src/linked_chunk/mod.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ impl<const CAP: usize, Item, Gap> LinkedChunk<CAP, Item, Gap> {
486486

487487
let chunk = match &mut chunk.content {
488488
ChunkContent::Gap(..) => {
489-
return Err(Error::ChunkIsAGap { identifier: chunk_identifier })
489+
return Err(Error::ChunkIsAGap { identifier: chunk_identifier });
490490
}
491491

492492
ChunkContent::Items(current_items) => {
@@ -574,7 +574,7 @@ impl<const CAP: usize, Item, Gap> LinkedChunk<CAP, Item, Gap> {
574574

575575
let can_unlink_chunk = match &mut chunk.content {
576576
ChunkContent::Gap(..) => {
577-
return Err(Error::ChunkIsAGap { identifier: chunk_identifier })
577+
return Err(Error::ChunkIsAGap { identifier: chunk_identifier });
578578
}
579579

580580
ChunkContent::Items(current_items) => {
@@ -644,7 +644,7 @@ impl<const CAP: usize, Item, Gap> LinkedChunk<CAP, Item, Gap> {
644644

645645
match &mut chunk.content {
646646
ChunkContent::Gap(..) => {
647-
return Err(Error::ChunkIsAGap { identifier: chunk_identifier })
647+
return Err(Error::ChunkIsAGap { identifier: chunk_identifier });
648648
}
649649

650650
ChunkContent::Items(current_items) => {
@@ -1158,7 +1158,10 @@ impl ChunkIdentifierGenerator {
11581158
// Check for overflows.
11591159
// unlikely — TODO: call `std::intrinsics::unlikely` once it's stable.
11601160
if previous == u64::MAX {
1161-
panic!("No more chunk identifiers available. Congrats, you did it. 2^64 identifiers have been consumed.")
1161+
panic!(
1162+
"No more chunk identifiers available. Congrats, you did it. \
1163+
2^64 identifiers have been consumed."
1164+
)
11621165
}
11631166

11641167
ChunkIdentifier(previous + 1)

‎crates/matrix-sdk-crypto/src/identities/manager.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,9 @@ impl IdentityManager {
596596
{
597597
Some((master_key, self_signing))
598598
} else {
599-
warn!("A user identity didn't contain a self signing pubkey or the key was invalid");
599+
warn!(
600+
"A user identity didn't contain a self signing pubkey or the key was invalid"
601+
);
600602
None
601603
}
602604
}

‎crates/matrix-sdk-crypto/src/olm/group_sessions/sender_data.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -706,18 +706,18 @@ mod tests {
706706
// This export usse a more efficient serialization format for bytes. This was
707707
// exported when the `KnownSenderData` master_key was serialized as an byte
708708
// array instead of a base64 encoded string.
709-
const SERIALIZED_B64: &str =
710-
"iaZwaWNrbGWEr2luaXRpYWxfcmF0Y2hldIKlaW5uZXLcAIABYMzfSnBRzMlPKF1uKjYbzLtkzNJ4RcylzN0HzP\
711-
9DzON1Tm05zO7M2MzFQsy9Acz9zPnMqDvM4syQzNrMzxF5KzbM4sy9zPUbBWfM7m4/zJzM18zDzMESKgfMkE7M\
712-
yszIHszqWjYyQURbzKTMkx7M58zANsy+AGPM2A8tbcyFYczge8ykzMFdbVxJMMyAzN8azJEXGsy8zPJazMMaP8\
713-
ziDszmWwfM+My2ajLMr8y+eczTRm9TFadjb3VudGVyAKtzaWduaW5nX2tlecQgefpCr6Duu7QUWzKIeMOFmxv/\
714-
NjfcsYwZz8IN2ZOhdaS0c2lnbmluZ19rZXlfdmVyaWZpZWTDpmNvbmZpZ4GndmVyc2lvbqJWMapzZW5kZXJfa2\
715-
V52StoMkIySDg2ajFpYmk2SW13ak9UUkhzbTVMamtyT2kyUGtiSXVUb0w0TWtFq3NpZ25pbmdfa2V5gadlZDI1\
716-
NTE52StUWHJqNS9UYXpia3Yram1CZDl4UlB4NWNVaFFzNUNnblc1Q1pNRjgvNjZzq3NlbmRlcl9kYXRhgbBTZW\
717-
5kZXJVbnZlcmlmaWVkg6d1c2VyX2lks0B2YWxvdTM1Om1hdHJpeC5vcmepZGV2aWNlX2lkqkZJQlNaRlJLUE2q\
718-
bWFzdGVyX2tlecQgkOp9s4ClyQujYD7rRZA8xgE6kvYlqKSNnMrQNmSrcuGncm9vbV9pZL4hRWt5VEtGdkViYl\
719-
B6SmxhaUhFOm1hdHJpeC5vcmeoaW1wb3J0ZWTCqWJhY2tlZF91cMKyaGlzdG9yeV92aXNpYmlsaXR5wKlhbGdv\
720-
cml0aG20bS5tZWdvbG0udjEuYWVzLXNoYTI";
709+
const SERIALIZED_B64: &str = "\
710+
iaZwaWNrbGWEr2luaXRpYWxfcmF0Y2hldIKlaW5uZXLcAIABYMzfSnBRzMlPKF1uKjYbzLtkzNJ4RcylzN0HzP\
711+
9DzON1Tm05zO7M2MzFQsy9Acz9zPnMqDvM4syQzNrMzxF5KzbM4sy9zPUbBWfM7m4/zJzM18zDzMESKgfMkE7M\
712+
yszIHszqWjYyQURbzKTMkx7M58zANsy+AGPM2A8tbcyFYczge8ykzMFdbVxJMMyAzN8azJEXGsy8zPJazMMaP8\
713+
ziDszmWwfM+My2ajLMr8y+eczTRm9TFadjb3VudGVyAKtzaWduaW5nX2tlecQgefpCr6Duu7QUWzKIeMOFmxv/\
714+
NjfcsYwZz8IN2ZOhdaS0c2lnbmluZ19rZXlfdmVyaWZpZWTDpmNvbmZpZ4GndmVyc2lvbqJWMapzZW5kZXJfa2\
715+
V52StoMkIySDg2ajFpYmk2SW13ak9UUkhzbTVMamtyT2kyUGtiSXVUb0w0TWtFq3NpZ25pbmdfa2V5gadlZDI1\
716+
NTE52StUWHJqNS9UYXpia3Yram1CZDl4UlB4NWNVaFFzNUNnblc1Q1pNRjgvNjZzq3NlbmRlcl9kYXRhgbBTZW\
717+
5kZXJVbnZlcmlmaWVkg6d1c2VyX2lks0B2YWxvdTM1Om1hdHJpeC5vcmepZGV2aWNlX2lkqkZJQlNaRlJLUE2q\
718+
bWFzdGVyX2tlecQgkOp9s4ClyQujYD7rRZA8xgE6kvYlqKSNnMrQNmSrcuGncm9vbV9pZL4hRWt5VEtGdkViYl\
719+
B6SmxhaUhFOm1hdHJpeC5vcmeoaW1wb3J0ZWTCqWJhY2tlZF91cMKyaGlzdG9yeV92aXNpYmlsaXR5wKlhbGdv\
720+
cml0aG20bS5tZWdvbG0udjEuYWVzLXNoYTI";
721721

722722
let input = base64_decode(SERIALIZED_B64).unwrap();
723723
let sender_data: PickledInboundGroupSession = rmp_serde::from_slice(&input)

0 commit comments

Comments
 (0)