From 8cc78358fc346644d79162621fd67b439db013bc Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Wed, 3 Jun 2026 14:02:06 -0600 Subject: [PATCH] fmt: applied formatting to refactored mcp_servers and tools lists --- src/config/request_context.rs | 5 ++++- src/config/role.rs | 3 +-- src/config/skill_policy.rs | 2 +- src/config/skill_registry.rs | 5 +---- src/function/skill.rs | 1 - src/graph/structured.rs | 10 ++-------- src/mcp/mod.rs | 13 +++++-------- 7 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/config/request_context.rs b/src/config/request_context.rs index 1277c6b..98f76c6 100644 --- a/src/config/request_context.rs +++ b/src/config/request_context.rs @@ -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(); diff --git a/src/config/role.rs b/src/config/role.rs index b8b0048..8f229eb 100644 --- a/src/config/role.rs +++ b/src/config/role.rs @@ -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 { diff --git a/src/config/skill_policy.rs b/src/config/skill_policy.rs index e52fb30..1b631eb 100644 --- a/src/config/skill_policy.rs +++ b/src/config/skill_policy.rs @@ -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 diff --git a/src/config/skill_registry.rs b/src/config/skill_registry.rs index d7c8f64..71703a5 100644 --- a/src/config/skill_registry.rs +++ b/src/config/skill_registry.rs @@ -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] diff --git a/src/function/skill.rs b/src/function/skill.rs index 63f7146..f8e759c 100644 --- a/src/function/skill.rs +++ b/src/function/skill.rs @@ -283,5 +283,4 @@ mod tests { assert!(required, "skill__list should have no required parameters"); } - } diff --git a/src/graph/structured.rs b/src/graph/structured.rs index 7c62a1a..587db87 100644 --- a/src/graph/structured.rs +++ b/src/graph/structured.rs @@ -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())); } } diff --git a/src/mcp/mod.rs b/src/mcp/mod.rs index 22b29d6..3600107 100644 --- a/src/mcp/mod.rs +++ b/src/mcp/mod.rs @@ -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()); }