From 8a62a1f0e7aa6449bbaffd0db6baaccdf9aae4bf Mon Sep 17 00:00:00 2001 From: xz-dev Date: Sat, 21 Dec 2024 19:15:32 +0800 Subject: [PATCH] perf: fix clippy errors --- src/core/config/data/rule_list.rs | 2 +- src/core/config/world.rs | 2 +- src/core/config/world/world_list.rs | 2 +- src/rpc/server.rs | 4 ++-- src/utils/http.rs | 4 ++-- src/utils/versioning.rs | 14 +++++++------- src/websdk/cloud_rules/cloud_rules_wrapper.rs | 8 ++++---- src/websdk/repo/provider/base_provider.rs | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/core/config/data/rule_list.rs b/src/core/config/data/rule_list.rs index 1a482dd..b0dd2d9 100644 --- a/src/core/config/data/rule_list.rs +++ b/src/core/config/data/rule_list.rs @@ -77,7 +77,7 @@ mod tests { "hub_list": ["GitHub"] }"#; - let config_list: RuleList = serde_json::from_str(&json).unwrap(); + let config_list: RuleList = serde_json::from_str(json).unwrap(); // check app_config_list assert_eq!(config_list.app_list.len(), 2); diff --git a/src/core/config/world.rs b/src/core/config/world.rs index 3cc512f..bf9037d 100644 --- a/src/core/config/world.rs +++ b/src/core/config/world.rs @@ -30,6 +30,6 @@ mod tests { async fn test_get_world_list_micro() { let world_list_path = Path::new("./test_get_world_list_micro"); init_world_list(world_list_path).await.unwrap(); - let _ = get_world_list(); + let _ = get_world_list().await; } } diff --git a/src/core/config/world/world_list.rs b/src/core/config/world/world_list.rs index ac19eba..6dd89a0 100644 --- a/src/core/config/world/world_list.rs +++ b/src/core/config/world/world_list.rs @@ -95,6 +95,6 @@ mod tests { let path = PathBuf::from(path_base).join(WORLD_CONFIG_LIST_NAME); let _ = WorldList::new().load(&path); - assert_eq!(path.try_exists().is_ok_and(|x| x == false), true); + assert!(path.try_exists().is_ok_and(|x| !x)); } } diff --git a/src/rpc/server.rs b/src/rpc/server.rs index 92cc144..f12466d 100644 --- a/src/rpc/server.rs +++ b/src/rpc/server.rs @@ -225,7 +225,7 @@ mod tests { }; println!("{:?}", params); let response: Result = client.request("init", params).await; - assert_eq!(response.unwrap(), true); + assert!(response.unwrap()); handle.stop().unwrap(); } #[tokio::test] @@ -255,7 +255,7 @@ mod tests { let response: Result = client .check_app_available(params.hub_uuid, params.app_data, params.hub_data) .await; - assert_eq!(response.unwrap(), true); + assert!(response.unwrap()); handle.stop().unwrap(); } diff --git a/src/utils/http.rs b/src/utils/http.rs index 172ecc8..923e792 100644 --- a/src/utils/http.rs +++ b/src/utils/http.rs @@ -243,7 +243,7 @@ mod tests { let url = "https://example.com".parse().unwrap(); let result = https_get(url, &HashMap::new()).await; assert!(result.is_ok()); - assert!(result.unwrap().body.unwrap().len() > 0); + assert!(!result.unwrap().body.unwrap().is_empty()); } #[tokio::test] @@ -294,7 +294,7 @@ mod tests { let url = "http://example.com".parse().unwrap(); let result = http_get(url, &HashMap::new()).await; assert!(result.is_ok()); - assert!(result.unwrap().body.unwrap().len() > 0); + assert!(!result.unwrap().body.unwrap().is_empty()); } #[tokio::test] diff --git a/src/utils/versioning.rs b/src/utils/versioning.rs index ebb77f0..d88a80f 100644 --- a/src/utils/versioning.rs +++ b/src/utils/versioning.rs @@ -61,19 +61,19 @@ mod tests { let version = Version { string: "1.0.0".to_string(), }; - assert_eq!(version.is_valid(), true); + assert!(version.is_valid()); let version = Version { string: "1.0.0-alpha".to_string(), }; - assert_eq!(version.is_valid(), true); + assert!(version.is_valid()); let version = Version { string: "版本1.0.0".to_string(), }; - assert_eq!(version.is_valid(), true); + assert!(version.is_valid()); let chinese_suffix_version = Version { string: "版本1.0.0 天行健".to_string(), }; - assert_eq!(chinese_suffix_version.is_valid(), true); + assert!(chinese_suffix_version.is_valid()); } #[test] @@ -81,7 +81,7 @@ mod tests { let version = Version { string: "xxx".to_string(), }; - assert_eq!(version.is_valid(), false); + assert!(!version.is_valid()); } #[test] @@ -119,7 +119,7 @@ mod tests { let other_version = Version { string: "1.0.1".to_string(), }; - assert_eq!(version < other_version, true); + assert!(version < other_version); } #[test] @@ -130,7 +130,7 @@ mod tests { let other_version = Version { string: "1.0.1-alpha".to_string(), }; - assert_eq!(version > other_version, true); + assert!(version > other_version); } #[test] diff --git a/src/websdk/cloud_rules/cloud_rules_wrapper.rs b/src/websdk/cloud_rules/cloud_rules_wrapper.rs index e67c24c..24a718a 100644 --- a/src/websdk/cloud_rules/cloud_rules_wrapper.rs +++ b/src/websdk/cloud_rules/cloud_rules_wrapper.rs @@ -66,7 +66,7 @@ mod tests { cloud_rules.renew().await.unwrap(); let list = cloud_rules.get_cloud_app_rules(|x| x.info.name == "UpgradeAll"); assert!(list.is_some()); - let list = cloud_rules.get_cloud_app_rules(|x| x.info.name == ""); + let list = cloud_rules.get_cloud_app_rules(|x| x.info.name.is_empty()); assert!(list.is_none()); } @@ -82,9 +82,9 @@ mod tests { cloud_rules.renew().await.unwrap(); let list = cloud_rules.get_cloud_app_rules_list(|x| x.info.name == "UpgradeAll"); assert_eq!(list.len(), 1); - let list = cloud_rules.get_cloud_app_rules_list(|x| x.info.name == ""); + let list = cloud_rules.get_cloud_app_rules_list(|x| x.info.name.is_empty()); assert_eq!(list.len(), 0); - let list = cloud_rules.get_cloud_app_rules_list(|x| x.info.name != ""); + let list = cloud_rules.get_cloud_app_rules_list(|x| !x.info.name.is_empty()); assert_eq!( list.len(), cloud_rules.get_config_list().app_config_list.len() @@ -103,7 +103,7 @@ mod tests { cloud_rules.renew().await.unwrap(); let list = cloud_rules.get_cloud_hub_rules(|x| x.info.hub_name == "GitHub"); assert!(list.is_some()); - let list = cloud_rules.get_cloud_hub_rules(|x| x.info.hub_name == ""); + let list = cloud_rules.get_cloud_hub_rules(|x| x.info.hub_name.is_empty()); assert!(list.is_none()); } } diff --git a/src/websdk/repo/provider/base_provider.rs b/src/websdk/repo/provider/base_provider.rs index 73e50fa..eccbc98 100644 --- a/src/websdk/repo/provider/base_provider.rs +++ b/src/websdk/repo/provider/base_provider.rs @@ -247,7 +247,7 @@ mod tests { async fn check_app_available(&self, fin: &FIn) -> FOut { let id_map = fin.data_map.app_data; let cache_map = fin.cache_map.clone(); - FOut::new(cache_map.unwrap_or_default().get(id_map["id"]).is_some()) + FOut::new(cache_map.unwrap_or_default().contains_key(id_map["id"])) } async fn get_releases(&self, fin: &FIn) -> FOut> {