mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-08-04 11:43:57 +08:00
style(rust): use inline format args in format! macros
- Replace format!("...", var) with format!("...{var}")
- Update universal provider ID formatting
- Update error message formatting
- Update config.toml generation in Codex provider
Fixes clippy::uninlined_format_args warnings.
This commit is contained in:
@@ -386,16 +386,15 @@ impl UniversalProvider {
|
|||||||
// 生成 Codex 的 config.toml 内容
|
// 生成 Codex 的 config.toml 内容
|
||||||
let config_toml = format!(
|
let config_toml = format!(
|
||||||
r#"model_provider = "newapi"
|
r#"model_provider = "newapi"
|
||||||
model = "{}"
|
model = "{model}"
|
||||||
model_reasoning_effort = "{}"
|
model_reasoning_effort = "{reasoning_effort}"
|
||||||
disable_response_storage = true
|
disable_response_storage = true
|
||||||
|
|
||||||
[model_providers.newapi]
|
[model_providers.newapi]
|
||||||
name = "NewAPI"
|
name = "NewAPI"
|
||||||
base_url = "{}"
|
base_url = "{codex_base_url}"
|
||||||
wire_api = "responses"
|
wire_api = "responses"
|
||||||
requires_openai_auth = true"#,
|
requires_openai_auth = true"#
|
||||||
model, reasoning_effort, codex_base_url
|
|
||||||
);
|
);
|
||||||
|
|
||||||
let settings_config = serde_json::json!({
|
let settings_config = serde_json::json!({
|
||||||
|
|||||||
@@ -736,15 +736,15 @@ impl ProviderService {
|
|||||||
// 删除生成的子供应商
|
// 删除生成的子供应商
|
||||||
if let Some(p) = provider {
|
if let Some(p) = provider {
|
||||||
if p.apps.claude {
|
if p.apps.claude {
|
||||||
let claude_id = format!("universal-claude-{}", id);
|
let claude_id = format!("universal-claude-{id}");
|
||||||
let _ = state.db.delete_provider("claude", &claude_id);
|
let _ = state.db.delete_provider("claude", &claude_id);
|
||||||
}
|
}
|
||||||
if p.apps.codex {
|
if p.apps.codex {
|
||||||
let codex_id = format!("universal-codex-{}", id);
|
let codex_id = format!("universal-codex-{id}");
|
||||||
let _ = state.db.delete_provider("codex", &codex_id);
|
let _ = state.db.delete_provider("codex", &codex_id);
|
||||||
}
|
}
|
||||||
if p.apps.gemini {
|
if p.apps.gemini {
|
||||||
let gemini_id = format!("universal-gemini-{}", id);
|
let gemini_id = format!("universal-gemini-{id}");
|
||||||
let _ = state.db.delete_provider("gemini", &gemini_id);
|
let _ = state.db.delete_provider("gemini", &gemini_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -757,7 +757,7 @@ impl ProviderService {
|
|||||||
let provider = state
|
let provider = state
|
||||||
.db
|
.db
|
||||||
.get_universal_provider(id)?
|
.get_universal_provider(id)?
|
||||||
.ok_or_else(|| AppError::Message(format!("统一供应商 {} 不存在", id)))?;
|
.ok_or_else(|| AppError::Message(format!("统一供应商 {id} 不存在")))?;
|
||||||
|
|
||||||
// 同步到 Claude
|
// 同步到 Claude
|
||||||
if let Some(mut claude_provider) = provider.to_claude_provider() {
|
if let Some(mut claude_provider) = provider.to_claude_provider() {
|
||||||
@@ -770,7 +770,7 @@ impl ProviderService {
|
|||||||
state.db.save_provider("claude", &claude_provider)?;
|
state.db.save_provider("claude", &claude_provider)?;
|
||||||
} else {
|
} else {
|
||||||
// 如果禁用了 Claude,删除对应的子供应商
|
// 如果禁用了 Claude,删除对应的子供应商
|
||||||
let claude_id = format!("universal-claude-{}", id);
|
let claude_id = format!("universal-claude-{id}");
|
||||||
let _ = state.db.delete_provider("claude", &claude_id);
|
let _ = state.db.delete_provider("claude", &claude_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -784,7 +784,7 @@ impl ProviderService {
|
|||||||
}
|
}
|
||||||
state.db.save_provider("codex", &codex_provider)?;
|
state.db.save_provider("codex", &codex_provider)?;
|
||||||
} else {
|
} else {
|
||||||
let codex_id = format!("universal-codex-{}", id);
|
let codex_id = format!("universal-codex-{id}");
|
||||||
let _ = state.db.delete_provider("codex", &codex_id);
|
let _ = state.db.delete_provider("codex", &codex_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -798,7 +798,7 @@ impl ProviderService {
|
|||||||
}
|
}
|
||||||
state.db.save_provider("gemini", &gemini_provider)?;
|
state.db.save_provider("gemini", &gemini_provider)?;
|
||||||
} else {
|
} else {
|
||||||
let gemini_id = format!("universal-gemini-{}", id);
|
let gemini_id = format!("universal-gemini-{id}");
|
||||||
let _ = state.db.delete_provider("gemini", &gemini_id);
|
let _ = state.db.delete_provider("gemini", &gemini_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user