Bump Rust edition to 2024 from 2021

Author: SpriteOvO

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "closely"
 version = "0.1.24"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]

src/config/accounts.rs

@@ -1,5 +1,5 @@
 use std::{
-    collections::{hash_map::Values, HashMap},
+    collections::{HashMap, hash_map::Values},
     fmt,
 };
 

src/config/mod.rs

@@ -619,10 +619,11 @@ platform = { name = "bilibili.live", user_id = 123456 }
 notify = []
             "#,
             |c| {
-                assert!(c
-                    .unwrap_err()
-                    .to_string()
-                    .ends_with("reference of notify not found 'reporter_notify'"))
+                assert!(
+                    c.unwrap_err()
+                        .to_string()
+                        .ends_with("reference of notify not found 'reporter_notify'")
+                )
             },
         );
 
@@ -635,10 +636,11 @@ platform = { name = "bilibili.live", user_id = 123456 }
 notify = ["meow"]
             "#,
             |c| {
-                assert!(c
-                    .unwrap_err()
-                    .to_string()
-                    .ends_with("reference of notify not found 'meow'"))
+                assert!(
+                    c.unwrap_err()
+                        .to_string()
+                        .ends_with("reference of notify not found 'meow'")
+                )
             },
         );
 
@@ -654,10 +656,11 @@ platform = { name = "bilibili.live", user_id = 123456 }
 notify = ["meow", "woof"]
             "#,
             |c| {
-                assert!(c
-                    .unwrap_err()
-                    .to_string()
-                    .ends_with("reference of notify not found 'woof'"))
+                assert!(
+                    c.unwrap_err()
+                        .to_string()
+                        .ends_with("reference of notify not found 'woof'")
+                )
             },
         );
 
@@ -673,10 +676,11 @@ platform = { name = "bilibili.live", user_id = 123456 }
 notify = ["meow"]
             "#,
             |c| {
-                assert!(c
-                    .unwrap_err()
-                    .to_string()
-                    .ends_with("both token in global and notify are missing"))
+                assert!(
+                    c.unwrap_err()
+                        .to_string()
+                        .ends_with("both token in global and notify are missing")
+                )
             },
         );
     }

src/notify/shared.rs

@@ -1,5 +1,5 @@
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    collections::{HashMap, hash_map::Entry},
     sync::{Arc, LazyLock, Mutex as StdMutex},
 };
 

src/platform/bilibili/source/live.rs

@@ -12,7 +12,7 @@ use serde_json::{self as json, json};
 use spdlog::critical;
 use tokio::sync::Mutex;
 
-use super::super::{bilibili_request_builder, upgrade_to_https, Response};
+use super::super::{Response, bilibili_request_builder, upgrade_to_https};
 use crate::{
     config::{Accessor, Validator},
     platform::{PlatformMetadata, PlatformTrait, PlatformTraitStatic},

src/platform/bilibili/source/playback/bililive_recorder.rs

@@ -10,7 +10,7 @@ use serde_json as json;
 use spdlog::prelude::*;
 use tokio::{
     fs,
-    sync::{mpsc, Mutex},
+    sync::{Mutex, mpsc},
 };
 use warp::Filter;
 

src/platform/bilibili/source/space.rs

@@ -11,16 +11,16 @@ use std::{
 
 use anyhow::{anyhow, bail, ensure};
 use chrono::DateTime;
-use reqwest::{header::COOKIE, Url};
+use reqwest::{Url, header::COOKIE};
 use serde::Deserialize;
 use serde_json::{self as json};
 use spdlog::prelude::*;
 use tokio::sync::Mutex;
 
-use super::super::{upgrade_to_https, Response};
+use super::super::{Response, upgrade_to_https};
 use crate::{
     config::{Accessor, AsSecretRef, Config, Validator},
-    platform::{bilibili::bilibili_request_builder, PlatformMetadata, PlatformTraitStatic},
+    platform::{PlatformMetadata, PlatformTraitStatic, bilibili::bilibili_request_builder},
     prop,
     source::{
         FetcherTrait, Post, PostAttachment, PostAttachmentImage, PostContent, PostUrl, PostUrls,
@@ -981,25 +981,23 @@ mod tests {
         let history = fetch_space_history(8047632, &mut blocked, None)
             .await
             .unwrap();
-        assert!(history.0.iter().all(|post| !post
-            .urls
-            .major()
-            .as_clickable()
-            .unwrap()
-            .url
-            .is_empty()));
+        assert!(
+            history
+                .0
+                .iter()
+                .all(|post| !post.urls.major().as_clickable().unwrap().url.is_empty())
+        );
         assert!(history.0.iter().all(|post| !post.content.is_empty()));
 
         let history = fetch_space_history(178362496, &mut blocked, None)
             .await
             .unwrap();
-        assert!(history.0.iter().all(|post| !post
-            .urls
-            .major()
-            .as_clickable()
-            .unwrap()
-            .url
-            .is_empty()));
+        assert!(
+            history
+                .0
+                .iter()
+                .all(|post| !post.urls.major().as_clickable().unwrap().url.is_empty())
+        );
         assert!(history.0.iter().all(|post| !post.content.is_empty()));
     }
 }

src/platform/bilibili/source/video.rs

@@ -5,7 +5,7 @@ use chrono::DateTime;
 use serde::Deserialize;
 use serde_json as json;
 
-use super::super::{bilibili_request_builder, upgrade_to_https, Response};
+use super::super::{Response, bilibili_request_builder, upgrade_to_https};
 use crate::{
     config::{Accessor, Validator},
     platform::{PlatformMetadata, PlatformTraitStatic},
@@ -171,13 +171,12 @@ mod tests {
     async fn deser() {
         let videos = fetch_series_archives(522384919, 3747026).await.unwrap();
 
-        assert!(videos.0.iter().all(|post| !post
-            .urls
-            .major()
-            .as_clickable()
-            .unwrap()
-            .url
-            .is_empty()));
+        assert!(
+            videos
+                .0
+                .iter()
+                .all(|post| !post.urls.major().as_clickable().unwrap().url.is_empty())
+        );
         assert!(videos.0.iter().all(|post| !post.content.is_empty()));
     }
 }

src/platform/github/source/mod.rs

@@ -1,6 +1,6 @@
 use std::{fmt, future::Future, pin::Pin};
 
-use anyhow::{anyhow, ensure, Ok};
+use anyhow::{Ok, anyhow, ensure};
 use serde::Deserialize;
 
 use crate::{

src/platform/qq/notify/mod.rs

@@ -4,7 +4,7 @@ use anyhow::{anyhow, ensure};
 use serde::Deserialize;
 use spdlog::prelude::*;
 
-use super::{onebot11, ConfigChat};
+use super::{ConfigChat, onebot11};
 use crate::{
     config::{self, Accessor, AccountRef, Config, ContextualValidator, Overridable, Validator},
     format_if, helper,