Skip to content

Commit 90e59b5

Browse files
committed
Run rustfmt
1 parent 69a74b7 commit 90e59b5

File tree

18 files changed

+28
-26
lines changed

18 files changed

+28
-26
lines changed

src/account_validity/renew_account/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! [GET /_synapse/admin/v1/account_validity/validity](https://github.com/element-hq/synapse/blob/master/docs/admin_api/account_validity.md)
22
33
use ruma::{
4-
api::{auth_scheme::AccessToken, metadata, request, response},
54
MilliSecondsSinceUnixEpoch, OwnedUserId,
5+
api::{auth_scheme::AccessToken, metadata, request, response},
66
};
77

88
metadata! {

src/background_updates/status/v1.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ fn test_status_background_updates() {
115115

116116
// Serialize
117117
let serialized = serde_json::to_string(&response).expect("Failed to serialize");
118-
assert_eq!(serialized, "{\"enabled\":true,\"current_updates\":{\"master\":{\"name\":\"current update 1\",\"total_item_count\":123456789,\"total_duration_ms\":2134567.12345,\"average_items_per_ms\":2.5}}}");
118+
assert_eq!(
119+
serialized,
120+
"{\"enabled\":true,\"current_updates\":{\"master\":{\"name\":\"current update 1\",\"total_item_count\":123456789,\"total_duration_ms\":2134567.12345,\"average_items_per_ms\":2.5}}}"
121+
);
119122

120123
// Deserialize
121124
let deserialized: Response = serde_json::from_str(&serialized).expect("Failed to deserialize");

src/experimental_features/enable_features/v1.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
//! [PUT /_synapse/admin/v1/experimental_features/:user_id](https://github.com/element-hq/synapse/blob/master/docs/admin_api/experimental_features.md#enablingdisabling-features)
22
33
use ruma::{
4+
OwnedUserId,
45
api::{auth_scheme::AccessToken, request, response},
5-
metadata, OwnedUserId,
6+
metadata,
67
};
78
use serde::{Deserialize, Serialize};
89

src/experimental_features/list_features/v1.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
//! [GET /_synapse/admin/v1/experimental_features/:user_id](https://github.com/element-hq/synapse/blob/develop/docs/admin_api/experimental_features.md#listing-enabled-features)
22
33
use ruma::{
4+
OwnedUserId,
45
api::{auth_scheme::AccessToken, request, response},
5-
metadata, OwnedUserId,
6+
metadata,
67
};
78
use serde::{Deserialize, Serialize};
89

src/register_users/shared_secret_register/v1.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! [POST /_synapse/admin/v1/register](https://github.com/element-hq/synapse/blob/master/docs/admin_api/register_api.md)
22
33
#[cfg(feature = "shared-secret-registration-mac")]
4-
use hmac::{digest::InvalidLength, Hmac, Mac};
4+
use hmac::{Hmac, Mac, digest::InvalidLength};
55
use ruma::{
6-
api::{auth_scheme::NoAuthentication, metadata, request, response},
76
OwnedDeviceId, OwnedServerName, OwnedUserId,
7+
api::{auth_scheme::NoAuthentication, metadata, request, response},
88
};
99
#[cfg(feature = "shared-secret-registration-mac")]
1010
use sha1::Sha1;
@@ -103,13 +103,7 @@ pub fn hmac(
103103
mac.update(b"\x00");
104104
mac.update(password.as_bytes());
105105
mac.update(b"\x00");
106-
mac.update({
107-
if admin {
108-
b"admin"
109-
} else {
110-
b"notadmin"
111-
}
112-
});
106+
mac.update(if admin { b"admin" } else { b"notadmin" });
113107
let mac = mac.finalize();
114108
let mac = hex::encode(mac.into_bytes());
115109

src/room_membership/join_room/v1.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
//! [POST /_synapse/admin/v1/join/:room_id_or_alias](https://github.com/element-hq/synapse/blob/master/docs/admin_api/room_membership.md)
22
33
use ruma::{
4+
OwnedRoomId, OwnedRoomOrAliasId, OwnedUserId,
45
api::{auth_scheme::AccessToken, request, response},
5-
metadata, OwnedRoomId, OwnedRoomOrAliasId, OwnedUserId,
6+
metadata,
67
};
78

89
metadata! {

src/rooms/list_rooms/v1.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
//! [GET /_synapse/admin/v1/rooms](https://github.com/element-hq/synapse/blob/master/docs/admin_api/rooms.md#list-room-api)
22
use ruma::{
3+
OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
34
api::{auth_scheme::AccessToken, metadata, request, response},
45
events::room::{guest_access::GuestAccess, history_visibility::HistoryVisibility},
56
room::{JoinRuleKind, RoomType},
67
serde::StringEnum,
7-
uint, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
8+
uint,
89
};
910
use serde::{Deserialize, Serialize};
1011

src/rooms/room_details/v1.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
//! [GET /_synapse/admin/v1/rooms/:room_id](https://github.com/element-hq/synapse/blob/master/docs/admin_api/rooms.md#room-details-api)
22
use ruma::{
3+
OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
34
api::{auth_scheme::AccessToken, metadata, request, response},
45
events::room::{guest_access::GuestAccess, history_visibility::HistoryVisibility},
56
room::{JoinRuleKind, RoomType},
6-
uint, OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedUserId, UInt,
7+
uint,
78
};
89

910
metadata! {

src/rooms/room_members/v1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! [GET /_synapse/admin/v1/rooms/:room_id/members](https://github.com/element-hq/synapse/blob/master/docs/admin_api/rooms.md#room-members-api)
22
use ruma::{
3-
api::{auth_scheme::AccessToken, metadata, request, response},
43
OwnedRoomId, OwnedUserId, UInt,
4+
api::{auth_scheme::AccessToken, metadata, request, response},
55
};
66

77
metadata! {

src/serde.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! synapse admin api specific serde
22
3-
use serde::{de::Visitor, Deserializer};
3+
use serde::{Deserializer, de::Visitor};
44

55
pub(crate) fn bool_or_uint<'de, D>(deserializer: D) -> Result<bool, D::Error>
66
where

0 commit comments

Comments
 (0)