From 1330e368090666efdf7a550de64c005353a6bc02 Mon Sep 17 00:00:00 2001 From: hitalin Date: Sun, 7 Jun 2026 15:55:48 +0900 Subject: [PATCH] =?UTF-8?q?fix(lint):=20clippy=20-D=20warnings=20=E3=81=AE?= =?UTF-8?q?=E6=97=A2=E5=AD=98=E9=81=95=E5=8F=8D=E3=82=92=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI の cargo clippy --all-targets -- -D warnings が main で落ちていた (#574 由来ではない既存違反)。 - db.rs: load_chat_messages の if let Ok を rows.flatten() に (manual_flatten) - models.rs: assert_eq!(_, bool) を assert!/assert!(!_) に (bool_assert_comparison) --- src/db.rs | 6 ++---- src/models.rs | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/db.rs b/src/db.rs index 4c68e5c..b07923e 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1086,10 +1086,8 @@ impl Database { )?; let rows = stmt.query_map(params![account_id, limit], Self::row_to_chat_message)?; let mut msgs = Vec::new(); - for row in rows { - if let Ok(m) = row { - msgs.push(m); - } + for m in rows.flatten() { + msgs.push(m); } Ok(msgs) } diff --git a/src/models.rs b/src/models.rs index 295d9a1..5f815a9 100644 --- a/src/models.rs +++ b/src/models.rs @@ -1754,8 +1754,8 @@ mod tests { j["unrelatedField"] = json!("ignored"); let raw: RawNote = serde_json::from_value(j).unwrap(); let note = raw.normalize("acc1", "misskey.io"); - assert_eq!(*note.mode_flags.get("isNoteInYamiMode").unwrap(), true); - assert_eq!(*note.mode_flags.get("isNoteInSuperMode").unwrap(), false); + assert!(*note.mode_flags.get("isNoteInYamiMode").unwrap()); + assert!(!*note.mode_flags.get("isNoteInSuperMode").unwrap()); assert!(!note.mode_flags.contains_key("unrelatedField")); }