From 27534a0ce742e7c41ef969522bd0dc4c677882bb Mon Sep 17 00:00:00 2001 From: GitHub Date: Wed, 23 Jul 2025 14:08:17 +0800 Subject: [PATCH] clippy --- src/controller/admin.rs | 16 ++++++++-------- src/controller/feed.rs | 4 ++-- src/controller/fmt.rs | 4 ++-- src/controller/inn.rs | 12 +++++------- src/controller/message.rs | 4 ++-- src/controller/mod.rs | 6 +++--- src/controller/solo.rs | 4 ++-- src/controller/tantivy.rs | 4 ++-- src/controller/upload.rs | 2 +- src/controller/user.rs | 6 +++--- 10 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/controller/admin.rs b/src/controller/admin.rs index a7a01fb..d69763c 100644 --- a/src/controller/admin.rs +++ b/src/controller/admin.rs @@ -103,32 +103,32 @@ pub(crate) async fn admin_view( "users" => { let key = ivec_to_u32(&k); let (one, _): (User, usize) = bincode::decode_from_slice(&v, standard())?; - let one_fmt = unescape(&format!("{:?}", one)).unwrap(); + let one_fmt = unescape(&format!("{one:?}")).unwrap(); ones.push(format!("{key}: {one_fmt}")); } "solos" => { let key = ivec_to_u32(&k); let (one, _): (Solo, usize) = bincode::decode_from_slice(&v, standard())?; - let one_fmt = unescape(&format!("{:?}", one)).unwrap(); + let one_fmt = unescape(&format!("{one:?}")).unwrap(); ones.push(format!("{key}: {one_fmt}")); } "inns" => { let key = ivec_to_u32(&k); let (one, _): (Inn, usize) = bincode::decode_from_slice(&v, standard())?; - let one_fmt = unescape(&format!("{:?}", one)).unwrap(); + let one_fmt = unescape(&format!("{one:?}")).unwrap(); ones.push(format!("{key}: {one_fmt}")); } "posts" => { let key = ivec_to_u32(&k); let (one, _): (Post, usize) = bincode::decode_from_slice(&v, standard())?; - let one_fmt = unescape(&format!("{:?}", one)).unwrap(); + let one_fmt = unescape(&format!("{one:?}")).unwrap(); ones.push(format!("{key}: {one_fmt}")); } "post_comments" => { let pid = u8_slice_to_u32(&k[0..4]); let cid = u8_slice_to_u32(&k[4..8]); let (one, _): (Comment, usize) = bincode::decode_from_slice(&v, standard())?; - let one_fmt = unescape(&format!("{:?}", one)).unwrap(); + let one_fmt = unescape(&format!("{one:?}")).unwrap(); ones.push(format!("pid: {pid}, cid: {cid}, comment: {one_fmt}",)); } "user_comments" => { @@ -257,7 +257,7 @@ pub(crate) async fn admin_view( "feeds" => { let key = ivec_to_u32(&k); let (one, _): (Feed, usize) = bincode::decode_from_slice(&v, standard())?; - let one_fmt = unescape(&format!("{:?}", one)).unwrap(); + let one_fmt = unescape(&format!("{one:?}")).unwrap(); ones.push(format!("{key}: {one_fmt}")); } "feed_errs" | "pub_keys" => { @@ -273,7 +273,7 @@ pub(crate) async fn admin_view( "items" => { let key = ivec_to_u32(&k); let (one, _): (Item, usize) = bincode::decode_from_slice(&v, standard())?; - let one_fmt = unescape(&format!("{:?}", one)).unwrap(); + let one_fmt = unescape(&format!("{one:?}")).unwrap(); ones.push(format!("{key}: {one_fmt}")); } "home_pages" => { @@ -287,7 +287,7 @@ pub(crate) async fn admin_view( } "tan" => { let id = String::from_utf8_lossy(&k); - ones.push(format!("{id}: {:?}", v)); + ones.push(format!("{id}: {v:?}")); } "messages" => { let mid = u8_slice_to_u32(&k); diff --git a/src/controller/feed.rs b/src/controller/feed.rs index e741e83..3bda164 100644 --- a/src/controller/feed.rs +++ b/src/controller/feed.rs @@ -662,7 +662,7 @@ pub(super) async fn update( }; item_links_tree.insert(&item.link, u32_to_ivec(item_id))?; set_one(db, "items", item_id, &item)?; - tan_tree.insert(format!("item{}", item_id), &[])?; + tan_tree.insert(format!("item{item_id}"), &[])?; item_ids.push((item_id, source_item.updated)); }; } @@ -692,7 +692,7 @@ pub(super) async fn update( }; item_links_tree.insert(&item.link, u32_to_ivec(item_id))?; set_one(db, "items", item_id, &item)?; - tan_tree.insert(format!("item{}", item_id), &[])?; + tan_tree.insert(format!("item{item_id}"), &[])?; item_ids.push((item_id, source_item.updated)); }; } diff --git a/src/controller/fmt.rs b/src/controller/fmt.rs index 7e3f563..5486577 100644 --- a/src/controller/fmt.rs +++ b/src/controller/fmt.rs @@ -104,7 +104,7 @@ impl<'a, I: Iterator>> Iterator for SyntaxPreprocessor<'a, I> { return Some(Event::Html( latex2mathml::latex_to_mathml(&c, latex2mathml::DisplayStyle::Inline) .unwrap_or_else(|e| { - format!("Convert math {} failed, error: {}, check with https://osanshouo.github.io/latex2mathml-web/index.html", c, e, ) + format!("Convert math {c} failed, error: {e}, check with https://osanshouo.github.io/latex2mathml-web/index.html") }) .into(), )); @@ -113,7 +113,7 @@ impl<'a, I: Iterator>> Iterator for SyntaxPreprocessor<'a, I> { return Some(Event::Html( latex2mathml::latex_to_mathml(&c, latex2mathml::DisplayStyle::Block) .unwrap_or_else(|e| { - format!("Convert math {} failed, error: {}, check with https://osanshouo.github.io/latex2mathml-web/index.html", c, e, ) + format!("Convert math {c} failed, error: {e}, check with https://osanshouo.github.io/latex2mathml-web/index.html") }) .into(), )); diff --git a/src/controller/inn.rs b/src/controller/inn.rs index 448cef4..0472d33 100644 --- a/src/controller/inn.rs +++ b/src/controller/inn.rs @@ -811,7 +811,7 @@ pub(crate) async fn edit_post_post( claim.update_last_write(&DB)?; if inn.is_open_access() { - DB.open_tree("tan")?.insert(format!("post{}", pid), &[])?; + DB.open_tree("tan")?.insert(format!("post{pid}"), &[])?; } let target = format!("/post/{iid}/{pid}"); @@ -1613,11 +1613,10 @@ pub(crate) async fn post(

Warning

- This post was published {} days ago. The information described in this article may have changed. + This post was published {diff} days ago. The information described in this article may have changed.
- "#, - diff + "# ); content.push_str(&post.content.to_html(&DB)?); content @@ -1879,7 +1878,7 @@ pub(crate) async fn comment_post( if inn.is_open_access() { DB.open_tree("tan")? - .insert(format!("comt{}/{}", pid, cid), &[])?; + .insert(format!("comt{pid}/{cid}"), &[])?; } let target = format!("/post/{iid}/{pid}"); @@ -1948,8 +1947,7 @@ pub(crate) async fn comment_delete( inn_add_index(&DB, iid, pid, timestamp as u32, inn_type)?; - DB.open_tree("tan")? - .remove(format!("comt{}/{}", pid, cid))?; + DB.open_tree("tan")?.remove(format!("comt{pid}/{cid}"))?; let target = format!("/post/{pid}/{cid}"); Ok(Redirect::to(&target)) diff --git a/src/controller/message.rs b/src/controller/message.rs index d50a27c..7e67cb1 100644 --- a/src/controller/message.rs +++ b/src/controller/message.rs @@ -49,7 +49,7 @@ pub(crate) async fn message( .get(u32_to_ivec(uid))? .map(|s| String::from_utf8_lossy(&s).to_string()); - let title = format!("Sending e2ee Message to {}", uid); + let title = format!("Sending e2ee Message to {uid}"); let user: User = get_one(&DB, "users", uid)?; let page_message = PageMessage { @@ -93,7 +93,7 @@ pub(crate) async fn message_post( let k = [&u32_to_ivec(uid), &u32_to_ivec(mid)].concat(); DB.open_tree("user_message")?.insert(k, &[])?; - let redirect = format!("/user/{}", uid); + let redirect = format!("/user/{uid}"); Ok(Redirect::to(&redirect)) } diff --git a/src/controller/mod.rs b/src/controller/mod.rs index 40d1eeb..2b949bf 100644 --- a/src/controller/mod.rs +++ b/src/controller/mod.rs @@ -330,7 +330,7 @@ pub(super) enum PostStatus { impl Display for PostStatus { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self) + write!(f, "{self:?}") } } @@ -566,9 +566,9 @@ mod filters { Ok(v) } else { let Some(en) = I18N.get(&("en", s)) else { - panic!("No translation for {} in en", s); + panic!("No translation for {s} in en"); }; - error!("No translation for {} in {}", s, lang); + error!("No translation for {s} in {lang}"); Ok(en) } } diff --git a/src/controller/solo.rs b/src/controller/solo.rs index ddceb18..9e992f4 100644 --- a/src/controller/solo.rs +++ b/src/controller/solo.rs @@ -499,7 +499,7 @@ pub(crate) async fn solo_post( claim.update_last_write(&DB)?; if solo_type == SoloType::Public { - DB.open_tree("tan")?.insert(format!("solo{}", sid), &[])?; + DB.open_tree("tan")?.insert(format!("solo{sid}"), &[])?; } let target = if input.reply_to > 0 { @@ -584,7 +584,7 @@ pub(crate) async fn solo_delete( let k = [&u32_to_ivec(solo.uid), &sid_ivec].concat(); DB.open_tree("user_solos")?.remove(k)?; - DB.open_tree("tan")?.remove(format!("solo{}", sid))?; + DB.open_tree("tan")?.remove(format!("solo{sid}"))?; if solo.uid != claim.uid { add_notification(&DB, solo.uid, NtType::SoloDelete, claim.uid, solo.sid)?; diff --git a/src/controller/tantivy.rs b/src/controller/tantivy.rs index 76ad3e0..de01ddb 100644 --- a/src/controller/tantivy.rs +++ b/src/controller/tantivy.rs @@ -222,7 +222,7 @@ impl Tan { for i in &db.open_tree("items")? { let (k, _) = i?; let id = u8_slice_to_u32(&k); - batch.insert(format!("item{}", id).as_bytes(), &[]); + batch.insert(format!("item{id}").as_bytes(), &[]); } tan_tree.apply_batch(batch)?; @@ -380,7 +380,7 @@ impl OutSearch { "item" => { let item: Item = get_one(db, "items", id1).ok()?; Some(Self { - url: format!("/feed/read/{}", id1), + url: format!("/feed/read/{id1}"), title: item.title, date: ts_to_date(item.updated), uid: None, diff --git a/src/controller/upload.rs b/src/controller/upload.rs index 2aab2a9..80eeb02 100644 --- a/src/controller/upload.rs +++ b/src/controller/upload.rs @@ -191,7 +191,7 @@ pub(crate) async fn image_delete( let target = if let Some(referer) = get_referer(referer) { referer } else { - format!("/gallery/{}", uid) + format!("/gallery/{uid}") }; Ok(Redirect::to(&target)) } diff --git a/src/controller/user.rs b/src/controller/user.rs index 498a616..baa7252 100644 --- a/src/controller/user.rs +++ b/src/controller/user.rs @@ -234,7 +234,7 @@ impl From for Role { impl Display for Role { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self) + write!(f, "{self:?}") } } @@ -277,7 +277,7 @@ impl From for InnRole { impl Display for InnRole { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self) + write!(f, "{self:?}") } } @@ -943,7 +943,7 @@ pub(crate) async fn signup() -> Result { /// Captcha with digits /// -/// From: https://github.com/daniel-e/captcha/blob/master/examples/captcha.rs +/// From: fn captcha_digits() -> Captcha { let mut c = Captcha::new(); c.set_chars(&['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']);