Introduce --ci flag in tidy by Shunpoco · Pull Request #152949 · rust-lang/rust

Shunpoco · 2026-02-21T22:27:43Z

Context

Currently tidy doesn't have --ci flag. Even if bootstrap has --ci=true, it isn't passed to tidy. As a result, some parts of tidy where we need to turn on ci mode are never executed on our local.

Change

This PR introduces --ci flag in tidy, and modify CiInfo and other parts of tidy where currently use CiEnv::is_ci() for checking if the running environment is ci or not.

Shunpoco · 2026-02-22T00:12:24Z

r? @Kobzol

This is a continuation PR from #152734 🙏

rustbot · 2026-02-22T00:12:28Z

Kobzol is not on the review rotation at the moment.
They may take a while to respond.

rustbot · 2026-02-22T00:12:32Z

tidy extra checks were modified.

cc @lolbinarycat

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Shunpoco · 2026-02-22T00:29:21Z

src/tools/tidy/src/lib.rs

-            ci_env: CiEnv::current(),
-            base_commit: None,
-        };
+        let ci_env =


I'm wondering if we can merge CiInfo into TidyCtx so that TidyCtx becomes the (only) central place to distribute contexts. It also makes the code base simpler.

Yeah I think it would be worth a try. I remember trying something like that? Maybe, it was a long time ago.. You can try and see if there aren't any issues with that.

I did it in e5c12c6 and 05b0869.

Kobzol

Thanks! Making CI mode be configurable in tidy sounds useful indeed.

View changes since this review

src/bootstrap/src/core/build_steps/test.rs

Kobzol · 2026-02-23T09:39:26Z

src/tools/tidy/src/diagnostics.rs

 pub struct TidyFlags {
    /// Applies style and formatting changes during a tidy run.
    bless: bool,
+    /// CI flag which for emurating CI env.


Not sure what the comment was supposed to say.

lol, I wanted to say that this flag is for turning on CI mode even in a local environment. I will modify the words 😄

Fixed in ee53d97

Kobzol · 2026-02-23T09:40:35Z

src/tools/tidy/src/lib.rs

-            ci_env: CiEnv::current(),
-            base_commit: None,
-        };
+        let ci_env =


Yeah I think it would be worth a try. I remember trying something like that? Maybe, it was a long time ago.. You can try and see if there aren't any issues with that.

Kobzol · 2026-02-28T10:10:08Z

src/tools/tidy/src/diagnostics.rs

+        let ci_env = match ci_flag {
+            Some(true) => CiEnv::GitHubActions,
+            Some(false) => CiEnv::None,
+            None => CiEnv::None,


Suggested change

None => CiEnv::None,

None => CiEnv::current(),

Not that we would run tidy manually on CI, but it should auto detect if the flag is not passed.

Thanks, I overlooked this misconfiguration. Fixed in de607cc

src/tools/tidy/src/diagnostics.rs

Kobzol · 2026-02-28T20:25:53Z

No need to clone TidyCtx, find_base_commit can just receive &TidyCtx by reference. After you change that, you can squash the commits using @bors squash, and r=me. Thank you!

@bors delegate

rust-bors · 2026-02-28T20:25:56Z

✌️ @Shunpoco, you can now approve this pull request!

If @Kobzol told you to "r=me" after making some further change, then please make that change and post @bors r=Kobzol.

Shunpoco · 2026-02-28T21:37:29Z

@bors squash

rust-bors · 2026-02-28T21:37:32Z

🚧 Squashing... this can take a few minutes.

* add --ci flag in tidy This commit introduces --ci flag in tidy because currently bootstrap can't pass its ci env information to tidy. It also modifies how CiInfo initialize its ci_env variable. tidy codes which uses CiEnv::is_ci for checking ci are now using ci_env in CiInfo. * address review - Fix comment - Use Option for ci flag in order to have true/false explicitly or unspecified (implicit false) * integrate CiInfo into TidyCtx * remove CiInfo * CiEnv::current() should be called when ci flag is not added * extract base_commit() to a separate function * use &TidyCtx instead of clone

rust-bors · 2026-02-28T21:37:52Z

🔨 7 commits were squashed into af29989.

Kobzol · 2026-02-28T22:11:11Z

Thank you!

@bors r+

rust-bors · 2026-02-28T22:11:13Z

📌 Commit af29989 has been approved by Kobzol

It is now in the queue for this repository.

Introduce --ci flag in tidy ## Context Currently tidy doesn't have `--ci` flag. Even if bootstrap has --ci=true, it isn't passed to tidy. As a result, some parts of tidy where we need to turn on `ci mode` are never executed on our local. ## Change This PR introduces --ci flag in tidy, and modify CiInfo and other parts of tidy where currently use `CiEnv::is_ci()` for checking if the running environment is ci or not.

Rollup of 5 pull requests Successful merges: - #152042 (Suggest async block instead of async closure when possible) - #152949 (Introduce --ci flag in tidy) - #152655 (Disable debug_assert_not_in_new_nodes for multiple threads) - #153209 (Clean up `QueryVTable::hash_result` into `hash_value_fn`) - #153229 (rustfmt: add test for field representing type builtin syntax)

Rollup merge of #152949 - Shunpoco:tidy-ci, r=Kobzol Introduce --ci flag in tidy ## Context Currently tidy doesn't have `--ci` flag. Even if bootstrap has --ci=true, it isn't passed to tidy. As a result, some parts of tidy where we need to turn on `ci mode` are never executed on our local. ## Change This PR introduces --ci flag in tidy, and modify CiInfo and other parts of tidy where currently use `CiEnv::is_ci()` for checking if the running environment is ci or not.

Shunpoco force-pushed the tidy-ci branch from 59ae79d to 5c8115f Compare February 21, 2026 22:28

This comment has been minimized.

Sign in to view

Shunpoco force-pushed the tidy-ci branch from 5c8115f to 8977613 Compare February 21, 2026 22:36

rustbot assigned Kobzol Feb 22, 2026

Shunpoco marked this pull request as ready for review February 22, 2026 00:12

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 22, 2026

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 22, 2026

Shunpoco commented Feb 22, 2026

View reviewed changes

Kobzol reviewed Feb 23, 2026

View reviewed changes

Shunpoco force-pushed the tidy-ci branch from 3277b1c to 05b0869 Compare February 28, 2026 00:02

Kobzol reviewed Feb 28, 2026

View reviewed changes

This comment was marked as duplicate.

Sign in to view

rust-bors bot force-pushed the tidy-ci branch from 5f7b275 to af29989 Compare February 28, 2026 21:37

rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 28, 2026

This was referenced Mar 1, 2026

Rollup of 5 pull requests #153245

Closed

Rollup of 5 pull requests #153252

Merged

This was referenced Mar 1, 2026

Show recent PRs when a user is banned rust-lang/triagebot#2313

Merged

Rename the comments command to user-info and extend it rust-lang/triagebot#2317

Merged

rust-bors bot merged commit 1b67449 into rust-lang:main Mar 1, 2026
11 checks passed

rustbot added this to the 1.96.0 milestone Mar 1, 2026

Uh oh!

Conversation

Shunpoco commented Feb 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Context

Change

Uh oh!

This comment has been minimized.

Shunpoco commented Feb 22, 2026

Uh oh!

rustbot commented Feb 22, 2026

Uh oh!

rustbot commented Feb 22, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kobzol left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Shunpoco Feb 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Kobzol commented Feb 28, 2026

Uh oh!

rust-bors bot commented Feb 28, 2026

Uh oh!

Shunpoco commented Feb 28, 2026

Uh oh!

rust-bors bot commented Feb 28, 2026

Uh oh!

This comment was marked as duplicate.

rust-bors bot commented Feb 28, 2026

Uh oh!

Kobzol commented Feb 28, 2026

Uh oh!

rust-bors bot commented Feb 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Shunpoco commented Feb 21, 2026 •

edited

Loading

Kobzol left a comment •

edited by rustbot

Loading

Shunpoco Feb 28, 2026 •

edited

Loading