fix: resolve all clippy warnings for CI (async_fn_in_trait, collapsible_if, type_complexity, dead_code)

- Allow async_fn_in_trait lint crate-wide (internal project, 413 warnings)
- Add integration_tests feature to Cargo.toml to fix unexpected cfg warnings
- Collapse nested if statements into single conditions (13 locations)
- Add type_complexity allows on pg repository functions (12 locations)
- Fix dead code warnings in test modules with allow attributes
- Fix E0599 by gating new_stub() for integration_tests feature
- Add result_unit_err and result_large_err allows where appropriate
- Apply rustfmt formatting

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
zjean
2026-03-04 21:40:38 +01:00
parent a7de63d80f
commit 45c60faeb5
11 changed files with 77 additions and 52 deletions
+1
View File
@@ -57,6 +57,7 @@ urlencoding = "2.1.3"
[features]
default = []
test_utils = ["mockall"]
integration_tests = []
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(integration_tests)'] }
@@ -1041,10 +1041,15 @@ impl BatchOperationService {
#[cfg(integration_tests)]
mod tests {
#[allow(unused_imports)]
use super::*;
#[allow(unused_imports)]
use crate::infrastructure::repositories::pg::file_blob_read_repository::FileBlobReadRepository;
#[allow(unused_imports)]
use crate::infrastructure::repositories::pg::file_blob_write_repository::FileBlobWriteRepository;
#[allow(unused_imports)]
use crate::infrastructure::repositories::pg::folder_db_repository::FolderDbRepository;
#[allow(unused_imports)]
use std::sync::Arc;
#[tokio::test]
@@ -131,17 +131,20 @@ impl FileReadPort for MockFileReadPort {
}
/// Minimal mock write port — only `move_file` and `rename_file` need real logic.
#[allow(dead_code)]
struct MockFileWritePort {
files: Mutex<HashMap<String, File>>,
}
impl MockFileWritePort {
#[allow(dead_code)]
fn new() -> Self {
Self {
files: Mutex::new(HashMap::new()),
}
}
#[allow(dead_code)]
fn insert(&self, id: &str, name: &str) {
let file = File::new(
id.to_string(),
+3 -1
View File
@@ -430,9 +430,11 @@ impl ShareUseCase for ShareService {
}
}
#[cfg(integration_tests)]
#[cfg(feature = "integration_tests")]
#[allow(dead_code)]
mod tests {
use super::*;
#[allow(unused_imports)]
use crate::application::dtos::share_dto::SharePermissionsDto;
use crate::application::ports::auth_ports::PasswordHasherPort;
use crate::application::ports::share_ports::ShareStoragePort;
+36 -38
View File
@@ -197,14 +197,14 @@ where
.file_write_port
.restore_from_trash(&file_id, &original_path)
.await;
if let Err(e) = result {
if !format!("{}", e).contains("not found") {
return Err(DomainError::new(
ErrorKind::InternalError,
"File",
format!("Error restoring file {} from trash: {}", file_id, e),
));
}
if let Err(e) = result
&& !format!("{}", e).contains("not found")
{
return Err(DomainError::new(
ErrorKind::InternalError,
"File",
format!("Error restoring file {} from trash: {}", file_id, e),
));
}
}
TrashedItemType::Folder => {
@@ -214,17 +214,14 @@ where
.folder_storage_port
.restore_from_trash(&folder_id, &original_path)
.await;
if let Err(e) = result {
if !format!("{}", e).contains("not found") {
return Err(DomainError::new(
ErrorKind::InternalError,
"Folder",
format!(
"Error restoring folder {} from trash: {}",
folder_id, e
),
));
}
if let Err(e) = result
&& !format!("{}", e).contains("not found")
{
return Err(DomainError::new(
ErrorKind::InternalError,
"Folder",
format!("Error restoring folder {} from trash: {}", folder_id, e),
));
}
}
}
@@ -260,14 +257,14 @@ where
TrashedItemType::File => {
let file_id = item.original_id().to_string();
let result = self.file_write_port.delete_file_permanently(&file_id).await;
if let Err(e) = result {
if !format!("{}", e).contains("not found") {
return Err(DomainError::new(
ErrorKind::InternalError,
"File",
format!("Error deleting file {} permanently: {}", file_id, e),
));
}
if let Err(e) = result
&& !format!("{}", e).contains("not found")
{
return Err(DomainError::new(
ErrorKind::InternalError,
"File",
format!("Error deleting file {} permanently: {}", file_id, e),
));
}
}
TrashedItemType::Folder => {
@@ -276,17 +273,14 @@ where
.folder_storage_port
.delete_folder_permanently(&folder_id)
.await;
if let Err(e) = result {
if !format!("{}", e).contains("not found") {
return Err(DomainError::new(
ErrorKind::InternalError,
"Folder",
format!(
"Error deleting folder {} permanently: {}",
folder_id, e
),
));
}
if let Err(e) = result
&& !format!("{}", e).contains("not found")
{
return Err(DomainError::new(
ErrorKind::InternalError,
"Folder",
format!("Error deleting folder {} permanently: {}", folder_id, e),
));
}
}
}
@@ -804,9 +798,13 @@ impl FolderRepository for MockFolderRepository {
#[cfg(integration_tests)]
mod tests {
#[allow(unused_imports)]
use super::*;
#[allow(unused_imports)]
use crate::application::ports::trash_ports::TrashUseCase;
#[allow(unused_imports)]
use crate::infrastructure::repositories::pg::file_blob_read_repository::FileBlobReadRepository;
#[allow(unused_imports)]
use crate::infrastructure::repositories::pg::file_blob_write_repository::FileBlobWriteRepository;
#[tokio::test]
@@ -235,6 +235,7 @@ impl FileReadPort for FileBlobReadRepository {
)
}
#[allow(clippy::type_complexity)]
async fn list_files(&self, folder_id: Option<&str>) -> Result<Vec<File>, DomainError> {
let rows: Vec<FileRow> = if let Some(fid) = folder_id {
sqlx::query_as(
@@ -343,6 +344,7 @@ impl FileReadPort for FileBlobReadRepository {
///
/// Uses a single SQL query with `LIMIT/OFFSET` to avoid loading the full
/// folder contents into memory. Ideal for streaming WebDAV PROPFIND.
#[allow(clippy::type_complexity)]
async fn list_files_batch(
&self,
folder_id: Option<&str>,
@@ -986,6 +988,7 @@ impl FileReadPort for FileBlobReadRepository {
Ok(count)
}
#[allow(clippy::type_complexity)]
async fn suggest_files_by_name(
&self,
folder_id: Option<&str>,
@@ -1061,9 +1064,11 @@ impl FileReadPort for FileBlobReadRepository {
}
}
#[cfg(integration_tests)]
#[cfg(feature = "integration_tests")]
#[allow(dead_code)]
mod tests {
use super::*;
#[allow(unused_imports)]
use crate::common::stubs::StubDedupPort;
use crate::infrastructure::repositories::pg::folder_db_repository::FolderDbRepository;
@@ -198,6 +198,7 @@ impl FolderRepository for FolderDbRepository {
Self::row_to_folder(row.0, row.1, row.2, row.3, Some(row.4), row.5, row.6)
}
#[allow(clippy::type_complexity)]
async fn list_folders(&self, parent_id: Option<&str>) -> Result<Vec<Folder>, DomainError> {
let rows: Vec<FolderRow> = if let Some(pid) = parent_id {
sqlx::query_as(
@@ -236,6 +237,7 @@ impl FolderRepository for FolderDbRepository {
.collect()
}
#[allow(clippy::type_complexity)]
async fn list_folders_by_owner(
&self,
parent_id: Option<&str>,
@@ -283,6 +285,7 @@ impl FolderRepository for FolderDbRepository {
/// Paginated folder listing — single query with `COUNT(*) OVER()` window
/// function so the total matching count comes back alongside the data rows,
/// eliminating a separate COUNT round-trip.
#[allow(clippy::type_complexity)]
async fn list_folders_paginated(
&self,
parent_id: Option<&str>,
@@ -346,6 +349,7 @@ impl FolderRepository for FolderDbRepository {
/// Paginated folder listing filtered by owner — single query with
/// `COUNT(*) OVER()` to avoid a separate COUNT round-trip.
#[allow(clippy::type_complexity)]
async fn list_folders_by_owner_paginated(
&self,
parent_id: Option<&str>,
@@ -685,6 +689,7 @@ impl FolderRepository for FolderDbRepository {
///
/// Single GiST-indexed query: `fo.lpath <@ (root's lpath)`.
/// Ordered by `fo.path` so callers can iterate in directory order.
#[allow(clippy::type_complexity)]
async fn list_subtree_folders(&self, folder_id: &str) -> Result<Vec<Folder>, DomainError> {
let sql = "SELECT fo.id::text, fo.name, fo.path, fo.parent_id::text, \
fo.user_id::text, \
@@ -716,6 +721,7 @@ impl FolderRepository for FolderDbRepository {
/// - Non-recursive: `WHERE parent_id = $1 AND user_id = $2 [AND LIKE]`
/// - Recursive + folder_id: delegates to `list_descendant_folders`
/// - Recursive + no folder_id: `WHERE user_id = $1 [AND LIKE]`
#[allow(clippy::type_complexity)]
async fn search_folders(
&self,
parent_id: Option<&str>,
@@ -854,6 +860,7 @@ impl FolderRepository for FolderDbRepository {
///
/// Single SQL query: `fo.lpath <@ (root's lpath)` fetches the entire
/// subtree in one indexed scan. Optional name filter is pushed to SQL.
#[allow(clippy::type_complexity)]
async fn list_descendant_folders(
&self,
folder_id: &str,
@@ -902,6 +909,7 @@ impl FolderRepository for FolderDbRepository {
.collect()
}
#[allow(clippy::type_complexity)]
async fn suggest_folders_by_name(
&self,
parent_id: Option<&str>,
+1 -1
View File
@@ -111,7 +111,7 @@ impl DedupService {
}
/// Creates a stub instance for testing — never hits PG or the filesystem.
#[cfg(test)]
#[cfg(any(test, feature = "integration_tests"))]
pub fn new_stub() -> Self {
let stub_pool = Arc::new(
sqlx::pool::PoolOptions::<sqlx::Postgres>::new()
@@ -63,12 +63,13 @@ impl WebDavLockStore {
///
/// Returns `Ok(LockEntry)` on success, or `Err(existing)` if the resource
/// is already exclusively locked by a different token.
pub fn acquire(&self, path: &str, info: LockInfo) -> Result<LockEntry, Box<LockEntry>> {
#[allow(clippy::result_large_err)]
pub fn acquire(&self, path: &str, info: LockInfo) -> Result<LockEntry, LockEntry> {
// Check for existing conflicting lock
if let Some(existing) = self.by_path.get(path)
&& existing.info.scope == LockScope::Exclusive
{
return Err(Box::new(existing));
return Err(existing);
}
let ttl = Self::parse_timeout(info.timeout.as_deref());
@@ -63,15 +63,15 @@ pub async fn basic_auth_middleware(
parse_basic_auth(auth_header).ok_or(NextcloudAuthError::Unauthorized)?;
// Check account lockout before attempting password verification (saves CPU)
if let Some(auth_svc) = state.auth_service.as_ref() {
if let Err(secs) = auth_svc.login_lockout.check(&username) {
tracing::warn!(
username = %username,
lockout_remaining_secs = secs,
"[NC] Account locked — too many failed attempts"
);
return Err(NextcloudAuthError::Unauthorized);
}
if let Some(auth_svc) = state.auth_service.as_ref()
&& let Err(secs) = auth_svc.login_lockout.check(&username)
{
tracing::warn!(
username = %username,
lockout_remaining_secs = secs,
"[NC] Account locked — too many failed attempts"
);
return Err(NextcloudAuthError::Unauthorized);
}
let nextcloud = state
+2
View File
@@ -1,3 +1,5 @@
#![allow(async_fn_in_trait)]
#[global_allocator]
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;