diff --git a/Cargo.toml b/Cargo.toml index 1de818ac..02c1cfe2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,7 @@ as_conversions = "warn" assertions_on_result_states = "warn" cloned_instead_of_copied = "warn" dbg_macro = "warn" +default_trait_access = "warn" default_union_representation = "warn" deref_by_slicing = "warn" empty_drop = "warn" diff --git a/src/api/client_server/account.rs b/src/api/client_server/account.rs index 2368ae92..784a00bb 100644 --- a/src/api/client_server/account.rs +++ b/src/api/client_server/account.rs @@ -151,7 +151,7 @@ pub(crate) async fn register_route( stages: vec![AuthType::RegistrationToken], }], completed: Vec::new(), - params: Default::default(), + params: Box::default(), session: None, auth_error: None, }; @@ -163,7 +163,7 @@ pub(crate) async fn register_route( stages: vec![AuthType::Dummy], }], completed: Vec::new(), - params: Default::default(), + params: Box::default(), session: None, auth_error: None, }; @@ -320,7 +320,7 @@ pub(crate) async fn change_password_route( stages: vec![AuthType::Password], }], completed: Vec::new(), - params: Default::default(), + params: Box::default(), session: None, auth_error: None, }; @@ -407,7 +407,7 @@ pub(crate) async fn deactivate_route( stages: vec![AuthType::Password], }], completed: Vec::new(), - params: Default::default(), + params: Box::default(), session: None, auth_error: None, }; diff --git a/src/api/client_server/device.rs b/src/api/client_server/device.rs index 03f55d77..d63dd636 100644 --- a/src/api/client_server/device.rs +++ b/src/api/client_server/device.rs @@ -83,7 +83,7 @@ pub(crate) async fn delete_device_route( stages: vec![AuthType::Password], }], completed: Vec::new(), - params: Default::default(), + params: Box::default(), session: None, auth_error: None, }; @@ -137,7 +137,7 @@ pub(crate) async fn delete_devices_route( stages: vec![AuthType::Password], }], completed: Vec::new(), - params: Default::default(), + params: Box::default(), session: None, auth_error: None, }; diff --git a/src/api/client_server/keys.rs b/src/api/client_server/keys.rs index 3ea66d7d..97ba84ff 100644 --- a/src/api/client_server/keys.rs +++ b/src/api/client_server/keys.rs @@ -108,7 +108,7 @@ pub(crate) async fn upload_signing_keys_route( stages: vec![AuthType::Password], }], completed: Vec::new(), - params: Default::default(), + params: Box::default(), session: None, auth_error: None, }; diff --git a/src/api/client_server/session.rs b/src/api/client_server/session.rs index f0cf9b6b..9d1cc552 100644 --- a/src/api/client_server/session.rs +++ b/src/api/client_server/session.rs @@ -3,7 +3,13 @@ use crate::{services, utils, Error, Result, Ruma}; use ruma::{ api::client::{ error::ErrorKind, - session::{get_login_types, login, logout, logout_all}, + session::{ + get_login_types::{ + self, + v3::{ApplicationServiceLoginType, PasswordLoginType}, + }, + login, logout, logout_all, + }, uiaa::UserIdentifier, }, UserId, @@ -25,8 +31,8 @@ pub(crate) async fn get_login_types_route( _body: Ruma, ) -> Result { Ok(get_login_types::v3::Response::new(vec![ - get_login_types::v3::LoginType::Password(Default::default()), - get_login_types::v3::LoginType::ApplicationService(Default::default()), + get_login_types::v3::LoginType::Password(PasswordLoginType::default()), + get_login_types::v3::LoginType::ApplicationService(ApplicationServiceLoginType::default()), ])) } diff --git a/src/service/rooms/threads.rs b/src/service/rooms/threads.rs index d7690c08..99f28c8d 100644 --- a/src/service/rooms/threads.rs +++ b/src/service/rooms/threads.rs @@ -4,7 +4,7 @@ pub(crate) use data::Data; use ruma::{ api::client::{error::ErrorKind, threads::get_threads::v1::IncludeThreads}, events::relation::BundledThread, - uint, CanonicalJsonValue, EventId, RoomId, UserId, + uint, CanonicalJsonObject, CanonicalJsonValue, EventId, RoomId, UserId, }; use serde_json::json; @@ -56,7 +56,7 @@ impl Service { if let CanonicalJsonValue::Object(unsigned) = root_pdu_json .entry("unsigned".to_owned()) - .or_insert_with(|| CanonicalJsonValue::Object(Default::default())) + .or_insert_with(|| CanonicalJsonValue::Object(CanonicalJsonObject::default())) { if let Some(mut relations) = unsigned .get("m.relations") diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs index bafcec29..a8577f5a 100644 --- a/src/service/rooms/timeline.rs +++ b/src/service/rooms/timeline.rs @@ -214,7 +214,7 @@ impl Service { if let Some(state_key) = &pdu.state_key { if let CanonicalJsonValue::Object(unsigned) = pdu_json .entry("unsigned".to_owned()) - .or_insert_with(|| CanonicalJsonValue::Object(Default::default())) + .or_insert_with(|| CanonicalJsonValue::Object(CanonicalJsonObject::default())) { if let Some(shortstatehash) = services() .rooms