Rollup of 4 pull requests #151897

matthiaskrgr · 2026-01-31T09:41:54Z

Successful merges:

Introducing clap on tidy #151262 (Introducing clap on tidy)
Revert enabling outline-atomics on various platforms #151896 (Revert enabling outline-atomics on various platforms)
refactor: remove Ty::pinned_ref in favor of Ty::maybe_pinned_ref #151849 (refactor: remove Ty::pinned_ref in favor of Ty::maybe_pinned_ref)
Document enum types used as values for E0423 #151892 (Document enum types used as values for E0423)

Current tidy parses paths and options manually, and parsing is spreading multple files. This commit introduces a parser using clap to clean and centralize it.

Currently some required arguments (like path of the root dir) are ordered, but it causes an user (mainly bootstrap) needs to remember the order. This commit introduces long arguments (e.g., --root-path) for required args.

Also returns the `Region` of the reference type.

This reverts commit 383053e.

This reverts commit 66c150c.

This reverts commit 21525f8.

This reverts commit c455903.

…rms" This reverts commit 1ed1b6e.

Introducing clap on tidy ### Context Currently tidy parses paths/flags from args_os manually, and the extraction is spreading multiple files. It may be a breeding ground for bugs. ref: https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/How.20--ci.3Dtrue.20interact.20with.20CiEnv.3F/near/543171560 (N.B. We've talked about introducing a ci flag in tidy in that thread, but I don't do it in this PR as I don't want to put multiple changes into a PR. I will introduce the flag in a coming PR.) ### Changes This PR replaces current parsing logic with clap. To confirm the new parser works fine, I introduce an unit test for it. ### Build time We've concerned about how clap increases the build time. In order to confirm the increment is acceptable, I did an experiment on CI: - Run cargo build without cache for tidy 50 times in each environment on CI - Calculate an average and a standard deviation from the result, and plot them Here is the graph: <img width="943" height="530" alt="rust_tidy_build_time" src="https://github.com/user-attachments/assets/c7deee69-9f38-4044-87dc-76d6e7384f76" /> - Clap tends to increase build time ~2s. We think this is not a big problem - Build time differs in each environment - In some cases standard deviation are high, I suppose that busyness of CI instances affect build time

…=lqd Revert enabling `outline-atomics` on various platforms Our implementations in `compiler-builtins` do not yet have BTI landing pads, so platforms using a custom-built std with unstable `-Zbranch-protection=bti` may run into issues. This should resolve rust-lang#151486. There is a PR in progress to add BTI support to compiler-builtins [1], after which this can be re-enabled. Linux has had `outline-atomics` enabled for years [2] with no known problems, so it is not changed here. Partially reverts rust-lang#144938 Reverts rust-lang#149633 Zulip discussion: https://rust-lang.zulipchat.com/#narrow/channel/245100-t-compiler.2Fprioritization.2Falerts/topic/.23151486.20Chromium.20hitting.20SIGILL.20crashes.20on.20aarch64.20after.20.231.E2.80.A6/with/571170956 [1]: rust-lang/compiler-builtins#1063 [2]: tgross35@0f9f241

…r=jackh726 refactor: remove `Ty::pinned_ref` in favor of `Ty::maybe_pinned_ref` Also returns the `Region` of the reference type in `Ty::maybe_pinned_Ref`. Part of rust-lang#149130. r? jackh726

…ooeo Document enum types used as values for E0423 ### Problem The E0423 error explanation did not include an example for enum types being used as values, which is a common source of confusion for users. For example, the following code: ```rust fn main() { let x = Option::<i32>; } ```

matthiaskrgr · 2026-01-31T09:42:10Z

@bors r+ rollup=never p=5

rust-bors · 2026-01-31T09:42:13Z

📌 Commit 72f163c has been approved by matthiaskrgr

It is now in the queue for this repository.

rust-bors · 2026-01-31T16:23:41Z

☀️ Test successful - CI
Approved by: matthiaskrgr
Duration: 3h 24m 7s
Pushing 78865ca to main...

rust-timer · 2026-01-31T16:24:49Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#151262	Introducing clap on tidy	`fa24d8be9fdf2d454419643ab3dbfd8dacc5ef40` (link)
#151849	refactor: remove `Ty::pinned_ref` in favor of `Ty::maybe_pi…	`c267f51b956aaca68e8d66940dd58f001013bbf8` (link)
#151892	Document enum types used as values for E0423	`34423c606494cd38b19f159e0b63c49f7e4b0944` (link)
#151896	Revert enabling `outline-atomics` on various platforms	`7a785b5a9a46a53b9039d81f9259d1d4f55bc403` (link)

previous master: 271951ba18

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

github-actions · 2026-01-31T16:26:23Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 271951b (parent) -> 78865ca (this PR)

Test differences

Show 17 test diffs

Stage 0

arg_parser::tests::test_tidy_parser_any_order: [missing] -> pass (J0)
arg_parser::tests::test_tidy_parser_full: [missing] -> pass (J0)
arg_parser::tests::test_tidy_parser_missing_cargo_path: [missing] -> pass (J0)
arg_parser::tests::test_tidy_parser_missing_concurrency: [missing] -> pass (J0)
arg_parser::tests::test_tidy_parser_missing_npm_path: [missing] -> pass (J0)
arg_parser::tests::test_tidy_parser_missing_output_dir: [missing] -> pass (J0)
arg_parser::tests::test_tidy_parser_missing_root_path: [missing] -> pass (J0)

Additionally, 10 doctest diffs were found. These are ignored, as they are noisy.

Job group index

J0: aarch64-apple, aarch64-gnu, aarch64-gnu-llvm-20-1, aarch64-msvc-1, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, tidy, x86_64-gnu, x86_64-gnu-llvm-20-2, x86_64-gnu-llvm-20-3, x86_64-gnu-llvm-21-2, x86_64-gnu-llvm-21-3, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 78865ca937ef3b77b214473db78b51ec82e2277a --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

aarch64-apple: 8940.3s -> 11880.3s (+32.9%)
dist-aarch64-llvm-mingw: 5682.9s -> 6944.8s (+22.2%)
dist-apple-various: 3524.4s -> 4279.8s (+21.4%)
i686-gnu-nopt-1: 7500.8s -> 8436.8s (+12.5%)
dist-x86_64-apple: 5921.8s -> 6506.6s (+9.9%)
i686-msvc-2: 7270.8s -> 7947.4s (+9.3%)
dist-aarch64-msvc: 5716.8s -> 6203.3s (+8.5%)
x86_64-gnu-tools: 3587.5s -> 3871.6s (+7.9%)
aarch64-gnu-debug: 4532.4s -> 4183.7s (-7.7%)
dist-various-2: 2400.9s -> 2230.9s (-7.1%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2026-01-31T17:06:52Z

Finished benchmarking commit (78865ca): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (secondary 15.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	24.5%	[2.5%, 46.5%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.0%	[-4.0%, -4.0%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 474.744s -> 476.918s (0.46%)
Artifact size: 397.83 MiB -> 397.86 MiB (0.01%)

Shunpoco and others added 14 commits January 29, 2026 08:11

use clap on tidy

59c77c4

Current tidy parses paths and options manually, and parsing is spreading multple files. This commit introduces a parser using clap to clean and centralize it.

set long variants for required args

1485873

Currently some required arguments (like path of the root dir) are ordered, but it causes an user (mainly bootstrap) needs to remember the order. This commit introduces long arguments (e.g., --root-path) for required args.

refactor: remove Ty::pinned_ref in favor of Ty::maybe_pinned_ref

4ae5b43

Also returns the `Region` of the reference type.

Document enum types used as values for E0423

9cdcd0c

Fix tidy formatting manually for E0423.md

daaff44

Revert "Enable outline-atomics by default on AArch64 FreeBSD"

54f88be

This reverts commit 383053e.

Revert "Enable outline-atomics by default on AArch64 OpenBSD"

63e1652

This reverts commit 66c150c.

Revert "Enable outline-atomics by default on AArch64 Fuchsia"

a9da102

This reverts commit 21525f8.

Revert "Enable outline-atomics by default on AArch64 Android"

1173034

This reverts commit c455903.

Revert "Enable outline-atomics by default on AArch64 Windows platfo…

9fb68d6

…rms" This reverts commit 1ed1b6e.

Rollup merge of rust-lang#151849 - frank-king:refactor/pin-coerce-1, …

29fcd63

…r=jackh726 refactor: remove `Ty::pinned_ref` in favor of `Ty::maybe_pinned_ref` Also returns the `Region` of the reference type in `Ty::maybe_pinned_Ref`. Part of rust-lang#149130. r? jackh726

rust-bors bot added the rollup A PR which is a rollup label Jan 31, 2026

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 Jan 31, 2026

This comment has been minimized.

Sign in to view

rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 31, 2026

rust-bors bot merged commit 78865ca into rust-lang:main Jan 31, 2026
12 checks passed

rustbot added this to the 1.95.0 milestone Jan 31, 2026

rust-bors bot mentioned this pull request Jan 31, 2026

Implement coercions between &pin (mut|const) T and &(mut) T when T: Unpin #149130

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 4 pull requests #151897

Rollup of 4 pull requests #151897

Uh oh!

matthiaskrgr commented Jan 31, 2026

Uh oh!

matthiaskrgr commented Jan 31, 2026

Uh oh!

rust-bors bot commented Jan 31, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Jan 31, 2026

Uh oh!

Uh oh!

rust-timer commented Jan 31, 2026

Uh oh!

github-actions bot commented Jan 31, 2026

Stage 0

Uh oh!

rust-timer commented Jan 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Rollup of 4 pull requests #151897

Rollup of 4 pull requests #151897

Uh oh!

Conversation

matthiaskrgr commented Jan 31, 2026

Uh oh!

matthiaskrgr commented Jan 31, 2026

Uh oh!

rust-bors bot commented Jan 31, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Jan 31, 2026

Uh oh!

Uh oh!

rust-timer commented Jan 31, 2026

Uh oh!

github-actions bot commented Jan 31, 2026

Test differences

Stage 0

Job duration changes

Uh oh!

rust-timer commented Jan 31, 2026

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants