mirror of
https://github.com/fawney19/Aether.git
synced 2026-09-02 09:20:22 +08:00
fix(clippy): 修复冗余 into_iter、sort_by 及 match 嵌套 if 等 lint 警告
This commit is contained in:
@@ -251,7 +251,7 @@ async fn list_admin_monitoring_cache_affinity_records_matching(
|
||||
"admin monitoring redis mget failed: {err}"
|
||||
))
|
||||
})?;
|
||||
for (key, raw_value) in keys.into_iter().zip(values.into_iter()) {
|
||||
for (key, raw_value) in keys.into_iter().zip(values) {
|
||||
let Some(raw_value) = raw_value else {
|
||||
continue;
|
||||
};
|
||||
|
||||
@@ -157,8 +157,7 @@ pub(super) async fn build_admin_monitoring_resilience_snapshot(
|
||||
limit: None,
|
||||
})
|
||||
.await?;
|
||||
recent_usage_errors
|
||||
.sort_by(|left, right| right.created_at_unix_ms.cmp(&left.created_at_unix_ms));
|
||||
recent_usage_errors.sort_by_key(|item| std::cmp::Reverse(item.created_at_unix_ms));
|
||||
|
||||
let total_errors = recent_usage_errors.len();
|
||||
let mut error_breakdown = BTreeMap::<String, usize>::new();
|
||||
|
||||
@@ -263,11 +263,11 @@ pub(super) fn build_admin_provider_oauth_batch_task_state(
|
||||
.ok()
|
||||
.map(|duration| duration.as_secs())
|
||||
.unwrap_or(created_at);
|
||||
let progress_percent = if total == 0 {
|
||||
0
|
||||
} else {
|
||||
((processed * 100) / total).min(100) as u64
|
||||
};
|
||||
let progress_percent = processed
|
||||
.saturating_mul(100)
|
||||
.checked_div(total)
|
||||
.unwrap_or(0)
|
||||
.min(100) as u64;
|
||||
json!({
|
||||
"task_id": task_id,
|
||||
"provider_id": provider_id,
|
||||
|
||||
@@ -60,7 +60,7 @@ pub(crate) async fn read_admin_provider_pool_cooldown_counts(
|
||||
Ok(counts) => provider_ids
|
||||
.iter()
|
||||
.cloned()
|
||||
.zip(counts.into_iter())
|
||||
.zip(counts)
|
||||
.map(|(provider_id, count)| (provider_id, count as usize))
|
||||
.collect(),
|
||||
Err(err) => {
|
||||
@@ -155,8 +155,8 @@ pub(crate) async fn read_admin_provider_pool_runtime_state(
|
||||
for (((key_id, _cooldown_key), reason), ttl) in key_ids
|
||||
.iter()
|
||||
.zip(cooldown_keys.iter())
|
||||
.zip(cooldown_reasons.into_iter())
|
||||
.zip(cooldown_ttls.into_iter())
|
||||
.zip(cooldown_reasons)
|
||||
.zip(cooldown_ttls)
|
||||
{
|
||||
if let Some(reason) = reason {
|
||||
runtime
|
||||
@@ -197,7 +197,7 @@ pub(crate) async fn read_admin_provider_pool_runtime_state(
|
||||
);
|
||||
vec![Vec::new(); cost_keys.len()]
|
||||
});
|
||||
for (key_id, members) in key_ids.iter().zip(members_by_key.into_iter()) {
|
||||
for (key_id, members) in key_ids.iter().zip(members_by_key) {
|
||||
let total = members
|
||||
.iter()
|
||||
.map(|member| parse_pool_cost_member(member))
|
||||
@@ -218,7 +218,7 @@ pub(crate) async fn read_admin_provider_pool_runtime_state(
|
||||
.query_async::<Vec<Option<f64>>>(&mut connection)
|
||||
.await
|
||||
{
|
||||
for (key_id, score) in key_ids.iter().zip(scores.into_iter()) {
|
||||
for (key_id, score) in key_ids.iter().zip(scores) {
|
||||
if let Some(score) = score {
|
||||
runtime.lru_score_by_key.insert(key_id.clone(), score);
|
||||
}
|
||||
|
||||
@@ -171,7 +171,7 @@ async fn provider_query_sort_antigravity_keys(
|
||||
};
|
||||
ranked.push(((availability, tier_weight), key));
|
||||
}
|
||||
ranked.sort_by(|left, right| right.0.cmp(&left.0));
|
||||
ranked.sort_by_key(|entry| std::cmp::Reverse(entry.0));
|
||||
Ok(ranked.into_iter().map(|(_, key)| key).collect())
|
||||
}
|
||||
|
||||
|
||||
@@ -38,20 +38,14 @@ pub(crate) async fn build_admin_create_provider_key_record(
|
||||
.cloned();
|
||||
|
||||
match auth_type.as_str() {
|
||||
"api_key" => {
|
||||
if api_key.is_empty() {
|
||||
return Err("API Key 认证模式下 api_key 为必填字段".to_string());
|
||||
}
|
||||
"api_key" if api_key.is_empty() => {
|
||||
return Err("API Key 认证模式下 api_key 为必填字段".to_string());
|
||||
}
|
||||
"service_account" => {
|
||||
if auth_config_object.is_none() {
|
||||
return Err("Service Account 认证模式下 auth_config 为必填字段".to_string());
|
||||
}
|
||||
"service_account" if auth_config_object.is_none() => {
|
||||
return Err("Service Account 认证模式下 auth_config 为必填字段".to_string());
|
||||
}
|
||||
"oauth" => {
|
||||
if !api_key.is_empty() {
|
||||
return Err("OAuth 认证模式下不允许直接填写 api_key".to_string());
|
||||
}
|
||||
"oauth" if !api_key.is_empty() => {
|
||||
return Err("OAuth 认证模式下不允许直接填写 api_key".to_string());
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
@@ -98,7 +98,7 @@ fn set_cached_fingerprint(key_id: &str, fingerprint: String, now: Instant) {
|
||||
.iter()
|
||||
.map(|(key, (_, expires_at))| (key.clone(), *expires_at))
|
||||
.collect::<Vec<_>>();
|
||||
entries.sort_by(|left, right| left.1.cmp(&right.1));
|
||||
entries.sort_by_key(|entry| entry.1);
|
||||
for (key, _) in entries.into_iter().take(cache.len() - CACHE_MAX_ENTRIES) {
|
||||
cache.remove(&key);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user