refactor(clippy): fix the never-loop error and clear all lint warnings
All checks were successful
deploy / test-backend (push) Successful in 30m17s
deploy / test-frontend (push) Successful in 10m33s
deploy / build-and-push (push) Successful in 11m11s
deploy / deploy (push) Successful in 13s

`cargo clippy --all-targets` was failing on a deny-by-default
`never_loop` in the analysis SSE handler (the `loop` always returned on
the first iteration — the stream `unfold` already re-enters per event),
plus ~28 warnings. All resolved with no behaviour change:

- admin/analysis SSE: drop the dead `loop` wrapper.
- app: match port literals directly instead of `if p == 80` guards.
- repo/user: separate doc list from the following paragraphs.
- repo/upload_history: `sort_by_key(Reverse(..))` over `sort_by`.
- crawler/nav test: construct the error directly (no `unwrap_err` on a
  literal `Err`).
- test helpers: build configs via struct-update syntax instead of
  `Default::default()` + field reassignment; add a type alias for a
  complex audit-row tuple.
- plus the mechanical `deref`/etc. fixes from `cargo clippy --fix`.

Note: not running `cargo fmt` — the backend uses a consistent
hand-formatted style that differs from rustfmt-default across ~110
files, so a blanket reformat would be pure churn.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
MechaCat02
2026-07-02 20:45:37 +02:00
parent ded77fe4ba
commit 35c02066fe
13 changed files with 91 additions and 70 deletions

View File

@@ -1212,14 +1212,16 @@ mod tests {
// VisionClient pointed at a closed local port. Reqwest fails the // VisionClient pointed at a closed local port. Reqwest fails the
// POST immediately (connection refused), but the prep work runs // POST immediately (connection refused), but the prep work runs
// before the POST is even built. // before the POST is even built.
let mut cfg = AnalysisConfig::default(); let cfg = AnalysisConfig {
cfg.endpoint = "http://127.0.0.1:1/v1/chat/completions".into(); endpoint: "http://127.0.0.1:1/v1/chat/completions".into(),
cfg.model = "stub".into(); model: "stub".into(),
cfg.request_timeout = Duration::from_secs(1); request_timeout: Duration::from_secs(1),
// Tune slice geometry to match the test image's shape. // Tune slice geometry to match the test image's shape.
cfg.max_pixels = 1_000_000; max_pixels: 1_000_000,
cfg.min_slice_height = 100; min_slice_height: 100,
cfg.tall_aspect_threshold = 1.8; tall_aspect_threshold: 1.8,
..Default::default()
};
let http = reqwest::Client::builder() let http = reqwest::Client::builder()
.timeout(cfg.request_timeout) .timeout(cfg.request_timeout)
.no_proxy() .no_proxy()

View File

@@ -58,20 +58,20 @@ async fn stream_status(
) -> Sse<impl Stream<Item = Result<Event, Infallible>>> { ) -> Sse<impl Stream<Item = Result<Event, Infallible>>> {
let rx = state.analysis_events.subscribe(); let rx = state.analysis_events.subscribe();
let stream = futures_util::stream::unfold(rx, |mut rx| async move { let stream = futures_util::stream::unfold(rx, |mut rx| async move {
loop { // One recv per unfold step; the stream driver re-enters for the next
match rx.recv().await { // event, so no explicit loop is needed here.
Ok(ev) => { match rx.recv().await {
let event = Event::default() Ok(ev) => {
.event("analysis") let event = Event::default()
.json_data(&ev) .event("analysis")
.unwrap_or_else(|_| Event::default().comment("serialize error")); .json_data(&ev)
return Some((Ok(event), rx)); .unwrap_or_else(|_| Event::default().comment("serialize error"));
} Some((Ok(event), rx))
Err(RecvError::Lagged(_)) => {
return Some((Ok(Event::default().event("lagged").data("")), rx));
}
Err(RecvError::Closed) => return None,
} }
Err(RecvError::Lagged(_)) => {
Some((Ok(Event::default().event("lagged").data("")), rx))
}
Err(RecvError::Closed) => None,
} }
}); });
Sse::new(stream).keep_alive(KeepAlive::default()) Sse::new(stream).keep_alive(KeepAlive::default())

View File

@@ -255,8 +255,8 @@ async fn create(
) )
.await?; .await?;
let author_refs = repo::author::set_for_manga(&mut *tx, manga.id, &authors).await?; let author_refs = repo::author::set_for_manga(&mut tx, manga.id, &authors).await?;
repo::genre::set_for_manga(&mut *tx, manga.id, &metadata.genre_ids).await?; repo::genre::set_for_manga(&mut tx, manga.id, &metadata.genre_ids).await?;
if let Some(img) = cover { if let Some(img) = cover {
let key = format!("mangas/{}/cover.{}", manga.id, img.ext); let key = format!("mangas/{}/cover.{}", manga.id, img.ext);
@@ -321,7 +321,7 @@ async fn update(
let mut tx = state.db.begin().await?; let mut tx = state.db.begin().await?;
let _updated = repo::manga::update_basics( let _updated = repo::manga::update_basics(
&mut *tx, &mut tx,
id, id,
patch.title.as_deref().map(str::trim), patch.title.as_deref().map(str::trim),
patch.status.as_deref().map(str::trim), patch.status.as_deref().map(str::trim),
@@ -331,10 +331,10 @@ async fn update(
) )
.await?; .await?;
if let Some(ref names) = authors_owned { if let Some(ref names) = authors_owned {
repo::author::set_for_manga(&mut *tx, id, names).await?; repo::author::set_for_manga(&mut tx, id, names).await?;
} }
if let Some(ref ids) = patch.genre_ids { if let Some(ref ids) = patch.genre_ids {
repo::genre::set_for_manga(&mut *tx, id, ids).await?; repo::genre::set_for_manga(&mut tx, id, ids).await?;
} }
tx.commit().await?; tx.commit().await?;

View File

@@ -1266,8 +1266,8 @@ fn parse_origin(raw: &str) -> Option<String> {
let host = url.host_str()?; let host = url.host_str()?;
let scheme = url.scheme(); let scheme = url.scheme();
let port_str = match (url.port(), scheme) { let port_str = match (url.port(), scheme) {
(Some(p), "http") if p == 80 => String::new(), (Some(80), "http") => String::new(),
(Some(p), "https") if p == 443 => String::new(), (Some(443), "https") => String::new(),
(Some(p), _) => format!(":{p}"), (Some(p), _) => format!(":{p}"),
(None, _) => String::new(), (None, _) => String::new(),
}; };
@@ -1509,7 +1509,6 @@ mod tests {
let storage_dir = tempfile::tempdir().unwrap(); let storage_dir = tempfile::tempdir().unwrap();
let storage: Arc<dyn Storage> = let storage: Arc<dyn Storage> =
Arc::new(LocalStorage::new(storage_dir.path())); Arc::new(LocalStorage::new(storage_dir.path()));
let mut cfg = crate::config::AnalysisConfig::default();
// The worker always runs OCR now (vision is dormant — see // The worker always runs OCR now (vision is dormant — see
// `effective_backend`), and the `.rten` models aren't shipped to unit // `effective_backend`), and the `.rten` models aren't shipped to unit
// CI. Point the engine at a path that can't exist so the *engine build* // CI. Point the engine at a path that can't exist so the *engine build*
@@ -1518,10 +1517,13 @@ mod tests {
// readiness, so the row must still be reclaimed even though spawn // readiness, so the row must still be reclaimed even though spawn
// returns Err. That's exactly the regression this test guards (an // returns Err. That's exactly the regression this test guards (an
// analysis-only deploy must reclaim orphaned leases at startup). // analysis-only deploy must reclaim orphaned leases at startup).
cfg.ocr_detection_model = "/nonexistent/text-detection.rten".to_string(); let cfg = crate::config::AnalysisConfig {
cfg.ocr_recognition_model = "/nonexistent/text-recognition.rten".to_string(); ocr_detection_model: "/nonexistent/text-detection.rten".to_string(),
cfg.workers = 1; ocr_recognition_model: "/nonexistent/text-recognition.rten".to_string(),
cfg.job_timeout = Duration::from_secs(1); workers: 1,
job_timeout: Duration::from_secs(1),
..Default::default()
};
let events = Arc::new(crate::analysis::events::AnalysisEvents::new()); let events = Arc::new(crate::analysis::events::AnalysisEvents::new());
let spawned = spawn_analysis_daemon(pool.clone(), storage, &cfg, events).await; let spawned = spawn_analysis_daemon(pool.clone(), storage, &cfg, events).await;

View File

@@ -876,8 +876,10 @@ mod tests {
// what `ANALYSIS_BACKEND` parsed to. `backend` still reflects the raw // what `ANALYSIS_BACKEND` parsed to. `backend` still reflects the raw
// request (so the override is visible/loggable), but `effective_backend` // request (so the override is visible/loggable), but `effective_backend`
// is the value the daemon actually dispatches through. // is the value the daemon actually dispatches through.
let mut cfg = AnalysisConfig::default(); let mut cfg = AnalysisConfig {
cfg.backend = AnalysisBackend::Vision; backend: AnalysisBackend::Vision,
..Default::default()
};
assert_eq!(cfg.effective_backend(), AnalysisBackend::Ocr); assert_eq!(cfg.effective_backend(), AnalysisBackend::Ocr);
cfg.backend = AnalysisBackend::Ocr; cfg.backend = AnalysisBackend::Ocr;
assert_eq!(cfg.effective_backend(), AnalysisBackend::Ocr); assert_eq!(cfg.effective_backend(), AnalysisBackend::Ocr);

View File

@@ -164,8 +164,7 @@ mod tests {
#[test] #[test]
fn anyhow_with_nav_timeout_in_chain_is_flagged() { fn anyhow_with_nav_timeout_in_chain_is_flagged() {
let inner: Result<(), NavError> = Err(NavError::Timeout(NAV_TIMEOUT)); let outer = NavError::Timeout(NAV_TIMEOUT);
let outer = inner.unwrap_err();
let wrapped: anyhow::Error = let wrapped: anyhow::Error =
anyhow::Error::new(outer).context("wait for chapter nav"); anyhow::Error::new(outer).context("wait for chapter nav");
assert!(anyhow_looks_browser_dead(&wrapped)); assert!(anyhow_looks_browser_dead(&wrapped));

View File

@@ -110,7 +110,7 @@ pub async fn list_for_user(
}); });
} }
// Newest first; trim to limit after the merge. // Newest first; trim to limit after the merge.
entries.sort_by(|a, b| b.created_at().cmp(&a.created_at())); entries.sort_by_key(|b| std::cmp::Reverse(b.created_at()));
entries.truncate(limit as usize); entries.truncate(limit as usize);
let (manga_total, chapter_total): (i64, i64) = sqlx::query_as( let (manga_total, chapter_total): (i64, i64) = sqlx::query_as(

View File

@@ -157,8 +157,10 @@ pub async fn set_is_admin_unchecked(pool: &PgPool, id: Uuid, value: bool) -> App
/// - If a row already exists: flip `is_admin` to true if needed; **never** /// - If a row already exists: flip `is_admin` to true if needed; **never**
/// touch the existing `password_hash`. Lets the operator rotate the /// touch the existing `password_hash`. Lets the operator rotate the
/// admin password through the UI without env-var conflict. /// admin password through the UI without env-var conflict.
///
/// Wrapped in a transaction so a concurrent `register` for the same /// Wrapped in a transaction so a concurrent `register` for the same
/// username can't slip an INSERT between the SELECT and UPDATE/INSERT. /// username can't slip an INSERT between the SELECT and UPDATE/INSERT.
///
/// Set `is_admin` on a user with full safety checks: rejects self-demote, /// Set `is_admin` on a user with full safety checks: rejects self-demote,
/// rejects demoting the only remaining admin (under `ADMIN_INVARIANT_LOCK_KEY` /// rejects demoting the only remaining admin (under `ADMIN_INVARIANT_LOCK_KEY`
/// to close the parallel-demote race), and writes an `admin_audit` row /// to close the parallel-demote race), and writes an `admin_audit` row

View File

@@ -567,11 +567,13 @@ mod tests {
#[test] #[test]
fn crawler_round_trips_through_dto() { fn crawler_round_trips_through_dto() {
let mut base = CrawlerConfig::default(); let base = CrawlerConfig {
base.start_url = Some("https://example.com/".to_string()); start_url: Some("https://example.com/".to_string()),
base.tz = Tz::Europe__Berlin; tz: Tz::Europe__Berlin,
base.chapter_workers = 3; chapter_workers: 3,
base.cookie_domain = Some("example.com".to_string()); cookie_domain: Some("example.com".to_string()),
..Default::default()
};
let dto = CrawlerSettings::from_config(&base); let dto = CrawlerSettings::from_config(&base);
let back = dto.to_config(&base).expect("valid"); let back = dto.to_config(&base).expect("valid");
assert_eq!(back.tz, Tz::Europe__Berlin); assert_eq!(back.tz, Tz::Europe__Berlin);
@@ -597,10 +599,12 @@ mod tests {
#[test] #[test]
fn crawler_overlay_preserves_env_only_fields() { fn crawler_overlay_preserves_env_only_fields() {
let mut base = CrawlerConfig::default(); let base = CrawlerConfig {
base.proxy = Some("socks5://127.0.0.1:9050".to_string()); proxy: Some("socks5://127.0.0.1:9050".to_string()),
base.tor_control_password = Some("secret".to_string()); tor_control_password: Some("secret".to_string()),
base.phpsessid = Some("abc123".to_string()); phpsessid: Some("abc123".to_string()),
..Default::default()
};
// A DTO that knows nothing about the env-only fields. // A DTO that knows nothing about the env-only fields.
let dto = CrawlerSettings { let dto = CrawlerSettings {
rate_ms: 2000, rate_ms: 2000,
@@ -704,8 +708,10 @@ mod tests {
#[test] #[test]
fn analysis_captures_env_prompt_override() { fn analysis_captures_env_prompt_override() {
let mut base = AnalysisConfig::default(); let base = AnalysisConfig {
base.system_prompt = "custom env prompt".to_string(); system_prompt: "custom env prompt".to_string(),
..Default::default()
};
let dto = AnalysisSettings::from_config(&base); let dto = AnalysisSettings::from_config(&base);
assert_eq!(dto.system_prompt.as_deref(), Some("custom env prompt")); assert_eq!(dto.system_prompt.as_deref(), Some("custom env prompt"));
} }
@@ -729,8 +735,10 @@ mod tests {
#[test] #[test]
fn analysis_overlay_preserves_api_key() { fn analysis_overlay_preserves_api_key() {
let mut base = AnalysisConfig::default(); let base = AnalysisConfig {
base.api_key = Some("sk-secret".to_string()); api_key: Some("sk-secret".to_string()),
..Default::default()
};
let dto = AnalysisSettings::from_config(&base); let dto = AnalysisSettings::from_config(&base);
assert_eq!(dto.to_config(&base).unwrap().api_key.as_deref(), Some("sk-secret")); assert_eq!(dto.to_config(&base).unwrap().api_key.as_deref(), Some("sk-secret"));
} }
@@ -872,8 +880,10 @@ mod tests {
// a hostile/CSRF-able admin must NOT be able to point endpoint at // a hostile/CSRF-able admin must NOT be able to point endpoint at
// cloud metadata, loopback services, or RFC1918 hosts — when the // cloud metadata, loopback services, or RFC1918 hosts — when the
// worker is enabled (toggling enabled=true later re-runs this gate). // worker is enabled (toggling enabled=true later re-runs this gate).
let mut base = AnalysisConfig::default(); let base = AnalysisConfig {
base.backend = AnalysisBackend::Vision; backend: AnalysisBackend::Vision,
..Default::default()
};
for url in [ for url in [
"http://169.254.169.254/v1/chat/completions", "http://169.254.169.254/v1/chat/completions",
"http://127.0.0.1:5432/", "http://127.0.0.1:5432/",
@@ -897,8 +907,10 @@ mod tests {
// The documented default — docker DNS name resolving to a private IP // The documented default — docker DNS name resolving to a private IP
// at runtime — must still validate, because the bearer recipient // at runtime — must still validate, because the bearer recipient
// identity is the operator-chosen hostname, not the underlying IP. // identity is the operator-chosen hostname, not the underlying IP.
let mut base = AnalysisConfig::default(); let base = AnalysisConfig {
base.backend = AnalysisBackend::Vision; backend: AnalysisBackend::Vision,
..Default::default()
};
for url in [ for url in [
"http://mangalord-vision:8000/v1/chat/completions", "http://mangalord-vision:8000/v1/chat/completions",
"https://api.openai.com/v1/chat/completions", "https://api.openai.com/v1/chat/completions",
@@ -931,8 +943,10 @@ mod tests {
fn analysis_requires_model_only_when_enabled() { fn analysis_requires_model_only_when_enabled() {
// Vision base: the model id is required only when the vision worker // Vision base: the model id is required only when the vision worker
// is actually live (see the OCR carve-out below). // is actually live (see the OCR carve-out below).
let mut base = AnalysisConfig::default(); let base = AnalysisConfig {
base.backend = AnalysisBackend::Vision; backend: AnalysisBackend::Vision,
..Default::default()
};
let disabled = AnalysisSettings { let disabled = AnalysisSettings {
enabled: false, enabled: false,
model: "".to_string(), model: "".to_string(),

View File

@@ -279,7 +279,7 @@ async fn backfill_fills_unmeasured_pages_and_covers_idempotently(pool: PgPool) {
let body2 = common::body_json(resp2).await; let body2 = common::body_json(resp2).await;
assert_eq!(body2["pages"].as_i64().unwrap(), 0); assert_eq!(body2["pages"].as_i64().unwrap(), 0);
assert_eq!(body2["covers"].as_i64().unwrap(), 0); assert_eq!(body2["covers"].as_i64().unwrap(), 0);
assert_eq!(body2["more_remaining"].as_bool().unwrap(), false); assert!(!body2["more_remaining"].as_bool().unwrap());
} }
#[sqlx::test(migrations = "./migrations")] #[sqlx::test(migrations = "./migrations")]
@@ -362,7 +362,7 @@ async fn backfill_caps_per_run_and_reports_more_remaining(pool: PgPool) {
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
let body = common::body_json(resp).await; let body = common::body_json(resp).await;
// Capped at 20_000 attempts this run; one row left → run again. // Capped at 20_000 attempts this run; one row left → run again.
assert_eq!(body["more_remaining"].as_bool().unwrap(), true); assert!(body["more_remaining"].as_bool().unwrap());
assert_eq!(body["missing"].as_i64().unwrap(), 20_000); assert_eq!(body["missing"].as_i64().unwrap(), 20_000);
assert_eq!(body["pages"].as_i64().unwrap(), 0); assert_eq!(body["pages"].as_i64().unwrap(), 0);
} }
@@ -403,9 +403,8 @@ async fn backfill_at_exact_cap_is_not_more_remaining(pool: PgPool) {
.unwrap(); .unwrap();
let body = common::body_json(resp).await; let body = common::body_json(resp).await;
assert_eq!(body["missing"].as_i64().unwrap(), 20_000); assert_eq!(body["missing"].as_i64().unwrap(), 20_000);
assert_eq!( assert!(
body["more_remaining"].as_bool().unwrap(), !body["more_remaining"].as_bool().unwrap(),
false,
"exactly-cap backlog drains in one run; no follow-up needed" "exactly-cap backlog drains in one run; no follow-up needed"
); );
} }

View File

@@ -381,10 +381,11 @@ async fn delete_writes_audit_row(pool: PgPool) {
.unwrap(); .unwrap();
assert_eq!(resp.status(), StatusCode::NO_CONTENT); assert_eq!(resp.status(), StatusCode::NO_CONTENT);
let rows: Vec<(Option<Uuid>, String, String, Option<Uuid>, serde_json::Value)> = // (actor_user_id, action, target_kind, target_id, payload)
sqlx::query_as( type AuditRow = (Option<Uuid>, String, String, Option<Uuid>, serde_json::Value);
"SELECT actor_user_id, action, target_kind, target_id, payload FROM admin_audit", let rows: Vec<AuditRow> = sqlx::query_as(
) "SELECT actor_user_id, action, target_kind, target_id, payload FROM admin_audit",
)
.fetch_all(&pool) .fetch_all(&pool)
.await .await
.unwrap(); .unwrap();

View File

@@ -446,7 +446,7 @@ async fn list_tie_break_orders_equal_keys_by_ascending_id(pool: PgPool) {
// Paginating one row at a time reproduces that exact sequence — no overlap, // Paginating one row at a time reproduces that exact sequence — no overlap,
// no gap — which only holds because the id tie-break makes the order total. // no gap — which only holds because the id tie-break makes the order total.
let paged: Vec<String> = vec![page(1, 0).await, page(1, 1).await, page(1, 2).await] let paged: Vec<String> = [page(1, 0).await, page(1, 1).await, page(1, 2).await]
.iter() .iter()
.map(|b| b["items"][0]["title"].as_str().unwrap().to_string()) .map(|b| b["items"][0]["title"].as_str().unwrap().to_string())
.collect(); .collect();

View File

@@ -279,7 +279,7 @@ async fn tag_autocomplete_returns_matches_ordered_by_similarity(pool: PgPool) {
.iter() .iter()
.map(|t| t["name"].as_str().unwrap()) .map(|t| t["name"].as_str().unwrap())
.collect(); .collect();
assert!(names.iter().any(|n| *n == "Mystery")); assert!(names.contains(&"Mystery"));
assert!(names.iter().any(|n| *n == "Murder Mystery")); assert!(names.contains(&"Murder Mystery"));
assert!(!names.iter().any(|n| *n == "Comedy")); assert!(!names.contains(&"Comedy"));
} }