summaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorTimo Kösters <timo@koesters.xyz>2022-10-09 17:26:53 +0200
committerNyaaori <+@nyaaori.cat>2022-10-10 14:02:04 +0200
commit076e9810ba721cfc74b3d9c677ebe08009a23481 (patch)
treec0581826db76e0e5851355d0fc9d0ee8ab0c6976 /src/api
parent6b131202b9c2ec36043d73ffd2d787093e4b9fed (diff)
downloadconduit-076e9810ba721cfc74b3d9c677ebe08009a23481.zip
cargo fix
Diffstat (limited to 'src/api')
-rw-r--r--src/api/client_server/keys.rs2
-rw-r--r--src/api/client_server/sync.rs2
-rw-r--r--src/api/ruma_wrapper/axum.rs2
-rw-r--r--src/api/server_server.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/api/client_server/keys.rs b/src/api/client_server/keys.rs
index 33ff309..ef4e455 100644
--- a/src/api/client_server/keys.rs
+++ b/src/api/client_server/keys.rs
@@ -14,7 +14,7 @@ use ruma::{
federation,
},
serde::Raw,
- DeviceId, DeviceKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
+ DeviceKeyAlgorithm, OwnedDeviceId, OwnedUserId, UserId,
};
use serde_json::json;
use std::collections::{BTreeMap, HashMap, HashSet};
diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs
index 0479322..f7907ce 100644
--- a/src/api/client_server/sync.rs
+++ b/src/api/client_server/sync.rs
@@ -10,7 +10,7 @@ use ruma::{
RoomEventType, StateEventType,
},
serde::Raw,
- DeviceId, OwnedDeviceId, OwnedUserId, RoomId, UserId,
+ OwnedDeviceId, OwnedUserId, RoomId, UserId,
};
use std::{
collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
diff --git a/src/api/ruma_wrapper/axum.rs b/src/api/ruma_wrapper/axum.rs
index c71d36b..818cffc 100644
--- a/src/api/ruma_wrapper/axum.rs
+++ b/src/api/ruma_wrapper/axum.rs
@@ -17,7 +17,7 @@ use bytes::{BufMut, Bytes, BytesMut};
use http::StatusCode;
use ruma::{
api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse},
- CanonicalJsonValue, DeviceId, OwnedDeviceId, OwnedServerName, ServerName, UserId,
+ CanonicalJsonValue, OwnedDeviceId, OwnedServerName, UserId,
};
use serde::Deserialize;
use tracing::{debug, error, warn};
diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index a8ae272..513a076 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -43,7 +43,7 @@ use ruma::{
serde::{Base64, JsonObject, Raw},
to_device::DeviceIdOrAllDevices,
CanonicalJsonValue, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId,
- OwnedServerName, OwnedServerSigningKeyId, OwnedUserId, RoomId, ServerName, ServerSigningKeyId,
+ OwnedServerName, OwnedServerSigningKeyId, OwnedUserId, RoomId, ServerName,
};
use serde_json::value::{to_raw_value, RawValue as RawJsonValue};
use std::{