edition 2024 (#4702)

* feat: update Cargo.toml for 2024 edition and optimize release profiles

* feat: refactor environment variable settings for Linux and improve code organization

* Refactor conditional statements to use `&&` for improved readability

- Updated multiple files to combine nested `if let` statements using `&&` for better clarity and conciseness.
- This change enhances the readability of the code by reducing indentation levels and making the conditions more straightforward.
- Affected files include: media_unlock_checker.rs, profile.rs, clash.rs, profiles.rs, async_proxy_query.rs, core.rs, handle.rs, hotkey.rs, service.rs, timer.rs, tray/mod.rs, merge.rs, seq.rs, config.rs, proxy.rs, window.rs, general.rs, dirs.rs, i18n.rs, init.rs, network.rs, and window.rs in the resolve module.

* refactor: streamline conditional checks using `&&` for improved readability

* fix: update release profile settings for panic behavior and optimization

* fix: adjust optimization level in Cargo.toml and reorder imports in lightweight.rs

src-tauri/src/enhance/merge.rs

@@ -18,12 +18,10 @@ pub fn use_merge(merge: Mapping, config: Mapping) -> Mapping {
 
     deep_merge(&mut config, &Value::from(merge));
 
-    let config = config.as_mapping().cloned().unwrap_or_else(|| {
+    config.as_mapping().cloned().unwrap_or_else(|| {
         log::error!("Failed to convert merged config to mapping, using empty mapping");
         Mapping::new()
-    });
-
-    config
+    })
 }
 
 #[test]

src-tauri/src/enhance/mod.rs

@@ -384,29 +384,26 @@ pub async fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
         if let Ok(app_dir) = dirs::app_home_dir() {
             let dns_path = app_dir.join("dns_config.yaml");
 
-            if dns_path.exists() {
-                if let Ok(dns_yaml) = fs::read_to_string(&dns_path) {
-                    if let Ok(dns_config) =
-                        serde_yaml_ng::from_str::<serde_yaml_ng::Mapping>(&dns_yaml)
-                    {
-                        // 处理hosts配置
-                        if let Some(hosts_value) = dns_config.get("hosts") {
-                            if hosts_value.is_mapping() {
-                                config.insert("hosts".into(), hosts_value.clone());
-                                log::info!(target: "app", "apply hosts configuration");
-                            }
-                        }
+            if dns_path.exists()
+                && let Ok(dns_yaml) = fs::read_to_string(&dns_path)
+                && let Ok(dns_config) = serde_yaml_ng::from_str::<serde_yaml_ng::Mapping>(&dns_yaml)
+            {
+                // 处理hosts配置
+                if let Some(hosts_value) = dns_config.get("hosts")
+                    && hosts_value.is_mapping()
+                {
+                    config.insert("hosts".into(), hosts_value.clone());
+                    log::info!(target: "app", "apply hosts configuration");
+                }
 
-                        if let Some(dns_value) = dns_config.get("dns") {
-                            if let Some(dns_mapping) = dns_value.as_mapping() {
-                                config.insert("dns".into(), dns_mapping.clone().into());
-                                log::info!(target: "app", "apply dns_config.yaml (dns section)");
-                            }
-                        } else {
-                            config.insert("dns".into(), dns_config.into());
-                            log::info!(target: "app", "apply dns_config.yaml");
-                        }
+                if let Some(dns_value) = dns_config.get("dns") {
+                    if let Some(dns_mapping) = dns_value.as_mapping() {
+                        config.insert("dns".into(), dns_mapping.clone().into());
+                        log::info!(target: "app", "apply dns_config.yaml (dns section)");
                     }
+                } else {
+                    config.insert("dns".into(), dns_config.into());
+                    log::info!(target: "app", "apply dns_config.yaml");
                 }
             }
         }

src-tauri/src/enhance/script.rs

@@ -7,7 +7,7 @@ pub fn use_script(
     config: Mapping,
     name: String,
 ) -> Result<(Mapping, Vec<(String, String)>)> {
-    use boa_engine::{native_function::NativeFunction, Context, JsString, JsValue, Source};
+    use boa_engine::{Context, JsString, JsValue, Source, native_function::NativeFunction};
     use std::{cell::RefCell, rc::Rc};
     let mut context = Context::default();
 

src-tauri/src/enhance/seq.rs

@@ -44,39 +44,39 @@ pub fn use_seq(seq: SeqMap, mut config: Mapping, field: &str) -> Mapping {
     config.insert(Value::String(field.into()), Value::Sequence(new_seq));
 
     // If this is proxies field, we also need to filter proxy-groups
-    if field == "proxies" {
-        if let Some(Value::Sequence(groups)) = config.get_mut("proxy-groups") {
-            let mut new_groups = Sequence::new();
-            for group in groups {
-                if let Value::Mapping(group_map) = group {
-                    let mut new_group = group_map.clone();
-                    if let Some(Value::Sequence(proxies)) = group_map.get("proxies") {
-                        let filtered_proxies: Sequence = proxies
-                            .iter()
-                            .filter(|p| {
-                                if let Value::String(name) = p {
-                                    !delete.contains(name)
-                                } else {
-                                    true
-                                }
-                            })
-                            .cloned()
-                            .collect();
-                        new_group.insert(
-                            Value::String("proxies".into()),
-                            Value::Sequence(filtered_proxies),
-                        );
-                    }
-                    new_groups.push(Value::Mapping(new_group));
-                } else {
-                    new_groups.push(group.clone());
+    if field == "proxies"
+        && let Some(Value::Sequence(groups)) = config.get_mut("proxy-groups")
+    {
+        let mut new_groups = Sequence::new();
+        for group in groups {
+            if let Value::Mapping(group_map) = group {
+                let mut new_group = group_map.clone();
+                if let Some(Value::Sequence(proxies)) = group_map.get("proxies") {
+                    let filtered_proxies: Sequence = proxies
+                        .iter()
+                        .filter(|p| {
+                            if let Value::String(name) = p {
+                                !delete.contains(name)
+                            } else {
+                                true
+                            }
+                        })
+                        .cloned()
+                        .collect();
+                    new_group.insert(
+                        Value::String("proxies".into()),
+                        Value::Sequence(filtered_proxies),
+                    );
                 }
+                new_groups.push(Value::Mapping(new_group));
+            } else {
+                new_groups.push(group.clone());
             }
-            config.insert(
-                Value::String("proxy-groups".into()),
-                Value::Sequence(new_groups),
-            );
         }
+        config.insert(
+            Value::String("proxy-groups".into()),
+            Value::Sequence(new_groups),
+        );
     }
 
     config