Skip to content

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jun 11, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 22 commits June 10, 2025 20:09
…lyContextAndPass, r=oli-obk

Remove unneeded `check_id` calls as they are already called in `visit_id` in `EarlyContextAndPass` type

Follow-up from [this message](https://github.com/rust-lang/rust/pull/142240/files#r2137474724).

Since `check_id` is already called in `visit_id` which is supposed to be called for each item with an ID, we don't need to manually call `check_id`.

r? `@oli-obk`
…import-to-execution-context, r=Kobzol

Add tracing import to execution context

In rust-lang#141909, we missed adding the trace_cmd import in the execution context module. This PR fixes that. Additionally, we are updating the mingw-check-2 check command to include BOOTSTRAP_TRACING=1 to help ensure we don't miss such cases in future PRs.

r? `@Kobzol`
…fJung

Fix enter_trace_span!() using wrong $crate paths

This is a followup to rust-lang#140972, where I made a silly mistake and forgot to update `$crate::interpret::tracing_utils::...` to `$crate::interpret::util::...` inside the macro after moving the referenced code from `tracing_utils.rs` to `util.rs`. Sorry about this.

r? `@RalfJung`
Add expectation for `{` when parsing lone coroutine qualifiers

Fixes rust-lang#80931
…ning-remove, r=RalfJung

Do not warn on `rust.incremental` when using download CI rustc

Discussed on Zulip.

r? `@RalfJung`
Improve some attribute docs and rename groups

r? `@nnethercote`

Some naming here got changed at some point, and this feels more consistent. The docs changes were a direct response to `@mejrs` trying to implement a new parsers and running into this.
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 11, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 11, 2025

📌 Commit c97dca6 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors 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 Jun 11, 2025
@bors
Copy link
Collaborator

bors commented Jun 11, 2025

⌛ Testing commit c97dca6 with merge 31d0d21...

@bors
Copy link
Collaborator

bors commented Jun 12, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 31d0d21 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2025
@bors bors merged commit 31d0d21 into rust-lang:master Jun 12, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 12, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#142305 Remove unneeded check_id calls as they are already called… e3d1f15154f9935a755af15b97f243794b75e976 (link)
#142314 remove ice group pings from triagebot.toml 7af26600d0d4c4e584c48d799f6940ce5d512e10 (link)
#142343 remove myself from the project f1256f15fc01bf583dda2e7b3d0e6f6d90deac08 (link)
#142346 Add tracing import to execution context 6f57d64feeb2a90e0ee77f5e6bd6a417bd62d5a1 (link)
#142356 Fix enter_trace_span!() using wrong $crate paths 6961153cdef3f81bb47f707e08c6650df7ce51ca (link)
#142362 Add expectation for { when parsing lone coroutine qualifi… 682c554129bdfcb248008570dc6c4c7a94dcdcce (link)
#142364 Do not warn on rust.incremental when using download CI ru… c40afc1d5a63ba2bdf8955c7488c4c850b65fd7e (link)
#142369 Improve some attribute docs and rename groups 9bd6dd418ca9c58ce90ca630a6fc790f3aed2a45 (link)
#142374 Fix missing newline trim in bootstrap d71dba44cab619b922337ef11dde810d2fbac40a (link)

previous master: e703dff8fe

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

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 e703dff (parent) -> 31d0d21 (this PR)

Test differences

Show 2 test diffs

2 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 31d0d2123d36de10c2611b842299cce5f447ddf7 --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: 6082.5s -> 6922.5s (13.8%)
  2. mingw-check-tidy: 65.9s -> 73.3s (11.1%)
  3. i686-gnu-2: 6372.3s -> 5685.3s (-10.8%)
  4. x86_64-rust-for-linux: 2945.9s -> 2648.9s (-10.1%)
  5. x86_64-apple-1: 8011.5s -> 7215.7s (-9.9%)
  6. x86_64-gnu-aux: 6674.7s -> 6016.2s (-9.9%)
  7. mingw-check-1: 1818.0s -> 1656.4s (-8.9%)
  8. aarch64-apple: 5408.5s -> 5855.4s (8.3%)
  9. aarch64-gnu-debug: 4074.1s -> 3776.6s (-7.3%)
  10. test-various: 4662.4s -> 4329.6s (-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
Copy link
Collaborator

Finished benchmarking commit (31d0d21): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -8.1%, secondary 2.6%)

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.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)
-8.1% [-8.1%, -8.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -8.1% [-8.1%, -8.1%] 1

Cycles

Results (secondary -4.2%)

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.0% [3.0%, 3.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-7.8% [-9.4%, -6.3%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 754.802s -> 754.746s (-0.01%)
Artifact size: 372.09 MiB -> 372.10 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-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.