Skip to content

Fix clippy/compiler warnings in github-guard rust-guard #9655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lpcox merged 1 commit into from
Jul 19, 2026
Merged

Fix clippy/compiler warnings in github-guard rust-guard #9655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions guards/github-guard/rust-guard/src/labels/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,13 @@ pub mod tool_rules;
pub use helpers::{
blocked_integrity, ensure_integrity_baseline, extract_repo_info,
extract_repo_info_from_search_query, is_mcp_text_wrapper, is_search_result_wrapper,
project_github_label, reader_integrity, search_result_total_count, writer_integrity,
MinIntegrity, PolicyContext, PolicyScopeEntry, ScopeKind,
reader_integrity, search_result_total_count, writer_integrity, MinIntegrity, PolicyContext,
PolicyScopeEntry, ScopeKind,
};

#[cfg(test)]
pub use helpers::project_github_label;

// Test-only re-exports: helpers used by tests in this file and sibling modules.
// The cfg(test) gate keeps them out of the non-test public surface.

Expand Down Expand Up @@ -1366,9 +1369,9 @@ mod tests {
let value = json!({"flag": true, "other": false, "count": 42});
assert!(get_bool_or(&value, "flag", false));
assert!(!get_bool_or(&value, "other", true));
assert_eq!(get_bool_or(&value, "missing", true), true);
assert!(get_bool_or(&value, "missing", true));
// Non-bool field returns default
assert_eq!(get_bool_or(&value, "count", false), false);
assert!(!get_bool_or(&value, "count", false));
}

#[test]
Expand Down
251 changes: 122 additions & 129 deletions guards/github-guard/rust-guard/src/labels/response_paths.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,84 +182,81 @@ pub fn label_response_paths(
.unwrap_or("");
if tool_name == "pull_request_read" && !method.is_empty() && method != "get" {
// Fall through — use resource-level labels
} else {
if let Some(repo_item_ctx) = resolve_repo_item_context(
tool_name,
tool_args,
&actual_response,
"search_pull_requests",
"list_pull_requests",
ctx,
) {
let mut labeled_paths = Vec::with_capacity(repo_item_ctx.limited_items.len());

for (i, item) in repo_item_ctx.limited_items.iter().enumerate() {
// Extract repo from each item (may differ for search results)
let item_repo = extract_repo_from_item(item);
let repo_for_labels = if item_repo.is_empty() {
&repo_item_ctx.default_repo
} else {
&item_repo
};
} else if let Some(repo_item_ctx) = resolve_repo_item_context(
tool_name,
tool_args,
&actual_response,
"search_pull_requests",
"list_pull_requests",
ctx,
) {
let mut labeled_paths = Vec::with_capacity(repo_item_ctx.limited_items.len());

for (i, item) in repo_item_ctx.limited_items.iter().enumerate() {
// Extract repo from each item (may differ for search results)
let item_repo = extract_repo_from_item(item);
let repo_for_labels = if item_repo.is_empty() {
&repo_item_ctx.default_repo
} else {
&item_repo
};

let base_repo = item
.get("base")
.and_then(|b| b.get("repo"))
.and_then(|r| r.get(field_names::FULL_NAME))
.and_then(|v| v.as_str())
.unwrap_or("");
let head_repo = item
.get("head")
.and_then(|h| h.get("repo"))
.and_then(|r| r.get(field_names::FULL_NAME))
.and_then(|v| v.as_str())
.unwrap_or("");
let is_forked = if !base_repo.is_empty() && !head_repo.is_empty() {
Some(!base_repo.eq_ignore_ascii_case(head_repo))
} else {
None
};
let base_repo = item
.get("base")
.and_then(|b| b.get("repo"))
.and_then(|r| r.get(field_names::FULL_NAME))
.and_then(|v| v.as_str())
.unwrap_or("");
let head_repo = item
.get("head")
.and_then(|h| h.get("repo"))
.and_then(|r| r.get(field_names::FULL_NAME))
.and_then(|v| v.as_str())
.unwrap_or("");
let is_forked = if !base_repo.is_empty() && !head_repo.is_empty() {
Some(!base_repo.eq_ignore_ascii_case(head_repo))
} else {
None
};

let item_repo_private =
repo_visibility_private_for_repo_id(repo_for_labels)
.unwrap_or(repo_item_ctx.default_repo_private);

let pr_number = extract_resource_number(item, "pr", repo_for_labels);
let integrity =
pr_integrity(item, repo_for_labels, item_repo_private, is_forked, ctx);
let path = make_item_path(repo_item_ctx.items_path, i);

labeled_paths.push(crate::PathLabel {
path,
labels: crate::ResourceLabels {
description: format!("pr:{}#{}", repo_for_labels, pr_number),
secrecy: if tool_name == "search_pull_requests" {
repo_visibility_secrecy_for_repo_id(repo_for_labels, ctx).into()
} else {
repo_item_ctx.default_secrecy_shared.clone()
},
integrity: integrity.into(),
},
});
}
let item_repo_private = repo_visibility_private_for_repo_id(repo_for_labels)
.unwrap_or(repo_item_ctx.default_repo_private);

return Some(PathLabelResult {
labeled_paths,
default_labels: Some(crate::ResourceLabels {
description: "pull_request".to_string(),
secrecy: repo_item_ctx.default_secrecy_shared.clone(),
integrity: if repo_item_ctx.default_repo_private {
writer_integrity(&repo_item_ctx.default_repo, ctx)
let pr_number = extract_resource_number(item, "pr", repo_for_labels);
let integrity =
pr_integrity(item, repo_for_labels, item_repo_private, is_forked, ctx);
let path = make_item_path(repo_item_ctx.items_path, i);

labeled_paths.push(crate::PathLabel {
path,
labels: crate::ResourceLabels {
description: format!("pr:{}#{}", repo_for_labels, pr_number),
secrecy: if tool_name == "search_pull_requests" {
repo_visibility_secrecy_for_repo_id(repo_for_labels, ctx).into()
} else {
none_integrity(&repo_item_ctx.default_repo, ctx)
}
.into(),
}),
items_path: (!repo_item_ctx.items_path.is_empty())
.then_some(repo_item_ctx.items_path),
repo_item_ctx.default_secrecy_shared.clone()
},
integrity: integrity.into(),
},
});
}
} // end else (non-sub-method)

return Some(PathLabelResult {
labeled_paths,
default_labels: Some(crate::ResourceLabels {
description: "pull_request".to_string(),
secrecy: repo_item_ctx.default_secrecy_shared.clone(),
integrity: if repo_item_ctx.default_repo_private {
writer_integrity(&repo_item_ctx.default_repo, ctx)
} else {
none_integrity(&repo_item_ctx.default_repo, ctx)
}
.into(),
}),
items_path: (!repo_item_ctx.items_path.is_empty())
.then_some(repo_item_ctx.items_path),
});
}
}

// === Issues - label by author contributor status ===
Expand All @@ -272,66 +269,62 @@ pub fn label_response_paths(
.unwrap_or("");
if tool_name == "issue_read" && !method.is_empty() && method != "get" {
// Fall through — use resource-level labels
} else {
if let Some(repo_item_ctx) = resolve_repo_item_context(
tool_name,
tool_args,
&actual_response,
"search_issues",
"list_issues",
ctx,
) {
let mut labeled_paths = Vec::with_capacity(repo_item_ctx.limited_items.len());

for (i, item) in repo_item_ctx.limited_items.iter().enumerate() {
// Extract repo from each item (may differ for search results)
let item_repo = extract_repo_from_item(item);
let repo_for_labels = if item_repo.is_empty() {
&repo_item_ctx.default_repo
} else {
&item_repo
};
} else if let Some(repo_item_ctx) = resolve_repo_item_context(
tool_name,
tool_args,
&actual_response,
"search_issues",
"list_issues",
ctx,
) {
let mut labeled_paths = Vec::with_capacity(repo_item_ctx.limited_items.len());

for (i, item) in repo_item_ctx.limited_items.iter().enumerate() {
// Extract repo from each item (may differ for search results)
let item_repo = extract_repo_from_item(item);
let repo_for_labels = if item_repo.is_empty() {
&repo_item_ctx.default_repo
} else {
&item_repo
};

let item_repo_private =
repo_visibility_private_for_repo_id(repo_for_labels)
.unwrap_or(repo_item_ctx.default_repo_private);

let issue_number = extract_resource_number(item, "issue", repo_for_labels);
let integrity =
issue_integrity(item, repo_for_labels, item_repo_private, ctx);
let path = make_item_path(repo_item_ctx.items_path, i);

labeled_paths.push(crate::PathLabel {
path,
labels: crate::ResourceLabels {
description: format!("issue:{}#{}", repo_for_labels, issue_number),
secrecy: if tool_name == "search_issues" {
repo_visibility_secrecy_for_repo_id(repo_for_labels, ctx).into()
} else {
repo_item_ctx.default_secrecy_shared.clone()
},
integrity: integrity.into(),
},
});
}
let item_repo_private = repo_visibility_private_for_repo_id(repo_for_labels)
.unwrap_or(repo_item_ctx.default_repo_private);

let issue_number = extract_resource_number(item, "issue", repo_for_labels);
let integrity = issue_integrity(item, repo_for_labels, item_repo_private, ctx);
let path = make_item_path(repo_item_ctx.items_path, i);

return Some(PathLabelResult {
labeled_paths,
default_labels: Some(crate::ResourceLabels {
description: "issue".to_string(),
secrecy: repo_item_ctx.default_secrecy_shared.clone(),
integrity: if repo_item_ctx.default_repo_private {
writer_integrity(&repo_item_ctx.default_repo, ctx)
labeled_paths.push(crate::PathLabel {
path,
labels: crate::ResourceLabels {
description: format!("issue:{}#{}", repo_for_labels, issue_number),
secrecy: if tool_name == "search_issues" {
repo_visibility_secrecy_for_repo_id(repo_for_labels, ctx).into()
} else {
none_integrity(&repo_item_ctx.default_repo, ctx)
}
.into(),
}),
items_path: (!repo_item_ctx.items_path.is_empty())
.then_some(repo_item_ctx.items_path),
repo_item_ctx.default_secrecy_shared.clone()
},
integrity: integrity.into(),
},
});
}
} // end else (non-sub-method)

return Some(PathLabelResult {
labeled_paths,
default_labels: Some(crate::ResourceLabels {
description: "issue".to_string(),
secrecy: repo_item_ctx.default_secrecy_shared.clone(),
integrity: if repo_item_ctx.default_repo_private {
writer_integrity(&repo_item_ctx.default_repo, ctx)
} else {
none_integrity(&repo_item_ctx.default_repo, ctx)
}
.into(),
}),
items_path: (!repo_item_ctx.items_path.is_empty())
.then_some(repo_item_ctx.items_path),
});
}
}

// === Commits - label by branch ===
Expand Down Expand Up @@ -369,7 +362,7 @@ pub fn label_response_paths(
};

let commit_sha = get_str_or(item, "sha", "unknown");
let short_sha = short_sha(&commit_sha);
let short_sha = short_sha(commit_sha);

let integrity = commit_integrity(
item,
Expand Down Expand Up @@ -632,7 +625,7 @@ pub fn label_response_paths(
};

labeled_paths.push(crate::PathLabel {
path: make_item_path(&items_path, i),
path: make_item_path(items_path, i),
labels: crate::ResourceLabels {
description: {
let type_lower: Cow<'_, str> = match item_type {
Expand Down
2 changes: 2 additions & 0 deletions guards/github-guard/rust-guard/src/labels/tool_rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ fn get_first_non_empty_field(tool_args: &Value, field_names: &[&str]) -> String
/// 1. `author_association` floor
/// 2. Trusted bot/user elevation to writer level
/// 3. Collaborator-permission fallback for org repos
#[allow(clippy::too_many_arguments)]
fn resolve_author_integrity(
owner: &str,
repo: &str,
Expand Down Expand Up @@ -144,6 +145,7 @@ fn resolve_author_integrity(
/// `always_enrich` = false for list calls (per-item response labeling handles
/// refinement); = true for single-issue reads where the full enrichment is
/// applied at request time.
#[allow(clippy::too_many_arguments)]
fn apply_issue_read_enrichment(
owner: &str,
repo: &str,
Expand Down
Loading