char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: cleanup clippy warnings

master
Johannes Becker 2021-04-21 10:47:33 +02:00
parent a7c2a645aa
commit 910a45b3d5
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
matrix_sdk/src/client.rs
View File

@ -95,7 +95,7 @@ use matrix_sdk_common::{
uiaa::AuthData, uiaa::AuthData,
}, },
assign, assign,
identifiers::{DeviceIdBox, EventId, RoomId, RoomIdOrAliasId, ServerName, UserId}, identifiers::{DeviceIdBox, RoomId, RoomIdOrAliasId, ServerName, UserId},
instant::{Duration, Instant}, instant::{Duration, Instant},
locks::RwLock, locks::RwLock,
presence::PresenceState, presence::PresenceState,
@ -104,11 +104,14 @@ use matrix_sdk_common::{
}; };
#[cfg(feature = "encryption")] #[cfg(feature = "encryption")]
use matrix_sdk_common::api::r0::{ use matrix_sdk_common::{
keys::{get_keys, upload_keys, upload_signing_keys::Request as UploadSigningKeysRequest}, api::r0::{
to_device::send_event_to_device::{ keys::{get_keys, upload_keys, upload_signing_keys::Request as UploadSigningKeysRequest},
Request as RumaToDeviceRequest, Response as ToDeviceResponse, to_device::send_event_to_device::{
Request as RumaToDeviceRequest, Response as ToDeviceResponse,
},
}, },
identifiers::EventId,
}; };
use matrix_sdk_common::locks::Mutex; use matrix_sdk_common::locks::Mutex;

5
matrix_sdk/src/room/joined.rs
View File

@ -1,5 +1,8 @@
use crate::{room::Common, BaseRoom, Client, Result, RoomType}; use crate::{room::Common, BaseRoom, Client, Result, RoomType};
use std::{io::Read, ops::Deref, sync::Arc}; use std::{io::Read, ops::Deref};
#[cfg(feature = "encryption")]
use std::sync::Arc;
use matrix_sdk_common::{ use matrix_sdk_common::{
api::r0::{ api::r0::{

11
matrix_sdk_base/src/client.rs
View File

@ -31,10 +31,7 @@ use matrix_sdk_common::{
}, },
events::{ events::{
presence::PresenceEvent, presence::PresenceEvent,
room::{ room::member::{MemberEventContent, MembershipState},
history_visibility::HistoryVisibility,
member::{MemberEventContent, MembershipState},
},
AnyBasicEvent, AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent, AnyBasicEvent, AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent,
AnyToDeviceEvent, EventContent, StateEvent, AnyToDeviceEvent, EventContent, StateEvent,
}, },
@ -46,7 +43,10 @@ use matrix_sdk_common::{
#[cfg(feature = "encryption")] #[cfg(feature = "encryption")]
use matrix_sdk_common::{ use matrix_sdk_common::{
api::r0::keys::claim_keys::Request as KeysClaimRequest, api::r0::keys::claim_keys::Request as KeysClaimRequest,
events::{room::encrypted::EncryptedEventContent, AnyMessageEventContent, AnySyncMessageEvent}, events::{
room::{encrypted::EncryptedEventContent, history_visibility::HistoryVisibility},
AnyMessageEventContent, AnySyncMessageEvent,
},
identifiers::DeviceId, identifiers::DeviceId,
locks::Mutex, locks::Mutex,
uuid::Uuid, uuid::Uuid,
@ -427,6 +427,7 @@ impl BaseClient {
for event in ruma_timeline.events { for event in ruma_timeline.events {
match hoist_room_event_prev_content(&event) { match hoist_room_event_prev_content(&event) {
Ok(mut e) => { Ok(mut e) => {
#[allow(clippy::single_match)]
match &mut e { match &mut e {
AnySyncRoomEvent::State(s) => match s { AnySyncRoomEvent::State(s) => match s {
AnySyncStateEvent::RoomMember(member) => { AnySyncStateEvent::RoomMember(member) => {

4
matrix_sdk_base/src/store/mod.rs
View File

@ -15,10 +15,12 @@
use std::{ use std::{
collections::{BTreeMap, BTreeSet}, collections::{BTreeMap, BTreeSet},
ops::Deref, ops::Deref,
path::Path,
sync::Arc, sync::Arc,
}; };
#[cfg(feature = "sled_state_store")]
use std::path::Path;
use dashmap::DashMap; use dashmap::DashMap;
use matrix_sdk_common::{ use matrix_sdk_common::{
async_trait, async_trait,