fix: resolve all cargo clippy warnings
- daemon: Box::pin large future in heartbeat worker - wizard: remove redundant match arms with identical bodies, fix stale test that expected venice to be unsupported - proxy_config: allow clippy::option_option on intentional partial-update return type - matrix: use String::new() instead of "".to_string() - reliable: return expression directly instead of let-and-return Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
5cdf1b74f3
commit
876635b0b3
5 changed files with 6 additions and 9 deletions
|
|
@ -726,7 +726,7 @@ mod tests {
|
||||||
"!r:m".to_string(),
|
"!r:m".to_string(),
|
||||||
vec![],
|
vec![],
|
||||||
Some(" ".to_string()),
|
Some(" ".to_string()),
|
||||||
Some("".to_string()),
|
Some(String::new()),
|
||||||
);
|
);
|
||||||
|
|
||||||
assert!(ch.session_user_id_hint.is_none());
|
assert!(ch.session_user_id_hint.is_none());
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ pub async fn run(config: Config, host: String, port: u16) -> Result<()> {
|
||||||
max_backoff,
|
max_backoff,
|
||||||
move || {
|
move || {
|
||||||
let cfg = heartbeat_cfg.clone();
|
let cfg = heartbeat_cfg.clone();
|
||||||
async move { run_heartbeat_worker(cfg).await }
|
async move { Box::pin(run_heartbeat_worker(cfg)).await }
|
||||||
},
|
},
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -500,7 +500,6 @@ const MINIMAX_ONBOARD_MODELS: [(&str, &str); 5] = [
|
||||||
fn default_model_for_provider(provider: &str) -> String {
|
fn default_model_for_provider(provider: &str) -> String {
|
||||||
match canonical_provider_name(provider) {
|
match canonical_provider_name(provider) {
|
||||||
"anthropic" => "claude-sonnet-4-5-20250929".into(),
|
"anthropic" => "claude-sonnet-4-5-20250929".into(),
|
||||||
"openrouter" => "anthropic/claude-sonnet-4.6".into(),
|
|
||||||
"openai" => "gpt-5.2".into(),
|
"openai" => "gpt-5.2".into(),
|
||||||
"openai-codex" => "gpt-5-codex".into(),
|
"openai-codex" => "gpt-5-codex".into(),
|
||||||
"venice" => "zai-org-glm-5".into(),
|
"venice" => "zai-org-glm-5".into(),
|
||||||
|
|
@ -520,7 +519,6 @@ fn default_model_for_provider(provider: &str) -> String {
|
||||||
"gemini" => "gemini-2.5-pro".into(),
|
"gemini" => "gemini-2.5-pro".into(),
|
||||||
"kimi-code" => "kimi-for-coding".into(),
|
"kimi-code" => "kimi-for-coding".into(),
|
||||||
"nvidia" => "meta/llama-3.3-70b-instruct".into(),
|
"nvidia" => "meta/llama-3.3-70b-instruct".into(),
|
||||||
"astrai" => "anthropic/claude-sonnet-4.6".into(),
|
|
||||||
_ => "anthropic/claude-sonnet-4.6".into(),
|
_ => "anthropic/claude-sonnet-4.6".into(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5190,7 +5188,7 @@ mod tests {
|
||||||
|
|
||||||
let config = Config {
|
let config = Config {
|
||||||
workspace_dir: tmp.path().to_path_buf(),
|
workspace_dir: tmp.path().to_path_buf(),
|
||||||
default_provider: Some("venice".to_string()),
|
default_provider: Some("unknown-provider".to_string()),
|
||||||
..Config::default()
|
..Config::default()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,14 +45,12 @@ fn is_non_retryable(err: &anyhow::Error) -> bool {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
let model_catalog_mismatch = msg_lower.contains("model")
|
msg_lower.contains("model")
|
||||||
&& (msg_lower.contains("not found")
|
&& (msg_lower.contains("not found")
|
||||||
|| msg_lower.contains("unknown")
|
|| msg_lower.contains("unknown")
|
||||||
|| msg_lower.contains("unsupported")
|
|| msg_lower.contains("unsupported")
|
||||||
|| msg_lower.contains("does not exist")
|
|| msg_lower.contains("does not exist")
|
||||||
|| msg_lower.contains("invalid"));
|
|| msg_lower.contains("invalid"))
|
||||||
|
|
||||||
model_catalog_mismatch
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Check if an error is a rate-limit (429) error.
|
/// Check if an error is a rate-limit (429) error.
|
||||||
|
|
|
||||||
|
|
@ -93,6 +93,7 @@ impl ProxyConfigTool {
|
||||||
anyhow::bail!("'{field}' must be a string or string[]")
|
anyhow::bail!("'{field}' must be a string or string[]")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::option_option)] // Outer=field present, inner=value-or-null (partial update)
|
||||||
fn parse_optional_string_update(
|
fn parse_optional_string_update(
|
||||||
args: &Value,
|
args: &Value,
|
||||||
field: &str,
|
field: &str,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue