Rollup of 7 pull requests #151325

JonathanBrouwer · 2026-01-18T17:26:07Z

Successful merges:

Allow invoking all help options at once #150767 (Allow invoking all help options at once)
Added mGCA related tests #150886 (Added mGCA related tests)
Explicitly list crate level attrs #151245 (Explicitly list crate level attrs)
Fix ICE on inconsistent import resolution with macro-attributed extern crate #151268 (Fix ICE on inconsistent import resolution with macro-attributed extern crate)
Normalize type_const items even with feature generic_const_exprs #151275 (Normalize type_const items even with feature generic_const_exprs)
Use find_attr instead of attr::contains_name in lower_const_item_rhs #151288 (Use find_attr instead of attr::contains_name in lower_const_item_rhs)
Port #![no_main] to the attribute parser. #151321 (Port #![no_main] to the attribute parser.)

…n crate

@bjorn3

Allow invoking all help options at once Implements rust-lang#150442 Help messages are printed in the order they are invoked, but only once (e.g. `--help -C help --help` prints regular help then codegen help). Lint groups (`-Whelp`) are always printed last due to necessarily coming later in the compiler pipeline. Adds `help` flags to `-C` and `-Z` to avoid an error in `build_session_options`. cc @bjorn3 [#t-compiler/major changes > Allow combining &rust-lang#96;--help -C help -Z help -… compiler-team#954 @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/233931-t-compiler.2Fmajor-changes/topic/Allow.20combining.20.60--help.20-C.20help.20-Z.20help.20-.E2.80.A6.20compiler-team.23954/near/564358190) - this currently maintains the behaviour of unrecognized options always failing-fast, as this happens within `getopt`s parsing, before we can even check if help options are present.

Added mGCA related tests Add regression tests for subsequent mGCA tasks edit: resolve: rust-lang#147415 `tests\ui\const-generics\mgca\size-of-generic-ptr-in-array-len.rs` resolve: rust-lang#141014 `tests\ui\const-generics\mgca\assoc-const-projection-in-bound.rs` and crashes: 138226, 138226-2, 149809, 150960

@jdonszelmann

Explicitly list crate level attrs r? @jdonszelmann

…, r=mati865 Fix ICE on inconsistent import resolution with macro-attributed extern crate Fixes rust-lang#151213 using issue_145575_hack_applied in the same way as in rust-lang#149860.

@BoxyUwU

Normalize type_const items even with feature `generic_const_exprs` Fixes rust-lang#151251 With feature `generic_const_exprs` enabled, consts with `#[type_const]` won't be normalized even if they need. Then ICE happens when CTFE tries to evaluate such const without body. Fix this by normalizing such consts even with feature `generic_const_exprs` enabled. r? @BoxyUwU

@BoxyUwU

Use `find_attr` instead of `attr::contains_name` in `lower_const_item_rhs` Fixes rust-lang#151250 `attr::contains_name` uses `AttributeExt::name()` to filter, but for `hir::Attribute::Parsed`, this method will return `None`, and then `attr::contains_name` will return `false` here. So that the previous logic cannot work as expected. r? @BoxyUwU

@JonathanBrouwer

Port #![no_main] to the attribute parser. Tracking issue: rust-lang#131229 r? @JonathanBrouwer

JonathanBrouwer · 2026-01-18T17:26:17Z

@bors r+ rollup=never p=5

rust-bors · 2026-01-18T17:26:20Z

📌 Commit 3c2c533 has been approved by JonathanBrouwer

It is now in the queue for this repository.

rust-bors · 2026-01-18T21:30:09Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Pushing 0a3cd3b to main...

rust-timer · 2026-01-18T21:32:08Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#150767	Allow invoking all help options at once	`8f5d9d706229070225e3cd8ac67930c028d40939` (link)
#150886	Added mGCA related tests	`5e4f400a59a5acedb287948a5825c380c607e6cf` (link)
#151245	Explicitly list crate level attrs	`e87f53398a9d50eca689a079cd8555c898d53e68` (link)
#151268	Fix ICE on inconsistent import resolution with macro-attrib…	`bcdd61eeb5f5e32d167985ac913cd6194d443944` (link)
#151275	Normalize type_const items even with feature `generic_const…	`78149549f5eb9119e445bbe2570b50d9c5fbe41f` (link)
#151288	Use `find_attr` instead of `attr::contains_name` in `lower_…	`41baad2caf63ed9cf512159f86b6ee5c3527b290` (link)
#151321	Port #![no_main] to the attribute parser.	`60a8e3465e3b7fe5c4b3e97b9e6256bef39b39d2` (link)

previous master: 2b112efccc

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-18T21:32:56Z

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 2b112ef (parent) -> 0a3cd3b (this PR)

Test differences

Show 30 test diffs

Stage 1

[crashes] tests/crashes/138226-2.rs: [missing] -> pass (J2)
[crashes] tests/crashes/138226.rs: [missing] -> pass (J2)
[crashes] tests/crashes/149809.rs: [missing] -> pass (J2)
[crashes] tests/crashes/150960.rs: [missing] -> pass (J2)
[ui] tests/ui/const-generics/mgca/assoc-const-projection-in-bound.rs: [missing] -> pass (J2)
[ui] tests/ui/const-generics/mgca/cyclic-type-const-151251.rs: [missing] -> pass (J2)
[ui] tests/ui/const-generics/mgca/size-of-generic-ptr-in-array-len.rs: [missing] -> pass (J2)
[ui] tests/ui/const-generics/mgca/type-const-assoc-const-without-body.rs: [missing] -> pass (J2)
[ui] tests/ui/const-generics/mgca/type-const-inherent-assoc-const-without-body.rs: [missing] -> pass (J2)
[ui] tests/ui/resolve/ice-inconsistent-resolution-151213.rs: [missing] -> pass (J2)

Stage 2

[crashes] tests/crashes/138089.rs: pass -> ignore (ignored if rustc wasn't built with debug assertions) (J0)
[crashes] tests/crashes/138226-2.rs: [missing] -> ignore (ignored if rustc wasn't built with debug assertions) (J0)
[crashes] tests/crashes/138226.rs: [missing] -> ignore (ignored if rustc wasn't built with debug assertions) (J0)
[ui] tests/ui/const-generics/mgca/cyclic-type-const-151251.rs: [missing] -> ignore (ignored if rustc wasn't built with debug assertions) (J0)
[ui] tests/ui/const-generics/mgca/type-const-assoc-const-without-body.rs: [missing] -> ignore (ignored if rustc wasn't built with debug assertions) (J0)
[ui] tests/ui/const-generics/mgca/type-const-inherent-assoc-const-without-body.rs: [missing] -> ignore (ignored if rustc wasn't built with debug assertions) (J0)
[ui] tests/ui/const-generics/mgca/assoc-const-projection-in-bound.rs: [missing] -> pass (J1)
[ui] tests/ui/const-generics/mgca/size-of-generic-ptr-in-array-len.rs: [missing] -> pass (J1)
[ui] tests/ui/resolve/ice-inconsistent-resolution-151213.rs: [missing] -> pass (J1)
[ui] tests/ui/const-generics/mgca/cyclic-type-const-151251.rs: [missing] -> pass (J3)
[ui] tests/ui/const-generics/mgca/type-const-assoc-const-without-body.rs: [missing] -> pass (J3)
[ui] tests/ui/const-generics/mgca/type-const-inherent-assoc-const-without-body.rs: [missing] -> pass (J3)
[crashes] tests/crashes/149809.rs: [missing] -> pass (J4)
[crashes] tests/crashes/150960.rs: [missing] -> pass (J4)
[crashes] tests/crashes/138226-2.rs: [missing] -> pass (J5)
[crashes] tests/crashes/138226.rs: [missing] -> pass (J5)

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

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 0a3cd3b6b6e1fa8fd3c75c1d13d2e22e64273f49 --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

dist-x86_64-apple: 6750.9s -> 8829.4s (+30.8%)
pr-check-1: 1686.3s -> 2004.7s (+18.9%)
x86_64-gnu-tools: 3387.1s -> 3929.4s (+16.0%)
aarch64-apple: 8556.5s -> 9801.1s (+14.5%)
pr-check-2: 2310.7s -> 2603.7s (+12.7%)
x86_64-rust-for-linux: 2770.8s -> 3119.4s (+12.6%)
x86_64-gnu-llvm-21-1: 3864.7s -> 4346.8s (+12.5%)
aarch64-gnu-llvm-20-2: 2905.4s -> 3237.2s (+11.4%)
i686-gnu-2: 5386.9s -> 5992.5s (+11.2%)
i686-gnu-nopt-1: 7516.1s -> 8283.3s (+10.2%)

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-18T22:11:56Z

Finished benchmarking commit (0a3cd3b): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.3%	[0.0%, 0.5%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -1.0%, secondary -3.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)	-	-	0
Improvements ✅ (primary)	-1.0%	[-1.0%, -1.0%]	1
Improvements ✅ (secondary)	-3.0%	[-3.0%, -3.0%]	1
All ❌✅ (primary)	-1.0%	[-1.0%, -1.0%]	1

Cycles

Results (secondary 0.1%)

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)	3.7%	[3.7%, 3.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.6%	[-3.6%, -3.6%]	1
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 474.393s -> 474.37s (-0.00%)
Artifact size: 383.23 MiB -> 383.25 MiB (0.00%)

jamie-osec and others added 17 commits January 7, 2026 14:02

Allow invoking all help options at once

adbdf8d

Add tests for invoking multiple help options at once

4909fd8

Test behavior of --help --invalid-flag

e834e60

Added mGCA tests that were resolved

c8271c1

Add crashes mGCA tests

6166b61

Explicitly list crate level attrs

fe63539

fix ICE on inconsistent import resolution with macro-attributed exter…

4d2f6a0

…n crate

Normalize type_const items even with feature generic_const_exprs

7510f74

Use find_attr instead of attr::contains_name in lower_const_item_rhs

db9f9e6

Port #![no_main] to the attribute parser.

ea77786

Rollup merge of rust-lang#151245 - list-crate-level, r=jdonszelmann

a5b6c4b

Explicitly list crate level attrs r? @jdonszelmann

Rollup merge of rust-lang#151268 - ice-inconsistent-resolution-151213…

85d2cf3

…, r=mati865 Fix ICE on inconsistent import resolution with macro-attributed extern crate Fixes rust-lang#151213 using issue_145575_hack_applied in the same way as in rust-lang#149860.

Rollup merge of rust-lang#151321 - no_main-attr, r=JonathanBrouwer

3c2c533

Port #![no_main] to the attribute parser. Tracking issue: rust-lang#131229 r? @JonathanBrouwer

rust-bors bot added the rollup A PR which is a rollup label Jan 18, 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 18, 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 18, 2026

rust-bors bot merged commit 0a3cd3b into rust-lang:main Jan 18, 2026
12 checks passed

rustbot added this to the 1.95.0 milestone Jan 18, 2026

This was referenced Jan 18, 2026

Port rustc codegen attrs #151336

Merged

add FCW to invalid #[should_panic] and #[ignore] #150416

Open

[DONT MERGE] crater run for FCW on #[should_panic] #150727

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests #151325

Rollup of 7 pull requests #151325

Uh oh!

JonathanBrouwer commented Jan 18, 2026

Uh oh!

JonathanBrouwer commented Jan 18, 2026

Uh oh!

rust-bors bot commented Jan 18, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Jan 18, 2026

Uh oh!

Uh oh!

rust-timer commented Jan 18, 2026

Uh oh!

github-actions bot commented Jan 18, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented Jan 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Rollup of 7 pull requests #151325

Rollup of 7 pull requests #151325

Uh oh!

Conversation

JonathanBrouwer commented Jan 18, 2026

Uh oh!

JonathanBrouwer commented Jan 18, 2026

Uh oh!

rust-bors bot commented Jan 18, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Jan 18, 2026

Uh oh!

Uh oh!

rust-timer commented Jan 18, 2026

Uh oh!

github-actions bot commented Jan 18, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Jan 18, 2026

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants