d0zingcat/claude-code
1
0
Fork 0
mirror of https://github.com/instructkr/claude-code.git synced 2026-05-30 17:26:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflict markers and cargo fmt drift in main (commands, openai_compat, trident, config, tools)

Browse Source
This commit is contained in:
YeonGyu-Kim
2026-05-25 11:51:44 +09:00
parent 499125c9a3
commit 3364dc4bee
8 changed files with 225 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rust/crates/runtime/src/config.rs
View File

@@ -608,16 +608,28 @@ pub fn save_user_provider_settings(
let mut root = read_settings_root(&settings_path);
let mut provider = serde_json::Map::new();
provider.insert("kind".to_string(), serde_json::Value::String(kind.to_string()));
provider.insert("apiKey".to_string(), serde_json::Value::String(api_key.to_string()));
provider.insert(
"kind".to_string(),
serde_json::Value::String(kind.to_string()),
);
provider.insert(
"apiKey".to_string(),
serde_json::Value::String(api_key.to_string()),
);
if let Some(base_url) = base_url {
provider.insert("baseUrl".to_string(), serde_json::Value::String(base_url.to_string()));
provider.insert(
"baseUrl".to_string(),
serde_json::Value::String(base_url.to_string()),
);
} else {
provider.remove("baseUrl");
}
root.insert("provider".to_string(), serde_json::Value::Object(provider));
if let Some(model) = model {
root.insert("model".to_string(), serde_json::Value::String(model.to_string()));
root.insert(
"model".to_string(),
serde_json::Value::String(model.to_string()),
);
} else {
root.remove("model");
}