From a86611d4cf0f6e21876a074e99ea4f27d770f2fd Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 24 Oct 2026 20:07:48 +0800 Subject: [PATCH] =?UTF-8?q?chore(lint):=20=E6=B8=85=E6=8E=89=204=20?= =?UTF-8?q?=E6=9D=A1=E6=97=A2=E6=9C=89=20clippy=20=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=EF=BC=8C=E5=90=AF=E7=94=A8=20-D=20warnings=20=E9=97=B8?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **影响** `cargo clippy --lib --all-targets -- -D warnings` 从「必然失败(4 条既有告警)」变为 **0 告警通过**, 后续任务可以直接把它当闸门用(此前 Task 3 round 5 的实现者因这 4 条告警无法验证自己的改动)。 **改动** - `src/db.rs:329` / `:374`:`needless_range_loop` ⇒ 改用 `for row in &rows` 直接迭代行。 - `src/db.rs:352`:`needless_question_mark` ⇒ `Ok(rows[0].get::>(0)?)` ⇒ `rows[0].get::>(0)`。 - `src/main.rs:77` / `:81`:`ptr_arg` ⇒ `&PathBuf` ⇒ `&Path`(`identity_path` / `read_identity`), 导入改为 `use std::path::{Path, PathBuf};`。 **设计** 纯机械等价改写:不改查询语义、不改返回类型、不改调用点(`&PathBuf` → `&Path` 由 deref 强转自动成立)。 `cargo test` 全绿:109 + 7 + 1 + 2 doctests,0 失败。 Co-Authored-By: Claude Code --- src/db.rs | 12 ++++++------ src/main.rs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/db.rs b/src/db.rs index 2a27a7b..417864d 100644 --- a/src/db.rs +++ b/src/db.rs @@ -326,8 +326,8 @@ pub async fn query_json_params( let wrapped = format!("SELECT row_to_json(q)::text AS _row FROM ({}) AS q", trimmed); let rows = db.query(&wrapped, params).await?; let mut out = Vec::with_capacity(rows.len()); - for i in 0..rows.len() { - let s: Option = rows[i].get(0)?; + for row in &rows { + let s: Option = row.get(0)?; match s { Some(t) => match serde_json::from_str::(&t) { Ok(v) => out.push(v), @@ -349,7 +349,7 @@ pub async fn query_scalar_text( if rows.is_empty() { return Ok(None); } - Ok(rows[0].get::>(0)?) + rows[0].get::>(0) } /// 列名 → PG 类型文本(`character varying(50)` / `bigint` / `timestamp without time zone` …)。 @@ -371,9 +371,9 @@ pub async fn column_types(db: &PGlite, table: &str) -> Result = rows[i].get(0)?; - let ty: Option = rows[i].get(1)?; + for row in &rows { + let name: Option = row.get(0)?; + let ty: Option = row.get(1)?; if let (Some(name), Some(ty)) = (name, ty) { out.insert(name, ty); } diff --git a/src/main.rs b/src/main.rs index 2a17a44..6a73e20 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,7 @@ //! 本文件里剩下的 `/api/db/*` 与 `/api/ssw/tdc/node/*` 是**旧控制台**的遗留端点, //! Task 10 统一下线。 -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::Arc; use axum::{ @@ -74,11 +74,11 @@ fn now_iso() -> String { Utc::now().to_rfc3339() } -fn identity_path(data_dir: &PathBuf) -> PathBuf { +fn identity_path(data_dir: &Path) -> PathBuf { data_dir.join("node-identity.json") } -fn read_identity(data_dir: &PathBuf) -> Option { +fn read_identity(data_dir: &Path) -> Option { let p = identity_path(data_dir); if !p.exists() { return None;