Skip to content

Conversation

@JonathanBrouwer
Copy link
Contributor

Successful merges:

r? @ghost

Create a similar rollup

eggyal and others added 27 commits January 21, 2026 18:40
This method was broken by 258ace6, which changed `self.normalized_pos`
to use relative offsets however this method continued to compare against
an absolute offset.

Also adds a regression test for the issue that this method was
originally introduced to fix.
Handle DefKind::TraitAlias in resolve_bound_vars so that associated
item constraints and return type notation work through trait aliases.
This fixes the ICE by renaming conflicting arguments in the diagnostic.
…llot

Fix `SourceFile::normalized_byte_pos`

This method was broken by 258ace6, which changed `self.normalized_pos` to use relative offsets however this method continued to compare against an absolute offset.

Also adds a regression test for the issue that this method was originally introduced to fix.

Closes rust-lang#149568
Fixes regression of rust-lang#110885

r? cjgillot (as author of the breaking commit)
…jdonszelmann

Remove support for slugs in diagnostic messages

This PR contains 5 commits, and is best reviewed commit-by-commit:
- rust-lang@ea87331 Removes support from slugs from `rustc_errors`
- rust-lang@62dd371 Removes support from slugs from `rustc_macros` (which declares `derive(Diagnostic)`)
- rust-lang@2289e6c Adjuist the `ui-fulldeps` testsuite to match the changes in `rustc_macros`
- rust-lang@0db0acd Removes support for the fallback bundle (which previously contained all messages, but is now empty) from `rustc_driver_impl` and `rustc_session`
- rust-lang@81d4214 Removes an integration test that tested the translation system using fluent
Replace some `feature(core_intrinsics)` with stable hints

I noticed that some compiler crates use `feature(core_intrinsics)` for optimization hints, when they could potentially be using stable `std::hint` functions instead.

This PR replaces the occurrences in `rustc_arena` and `rustc_data_structures`.
…hanBrouwer

Fix a few diagnostics

When working on the inline diagnostics conversion (rust-lang#151366), I noticed that my script sometimes took the wrong message.
Because it didn't happen very often, I just fixed it manually when a uitest fails.

However I got paranoid that the script changed messages that were not covered by uitests, so I checked for all messages in the previous `messages.ftl` files, whether they occured at least once in the codebase. I found 3 messages that indeed were wrongly replaced by my script, fixed them, and added uitests to make sure this doesn't happen again :)

r? @jdonszelmann (Anyone else, also feel free to review, just assigning to Jana because she's been reviewing the other PRs)
…thercote

Cleanup offload datatransfer

There are 3 steps to run code on a GPU: Copy data from the host to the device, launch the kernel, and move it back.
At the moment, we have a single variable describing the memory handling to do in each step, but that makes it hard for LLVM's opt pass to understand what's going on. We therefore split it into three variables, each only including the bits relevant for the corresponding stage.

cc @jdoerfert @kevinsala

r? compiler
…ouwer

Port some attributes to the attr parser

Tracking issue: rust-lang#131229

r? @JonathanBrouwer
…alias, r=fmease

Fix bound var resolution for trait aliases

Fixes rust-lang#152158
Fixes rust-lang#152244
…rgau

diagnostics: fix ICE in closure signature mismatch

Fixes rust-lang#152331

Fixes an ICE where `AdjustSignatureBorrow` caused a panic because it attempted to set the `len` argument which was already defined by the parent diagnostic.

Both variants used `len` as  argument name, but can both be present in a diagnostic. They now use different names for the argument.
…ma, r=JonathanBrouwer

`cfg_select!`: allow optional comma after `{ /* ... */ }`
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Feb 8, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner labels Feb 8, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Feb 8, 2026
@JonathanBrouwer
Copy link
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 8, 2026

📌 Commit 78bd6ab 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 Feb 8, 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 Feb 8, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Feb 8, 2026

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

@rust-bors rust-bors bot merged commit 6efa357 into rust-lang:main Feb 8, 2026
12 checks passed
@rustbot rustbot added this to the 1.95.0 milestone Feb 8, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Feb 8, 2026

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 286fbe5 (parent) -> 6efa357 (this PR)

Test differences

Show 29 test diffs

Stage 0

  • tests::misformed_fluent: pass -> [missing] (J2)
  • tests::wellformed_fluent: pass -> [missing] (J2)

Stage 1

  • [ui] tests/ui/asm/normalize-offsets-for-crlf.rs: [missing] -> pass (J2)
  • [ui] tests/ui/associated-type-bounds/return-type-notation/trait-alias.rs: [missing] -> pass (J2)
  • [ui] tests/ui/associated-type-bounds/trait-alias-bound-vars.rs: [missing] -> pass (J2)
  • [ui] tests/ui/closures/closure-arg-borrow-ice-issue-152331.rs: [missing] -> pass (J2)
  • [ui] tests/ui/rust-2024/unsafe-before_exec-suggestion.rs: [missing] -> pass (J2)
  • tests::misformed_fluent: pass -> [missing] (J5)
  • tests::wellformed_fluent: pass -> [missing] (J5)

Stage 2

  • [ui] tests/ui/associated-type-bounds/trait-alias-bound-vars.rs: [missing] -> ignore (ignored if rustc wasn't built with debug assertions) (J0)
  • [ui] tests/ui/rust-2024/unsafe-before_exec-suggestion.rs: [missing] -> pass (J1)
  • [ui] tests/ui/asm/normalize-offsets-for-crlf.rs: [missing] -> ignore (only executed when the architecture is x86_64) (J3)
  • [ui] tests/ui/asm/normalize-offsets-for-crlf.rs: [missing] -> pass (J4)
  • [ui] tests/ui/associated-type-bounds/return-type-notation/trait-alias.rs: [missing] -> pass (J6)
  • [ui] tests/ui/closures/closure-arg-borrow-ice-issue-152331.rs: [missing] -> pass (J6)
  • [ui] tests/ui/asm/normalize-offsets-for-crlf.rs: [missing] -> ignore (gcc backend is not part of required backends) (J7)
  • [ui] tests/ui/associated-type-bounds/trait-alias-bound-vars.rs: [missing] -> pass (J8)
  • [ui] tests/ui/rust-2024/unsafe-before_exec-suggestion.rs: [missing] -> ignore (only executed when the target family is unix) (J9)

Additionally, 11 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 6efa357bff60d192688e02de0c78cae24a7f3a55 --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-aarch64-linux: 1h 47m -> 2h 41m (+50.3%)
  2. dist-x86_64-apple: 1h 38m -> 2h 14m (+37.1%)
  3. aarch64-msvc-1: 1h 54m -> 2h 9m (+13.3%)
  4. arm-android: 1h 43m -> 1h 32m (-10.5%)
  5. pr-check-2: 40m 54s -> 36m 49s (-10.0%)
  6. dist-apple-various: 1h 2m -> 1h 8m (+9.6%)
  7. dist-i686-msvc: 2h 8m -> 2h 18m (+7.6%)
  8. dist-sparcv9-solaris: 1h 32m -> 1h 39m (+7.6%)
  9. dist-aarch64-msvc: 1h 35m -> 1h 43m (+7.5%)
  10. i686-gnu-1: 2h 21m -> 2h 11m (-6.9%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#151455 Fix SourceFile::normalized_byte_pos a3696979d2d388e5493d4286d0c4958fde92b1f2 (link)
#151640 Cleanup offload datatransfer ba6811cfad4e86907fc66c81d719e62f5c59c108 (link)
#152212 Port some attributes to the attr parser 1d023ec046cff1a50ac5ef55709477311a9b2ddd (link)
#152250 Remove support for slugs in diagnostic messages 0fc75d282a082f76bb28d0e682f005108544c755 (link)
#152309 Fix bound var resolution for trait aliases 4289514a2ddd29cdcd9a6f5b43e3f32775904b2d (link)
#152322 Replace some feature(core_intrinsics) with stable hints d60dc9951f1323627565a54515ed98008b108e0e (link)
#152328 Fix a few diagnostics 491c2e74a22d342fa56bb67bdd93fea2bb930975 (link)
#152339 diagnostics: fix ICE in closure signature mismatch 281a57e3cf776ce6b7057c596031867f11cb0ad0 (link)
#152341 cfg_select!: allow optional comma after { /* ... */ } 6f8b588c3c7ab2fd90f2960bd0dd89f5f52df895 (link)

previous master: 286fbe5d84

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6efa357): 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 2.8%, secondary 5.5%)

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

mean range count
Regressions ❌
(primary)
2.8% [2.8%, 2.8%] 1
Regressions ❌
(secondary)
5.5% [5.5%, 5.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.8% [2.8%, 2.8%] 1

Cycles

Results (secondary 0.7%)

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

Binary size

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

Bootstrap: 473.129s -> 477.097s (0.84%)
Artifact size: 397.89 MiB -> 397.86 MiB (-0.01%)

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

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants