Skip to content

Formatting touches to the T-compiler triage agenda #2396

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

Open
apiraino wants to merge 1 commit into
base: master
Choose a base branch
from
+60 −33
Open

Formatting touches to the T-compiler triage agenda #2396

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
4 changes: 3 additions & 1 deletion .git-blame-ignore-revs
View file
Open in desktop
Copy link
Copy Markdown
Contributor Author

@apiraino apiraino May 6, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated change: While I was bisecting some changes, I've added also this commit that was confusing git-blame

View changes since the review

Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Use `git config blame.ignorerevsfile .git-blame-ignore-revs` to make `git blame` ignore the following commits.
# Or add '-C' to git-blame(1) to get around this/these commit(s)

# Urgau 2026-02-23 17:44 Split `github.rs` file into multiple smaller sub-modules
# Please add '-C' to git-blame(1) to get around this commit
00127fd78e4571fbdb7b5b5d41b73ebf3bf4e895
# Urgau 2026-02-23 17:44 Adjust GitHub module splitting after review comments
a74d4afb004a2af5d04a900511ce0dea1a9aa91f
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ If you want a test Zulip instance, you can [register a free one](https://zulip.c
- Configure a [webhook forwarding service](#configure-webhook-forwarding)
- Create in your Zulip instance an outgoing webhook bot, binding it to the forwarding address created before.
- Launch your local triagebot setting `ZULIP_WEBHOOK_SECRET` to the webhook bot `token` value (you get that as part of the Zulip bot configuration)
- Set other Zulip env vars as needed (see example in `.env.sample`).
- Set other Zulip env vars as needed (see example in `.env.sample`): specifically you will need `TEAMS_API_URL` to point to a host with custom Zulip user mappings (relevant file: `zulip_map.json`).

You can also simulate a Zulip webhook payload with `cURL`. For example, this is the payload sent to the triagebot server when tagging a Zulip bot in a stream.
``` sh
Expand Down
1 change: 1 addition & 0 deletions src/actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ pub struct IssueDecorator {
pub repo_name: String,
pub labels: String,
pub author: String,
pub team: String,
pub assignees: String,
// Human (readable) timestamp
pub updated_at_hts: String,
Expand Down
43 changes: 28 additions & 15 deletions src/agenda.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,17 @@ pub fn prioritization() -> Box<dyn Action> {
query: Arc::new(IssueQuery {
filters: vec![("state", "open")],
include_labels: vec!["proposed-final-comment-period", "T-compiler"],
exclude_labels: vec!["t-libs", "t-libs-api", "t-rustdoc"],
exclude_labels: vec![
"I-lang-nominated",
"I-libs-nominated",
"S-blocked",
"S-waiting-on-author",
"S-waiting-on-t-lang",
"S-waiting-on-t-libs",
"T-libs",
"T-libs-api",
"T-rustdoc",
],
}),
},
QueryMap {
Expand All @@ -112,7 +122,17 @@ pub fn prioritization() -> Box<dyn Action> {
query: Arc::new(IssueQuery {
filters: vec![("state", "open")],
include_labels: vec!["final-comment-period", "T-compiler"],
exclude_labels: vec!["t-libs", "t-libs-api", "t-rustdoc"],
exclude_labels: vec![
"I-lang-nominated",
"I-libs-nominated",
"S-blocked",
"S-waiting-on-author",
"S-waiting-on-t-lang",
"S-waiting-on-t-libs",
"T-libs",
"T-libs-api",
"T-rustdoc",
],
}),
},
QueryMap {
Expand All @@ -129,24 +149,17 @@ pub fn prioritization() -> Box<dyn Action> {
"t-libs",
"t-libs-api",
"t-rustdoc",
"t-rustdoc-frontend",
"t-lang",
"t-style",
"S-waiting-on-author",
"S-waiting-t-lang",
"S-waiting-t-libs",
"I-lang-nominated",
"I-libs-nominated",
],
}),
},
QueryMap {
name: "fcp_finished_not_tcompiler",
kind: QueryKind::List,
query: Arc::new(IssueQuery {
filters: vec![("state", "all")],
include_labels: vec![
"finished-final-comment-period",
"disposition-merge",
"to-announce",
],
exclude_labels: vec!["t-libs", "t-libs-api", "t-rustdoc", "t-compiler"],
}),
},
],
},
Query {
Expand Down
22 changes: 16 additions & 6 deletions src/github/issue_query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,24 +161,33 @@ impl IssuesQuery for Query<'_> {
None
};

let labels = issue
.labels
.iter()
.map(|l| l.name.as_ref())
.collect::<Vec<&str>>();

// guess the team this issue belongs to:
// get the first T-* label associated with it
let t_label = labels
.iter()
.find(|s| s.starts_with("T-"))
.map_or("", |v| v);

issues_decorator.push(crate::actions::IssueDecorator {
title: issue.title.clone(),
number: issue.number,
html_url: issue.html_url.clone(),
repo_name: repo.name().to_owned(),
labels: issue
.labels
.iter()
.map(|l| l.name.as_ref())
.collect::<Vec<_>>()
.join(", "),
labels: labels.join(","),
assignees: issue
.assignees
.iter()
.map(|u| u.login.as_ref())
.collect::<Vec<_>>()
.join(", "),
author: issue.user.login,
team: t_label.to_string(),
updated_at_hts: crate::actions::to_human(issue.updated_at),
fcp_details,
mcp_details,
Expand Down Expand Up @@ -325,6 +334,7 @@ impl IssuesQuery for LeastRecentlyReviewedPullRequests {
repo_name: repo_name.to_string(),
labels,
author,
team: "UNUSED".to_string(),
assignees,
updated_at_hts,
fcp_details: None,
Expand Down
11 changes: 7 additions & 4 deletions templates/_issue.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{% macro render(issue, with_age="", backport_branch="") %}{% if issue.is_blocked %}[blocked]{% endif %} "{{issue.title}}" [{{issue.repo_name}}#{{issue.number}}]({{issue.html_url}}){% if issue.mcp_details.zulip_link %} ([Zulip]({{issue.mcp_details.zulip_link}})){% endif %}{% if with_age %} (last review activity: {{issue.updated_at_hts}}){%- endif -%}
{% macro render(issue, with_age="", with_team_tag="", backport_branch="") %}
{%- if with_team_tag %}[{{issue.team}}] {% endif %}
{%- if issue.is_blocked %}[blocked] {% endif %}"{{issue.title}}" [{{issue.repo_name}}#{{issue.number}}]({{issue.html_url}})
{%- if issue.mcp_details.zulip_link %} ([Zulip]({{issue.mcp_details.zulip_link}})){% endif %}
{%- if with_age %} (last review activity: {{issue.updated_at_hts}}){%- endif -%}
{%- if backport_branch != "" %}
- Authored by {{ issue.author }}
- Voting [Zulip topic](#)
<!--
Triagebot commands for handling backports on GitHub
If approved: @triagebot backport {{ backport_branch }} accept {{ issue.number }}
If declined: @triagebot backport {{ backport_branch }} decline {{ issue.number }}
@**triagebot** backport {{ backport_branch | replace(from=":", to="") | trim() }} accept {{ issue.number }}
@**triagebot** backport {{ backport_branch | replace(from=":", to="") | trim() }} decline {{ issue.number }}
-->
{%- endif -%}
{% if issue.mcp_details.concerns %}{%- for concern in issue.mcp_details.concerns %}
Expand Down
4 changes: 2 additions & 2 deletions templates/_issues.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% import "_issue.tt" as issue %}

{% macro render(issues, indent="", backport_branch="", with_age=false, empty="No issues at this time.") %}
{% macro render(issues, indent="", backport_branch="", with_age=false, with_team_tag=false, empty="No issues at this time.") %}
{%- for issue in issues %}
{{indent}}- {{ backport_branch }}{{issue::render(issue=issue, with_age=with_age, backport_branch=backport_branch)}}{% else %}
{{indent}}- {{ backport_branch }}{{issue::render(issue=issue, with_age=with_age, with_team_tag=with_team_tag, backport_branch=backport_branch)}}{% else %}
{{indent}}- {{empty}}{% endfor -%}
{% endmacro %}
6 changes: 2 additions & 4 deletions templates/prioritization_agenda.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ note_id: xxx

- (TIP) add here non-recurrent scheduled meetings, [check the schedule calendar](https://github.com/rust-lang/calendar)
- (TIP) mention upcoming Rust stable releases, [check the release calendar](https://calendar.google.com/calendar/htmlembed?src=l1b1gkqvfbgunjs18nemq4c580%40group.calendar.google.com)
- Reminder: if you see a PR/issue that seems like there might be legal implications due to copyright/IP/etc, please let us know (or at least message @_**davidtwco** or @_**Wesley Wiser** so we can pass it along).
- Reminder: if you see a PR/issue that seems like there might be legal implications due to copyright/IP/etc, please let us know (or at least message @_**davidtwco** or @_**Boxy** so we can pass it along).

### Other WG meetings

Expand All @@ -37,9 +37,7 @@ note_id: xxx
- MCPs blocked on unresolved concerns
- <Here group MCPs blocked on unresolved concerns>
- Finalized FCPs (disposition merge)
{{-issues::render(issues=fcp_finished_tcompiler, indent=" ", empty="No new finished FCP (disposition merge) this time.")}}
- Other teams finalized FCPs
{{-issues::render(issues=fcp_finished_not_tcompiler, indent=" ", empty="No new finished FCP (disposition merge) this time.")}}
{{-issues::render(issues=fcp_finished_tcompiler, indent=" ", with_age=false, with_team_tag=true, empty="No new finished FCP (disposition merge) this time.")}}

## Backport nominations

Expand Down