Misc fixes

Cargo.toml

@@ -645,7 +645,7 @@ incremental = false
 
 [workspace.lints.rust]
 absolute-paths-not-starting-with-crate = "warn"
-#box-pointers = "warn"                                               # TODO
+#box-pointers = "warn"
 deprecated-in-future = "warn"
 elided-lifetimes-in-paths = "warn"
 explicit-outlives-requirements = "warn"
@@ -662,7 +662,7 @@ rust-2021-incompatible-or-patterns = "warn"
 rust-2021-prefixes-incompatible-syntax = "warn"
 rust-2021-prelude-collisions = "warn"
 single-use-lifetimes = "warn"
-#trivial-casts = "warn"                                              # TODO
+trivial-casts = "warn"
 trivial-numeric-casts = "warn"
 unit-bindings = "warn"
 #unnameable-types = "warn"                                           # TODO
@@ -711,9 +711,8 @@ correctness = "warn"
 ###################
 nursery = "warn"
 
-### some sadness
+## some sadness
 branches_sharing_code = { level = "allow", priority = 1 }            # TODO
-cognitive_complexity = { level = "allow", priority = 1 }             # TODO
 derive_partial_eq_without_eq = { level = "allow", priority = 1 }     # TODO
 equatable_if_let = { level = "allow", priority = 1 }                 # TODO
 future_not_send = { level = "allow", priority = 1 }                  # TODO

clippy.toml

@@ -1 +1,7 @@
-too-many-lines-threshold = 700
+array-size-threshold = 4096
+cognitive-complexity-threshold = 94         # TODO reduce me ALARA
+excessive-nesting-threshold = 11            # TODO reduce me to 4 or 5
+future-size-threshold = 7745                # TODO reduce me ALARA
+stack-size-threshold = 178030               # reduce me ALARA
+too-many-lines-threshold = 700              # TODO reduce me to <= 100
+type-complexity-threshold = 250             # reduce me to ~200

src/admin/room/room_moderation_commands.rs

@@ -1,6 +1,6 @@
 use std::fmt::Write;
 
-use api::client_server::{get_alias_helper, leave_room};
+use api::client::{get_alias_helper, leave_room};
 use ruma::{
 	events::room::message::RoomMessageEventContent, OwnedRoomId, OwnedUserId, RoomAliasId, RoomId, RoomOrAliasId,
 };

src/admin/user/user_commands.rs

@@ -1,6 +1,6 @@
 use std::{fmt::Write as _, sync::Arc};
 
-use api::client_server::{join_room_by_id_helper, leave_all_rooms};
+use api::client::{join_room_by_id_helper, leave_all_rooms};
 use conduit::utils;
 use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, UserId};
 use tracing::{error, info, warn};

src/api/client_server/account.rs → src/api/client/account.rs

@@ -18,9 +18,8 @@ use ruma::{
 };
 use tracing::{error, info, warn};
 
-use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
+use super::{join_room_by_id_helper, DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
 use crate::{
-	client_server::{self, join_room_by_id_helper},
 	service::user_is_local,
 	services,
 	utils::{self},
@@ -539,7 +538,7 @@ pub(crate) async fn deactivate_route(body: Ruma<deactivate::v3::Request>) -> Res
 	}
 
 	// Make the user leave all rooms before deactivation
-	client_server::leave_all_rooms(sender_user).await;
+	super::leave_all_rooms(sender_user).await;
 
 	// Remove devices and mark account as deactivated
 	services().users.deactivate_account(sender_user)?;

src/api/client_server/room.rs → src/api/client/room.rs

@@ -28,8 +28,8 @@ use ruma::{
 use serde_json::{json, value::to_raw_value};
 use tracing::{error, info, warn};
 
+use super::invite_helper;
 use crate::{
-	client_server::invite_helper,
 	service::{appservice::RegistrationInfo, pdu::PduBuilder},
 	services, Error, Result, Ruma,
 };

src/api/mod.rs

@@ -1,12 +1,11 @@
-pub mod client_server;
+pub mod client;
 pub mod router;
 mod ruma_wrapper;
 pub mod server;
 
 extern crate conduit_core as conduit;
 extern crate conduit_service as service;
 
-pub use client_server::membership::{join_room_by_id_helper, leave_all_rooms};
 pub(crate) use conduit::{debug_info, debug_warn, utils, Error, Result};
 pub(crate) use ruma_wrapper::{Ruma, RumaResponse};
 pub(crate) use service::{pdu::PduEvent, services, user_is_local};