Skip to content

Conversation

@JonathanBrouwer
Copy link
Contributor

Successful merges:

r? @ghost

Create a similar rollup

Zalathar and others added 5 commits January 19, 2026 18:26
…anBrouwer

Port rustc codegen attrs

Tracking issue: rust-lang#131229

two more quick ones

r? @JonathanBrouwer
compiler: Temporarily re-export `assert_matches!` to reduce stabilization churn

rust-lang#137487 proposes to stabilize `feature(assert_matches)`, while simultaneously moving the `assert_matches!` and `debug_assert_matches!` macros out of the `std::assert_matches` submodule and exporting them directly from the `std` crate root instead.

Unfortunately, that moving step would cause a lot of `cfg(bootstrap)` churn and noise in the compiler, because the compiler imports and uses those macros in dozens of places.

This PR therefore aims to reduce the overall compiler churn, by temporarily adjusting the compiler to always use `assert_matches!` via a re-export from `rustc_data_structures`. That way, the stabilization itself would only need to add `cfg(bootstrap)` to that single re-export (plus the associated `#![feature(assert_matches)]` attributes), greatly reducing the immediate impact on the compiler.

Once `assert_matches!` is stable in the stage0 bootstrap compiler, we can go back and delete the re-export, and adjust the rest of the compiler to import directly from `std` instead.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Jan 19, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jan 19, 2026
@JonathanBrouwer
Copy link
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 19, 2026

📌 Commit 4004dd1 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors 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 19, 2026
@rust-bors

This comment has been minimized.

@rust-bors 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 19, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 19, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 24m 13s
Pushing d940e56 to main...

@rust-bors rust-bors bot merged commit d940e56 into rust-lang:main Jan 19, 2026
12 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Jan 19, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#151336 Port rustc codegen attrs f78dde68fe9bc528b97d3b8fcf0a00aa5a100577 (link)
#151359 compiler: Temporarily re-export assert_matches! to reduce… 9f99d793cdd44462c227a31e1da98ecbfca5ae88 (link)

previous master: 158ae9ee50

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
Copy link
Contributor

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 158ae9e (parent) -> d940e56 (this PR)

Test differences

Show 22 test diffs

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

Test dashboard

Run

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

  1. dist-apple-various: 4427.4s -> 5346.8s (+20.8%)
  2. dist-aarch64-apple: 8324.0s -> 6912.3s (-17.0%)
  3. dist-aarch64-llvm-mingw: 5879.6s -> 6644.7s (+13.0%)
  4. dist-x86_64-apple: 9351.8s -> 8296.1s (-11.3%)
  5. aarch64-gnu-llvm-20-2: 2951.4s -> 3243.8s (+9.9%)
  6. x86_64-msvc-1: 9334.2s -> 8445.1s (-9.5%)
  7. x86_64-msvc-ext1: 7683.6s -> 8375.4s (+9.0%)
  8. dist-i686-mingw: 9274.3s -> 10094.9s (+8.8%)
  9. aarch64-gnu: 7447.4s -> 8040.2s (+8.0%)
  10. aarch64-msvc-2: 5911.1s -> 6326.0s (+7.0%)
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
Copy link
Collaborator

Finished benchmarking commit (d940e56): 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)

Results (primary 0.6%, secondary -0.8%)

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

mean range count
Regressions ❌
(primary)
1.9% [1.9%, 1.9%] 1
Regressions ❌
(secondary)
3.0% [3.0%, 3.0%] 1
Improvements ✅
(primary)
-0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)
-2.6% [-4.0%, -1.3%] 2
All ❌✅ (primary) 0.6% [-0.6%, 1.9%] 2

Cycles

Results (secondary -1.8%)

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

Binary size

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

Bootstrap: 474.261s -> 473.058s (-0.25%)
Artifact size: 383.28 MiB -> 383.29 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants