crashlabs/huskies
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

fix: simplify boolean in validate_working_dir to satisfy clippy nonminimal_bool

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
dave
2026-04-14 09:52:51 +00:00
parent f412c7dee6
commit 28777b0c77
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/http/mcp/shell_tools.rs
+4 -3
View File
@@ -87,9 +87,10 @@ fn validate_working_dir(working_dir: &str, ctx: &AppContext) -> Result<PathBuf,
let merge_workspace = project_root.join(".huskies").join("merge_workspace"); let merge_workspace = project_root.join(".huskies").join("merge_workspace");
let canonical_mw = merge_workspace.canonicalize().unwrap_or_default(); let canonical_mw = merge_workspace.canonicalize().unwrap_or_default();
if !canonical_wd.starts_with(&canonical_wt) let in_worktrees = canonical_wd.starts_with(&canonical_wt);
&& !(!canonical_mw.as_os_str().is_empty() && canonical_wd.starts_with(&canonical_mw)) let in_merge_ws =
{ !canonical_mw.as_os_str().is_empty() && canonical_wd.starts_with(&canonical_mw);
if !in_worktrees && !in_merge_ws {
return Err(format!( return Err(format!(
"working_dir must be inside .huskies/worktrees/ or .huskies/merge_workspace/. Got: {working_dir}" "working_dir must be inside .huskies/worktrees/ or .huskies/merge_workspace/. Got: {working_dir}"
)); ));