From 99e86f237d0866801ea93d0f894d5a6855fc204f Mon Sep 17 00:00:00 2001 From: Jieyou Xu Date: Tue, 20 Jan 2026 09:17:14 +0800 Subject: [PATCH 1/4] triagebot: use the `S-waiting-on-{author,review}` label sets And configure triagebot review status label flipping. Instead of `pr-{not-reviewed,waiting-on-author,follow-up-review-pending}`, for two reasons: 1. Consistency with `rust-lang/rust`. The `S-*` status labels are the ones that `rust-lang/rust` uses. 2. I don't think the `not-reviewed` vs `follow-up-review-pending` distinction makes a lot of difference in practice. However, we can still keep the `pr-follow-up-review-pending` label, since that is previously manually applied anyway. --- triagebot.toml | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/triagebot.toml b/triagebot.toml index 86c7dea8d6e..863395bed49 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -10,8 +10,9 @@ allow-unauthenticated = [ "needs-triage", ] -[autolabel."pr-not-reviewed"] -new_pr = true +# ------------------------------------------------------------------------------ +# General autolabels +# ------------------------------------------------------------------------------ [autolabel."needs-triage"] new_issue = true @@ -19,6 +20,28 @@ exclude_labels = [ "C-tracking-issue", ] +# ------------------------------------------------------------------------------ +# PR review +# ------------------------------------------------------------------------------ + +[autolabel."S-waiting-on-review"] +new_pr = true + +[autolabel."S-waiting-on-author"] +new_draft = true + +[review-submitted] +# This label is added when a "request changes" review is submitted. +reviewed_label = "S-waiting-on-author" +# These labels are removed when a "request changes" review is submitted. +review_labels = ["S-waiting-on-review"] + +[review-requested] +# Those labels are removed when PR author requests a review from an assignee +remove_labels = ["S-waiting-on-author"] +# Those labels are added when PR author requests a review from an assignee +add_labels = ["S-waiting-on-review"] + # ------------------------------------------------------------------------------ # PR assignments # ------------------------------------------------------------------------------ From 4f34c1127d9e3d1051039a7d1d755a408fa0517a Mon Sep 17 00:00:00 2001 From: Jieyou Xu Date: Tue, 20 Jan 2026 09:20:44 +0800 Subject: [PATCH 2/4] triagebot: allow users to relabel `S-*` and `C-*` labels Through `@rustbot label`. --- triagebot.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/triagebot.toml b/triagebot.toml index 863395bed49..d9685bab52c 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -8,6 +8,8 @@ [relabel] allow-unauthenticated = [ "needs-triage", + "S-*", + "C-*", ] # ------------------------------------------------------------------------------ From c7d5ef2b0950047d548d9051fc59237ff1498595 Mon Sep 17 00:00:00 2001 From: Jieyou Xu Date: Tue, 20 Jan 2026 09:21:35 +0800 Subject: [PATCH 3/4] triagebot: enable `review-changes-since` functionality Basically, a web-rendered version of `range-diff` to make review after force-pushes easier. --- triagebot.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/triagebot.toml b/triagebot.toml index d9685bab52c..b8356bd1f5b 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -44,6 +44,11 @@ remove_labels = ["S-waiting-on-author"] # Those labels are added when PR author requests a review from an assignee add_labels = ["S-waiting-on-review"] +# Adds at the end of a review body a link to view the changes that happened +# since the review +# Documentation at: https://forge.rust-lang.org/triagebot/review-changes-since.html +[review-changes-since] + # ------------------------------------------------------------------------------ # PR assignments # ------------------------------------------------------------------------------ From 99ced102cd61b41310e901ee21067d71d4e51c95 Mon Sep 17 00:00:00 2001 From: Jieyou Xu Date: Tue, 20 Jan 2026 09:31:14 +0800 Subject: [PATCH 4/4] triagebot: enable `shortcut` functionality This allows PR reviewers and authors to easily use: ``` @rustbot ready # S-{waiting-on-author,blocked} -> S-waiting-on-review @rustbot author # S-{waiting-on-review,blocked} -> S-waiting-on-author @rustbot blocked # S-waiting-on-{author,review} -> S-blocked ``` --- triagebot.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/triagebot.toml b/triagebot.toml index b8356bd1f5b..5fc58ab9615 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -49,6 +49,11 @@ add_labels = ["S-waiting-on-review"] # Documentation at: https://forge.rust-lang.org/triagebot/review-changes-since.html [review-changes-since] +# Allow reviewers and authors to easily flip between {`S-waiting-on-review`, +# `S-waiting-on-author`, `S-blocked`}. +# Documentation at: +[shortcut] + # ------------------------------------------------------------------------------ # PR assignments # ------------------------------------------------------------------------------