From f23d7414ec5065e05bffb5e990cd50638c3d540e Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 2 May 2020 11:10:31 +0200 Subject: [PATCH] Update json literal formatting --- src/key/verification/start.rs | 9 +++++---- src/push_rules.rs | 4 ++-- src/room/encrypted.rs | 2 +- src/room/name.rs | 2 +- src/stripped.rs | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/key/verification/start.rs b/src/key/verification/start.rs index c94f421d..9d38b37c 100644 --- a/src/key/verification/start.rs +++ b/src/key/verification/start.rs @@ -453,10 +453,11 @@ mod tests { #[test] fn deserialization_structure_mismatch() { // Missing several required fields. - let error = from_json_value::>(json!({"from_device": "123"})) - .unwrap() - .deserialize() - .unwrap_err(); + let error = + from_json_value::>(json!({ "from_device": "123" })) + .unwrap() + .deserialize() + .unwrap_err(); assert!(error.message().contains("missing field")); assert!(error.is_deserialization()); diff --git a/src/push_rules.rs b/src/push_rules.rs index 5ffbc8d8..af35a716 100644 --- a/src/push_rules.rs +++ b/src/push_rules.rs @@ -487,7 +487,7 @@ mod tests { fn serialize_contains_display_name_condition() { assert_eq!( to_json_value(&PushCondition::ContainsDisplayName).unwrap(), - json!({"kind": "contains_display_name"}) + json!({ "kind": "contains_display_name" }) ); } @@ -540,7 +540,7 @@ mod tests { #[test] fn deserialize_contains_display_name_condition() { assert_matches!( - from_json_value::(json!({"kind": "contains_display_name"})).unwrap(), + from_json_value::(json!({ "kind": "contains_display_name" })).unwrap(), PushCondition::ContainsDisplayName ); } diff --git a/src/room/encrypted.rs b/src/room/encrypted.rs index e718361c..714052e1 100644 --- a/src/room/encrypted.rs +++ b/src/room/encrypted.rs @@ -329,7 +329,7 @@ mod tests { #[test] fn deserialization_failure() { assert!(from_json_value::>( - json!({"algorithm": "m.megolm.v1.aes-sha2"}) + json!({ "algorithm": "m.megolm.v1.aes-sha2" }) ) .unwrap() .deserialize() diff --git a/src/room/name.rs b/src/room/name.rs index 4676f6db..216a7537 100644 --- a/src/room/name.rs +++ b/src/room/name.rs @@ -222,7 +222,7 @@ mod tests { }, "event_id": "$h29iv0s8:example.com", "origin_server_ts": 1, - "prev_content": {"name": "The old name"}, + "prev_content": { "name": "The old name" }, "room_id": "!n8f893n9:example.com", "sender": "@carl:example.com", "state_key": "", diff --git a/src/stripped.rs b/src/stripped.rs index 59ef8d9c..468a1e0c 100644 --- a/src/stripped.rs +++ b/src/stripped.rs @@ -351,7 +351,7 @@ mod tests { "type": "m.room.name", "state_key": "", "sender": "@example:localhost", - "content": {"name": "Ruma"} + "content": { "name": "Ruma" } }); let join_rules_event = json!({