fmt: applied formatting to refactored mcp_servers and tools lists

This commit is contained in:
2026-06-03 14:02:06 -06:00
parent 0c84eea705
commit 8cc78358fc
7 changed files with 14 additions and 25 deletions
+4 -1
View File
@@ -3392,7 +3392,10 @@ mod tests {
ctx.tool_scope.functions.append_todo_functions();
let mut role = Role::new("r", "p");
role.set_enabled_tools(Some(vec!["todo__init".to_string(), "todo__add".to_string()]));
role.set_enabled_tools(Some(vec![
"todo__init".to_string(),
"todo__add".to_string(),
]));
let fns = ctx.select_functions(&role).unwrap();
let names: Vec<&str> = fns.iter().map(|f| f.name.as_str()).collect();
+1 -2
View File
@@ -160,8 +160,7 @@ impl Role {
metadata.push(format!("top_p: {top_p}"));
}
if let Some(enabled_tools) = &self.enabled_tools {
let inline =
serde_json::to_string(enabled_tools).unwrap_or_else(|_| "[]".to_string());
let inline = serde_json::to_string(enabled_tools).unwrap_or_else(|_| "[]".to_string());
metadata.push(format!("enabled_tools: {inline}"));
}
if let Some(enabled_mcp_servers) = &self.enabled_mcp_servers {
+1 -1
View File
@@ -109,8 +109,8 @@ impl SkillPolicy {
#[cfg(test)]
mod tests {
use super::*;
use super::super::csv_to_vec;
use super::*;
fn always_true(_: &str) -> bool {
true
+1 -4
View File
@@ -250,10 +250,7 @@ mod tests {
base.set_enabled_tools(Some(Vec::new()));
let effective = registry.effective_role(&base);
assert_eq!(
effective.enabled_tools().as_deref(),
Some([].as_slice())
);
assert_eq!(effective.enabled_tools().as_deref(), Some([].as_slice()));
}
#[test]
-1
View File
@@ -283,5 +283,4 @@ mod tests {
assert!(required, "skill__list should have no required parameters");
}
}
+2 -8
View File
@@ -183,13 +183,7 @@ mod tests {
fn build_extractor_role_disables_tools_and_mcp() {
let role = build_extractor_role().expect("builtin role must exist");
assert_eq!(
role.enabled_tools().as_deref(),
Some([].as_slice())
);
assert_eq!(
role.enabled_mcp_servers().as_deref(),
Some([].as_slice())
);
assert_eq!(role.enabled_tools().as_deref(), Some([].as_slice()));
assert_eq!(role.enabled_mcp_servers().as_deref(), Some([].as_slice()));
}
}
+5 -8
View File
@@ -762,8 +762,8 @@ mod tests {
#[test]
fn resolve_comma_separated_returns_matching_servers() {
let registry = make_registry_with_config(&["github", "slack", "jira"]);
let mut ids = registry
.resolve_server_ids(Some(vec!["github".to_string(), "jira".to_string()]));
let mut ids =
registry.resolve_server_ids(Some(vec!["github".to_string(), "jira".to_string()]));
ids.sort();
assert_eq!(ids, vec!["github", "jira"]);
}
@@ -792,18 +792,15 @@ mod tests {
#[test]
fn resolve_nonexistent_server_filtered_out() {
let registry = make_registry_with_config(&["github"]);
let ids = registry.resolve_server_ids(Some(vec![
"github".to_string(),
"nonexistent".to_string(),
]));
let ids = registry
.resolve_server_ids(Some(vec!["github".to_string(), "nonexistent".to_string()]));
assert_eq!(ids, vec!["github"]);
}
#[test]
fn resolve_all_nonexistent_returns_empty() {
let registry = make_registry_with_config(&["github"]);
let ids =
registry.resolve_server_ids(Some(vec!["foo".to_string(), "bar".to_string()]));
let ids = registry.resolve_server_ids(Some(vec!["foo".to_string(), "bar".to_string()]));
assert!(ids.is_empty());
}