Skip to content

Rollup of 4 pull requests - #162009

Merged
rust-bors[bot] merged 8 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-jUMremf
Aug 30, 2026
Merged

Rollup of 4 pull requests#162009
rust-bors[bot] merged 8 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-jUMremf

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

malezjaa and others added 8 commits August 29, 2026 15:32
- CoverageInfoHi       => CoverageEarlyInfo
- FunctionCoverageInfo => CoverageMirInfo
- CoverageIdsInfo      => CoverageCodegenInfo
…ethercote

Remove unneeded clone in macro deriving

Found this while looking at the parser and macro expansion. Note that `newitem` is already an owned `Box<Item>`, so there is no need to clone it.

I found a few other places where we clone unnecessarily before dropping a value, but they were all in diagnostics code and the clone was very cheap, so it isn't IMO worth the churn. None of them were detected by the `redundant_clone` Clippy lint, which is a shame - it should be more powerful!

r? nnethercote
coverage: Rename the three main coverage-info structs

This PR renames the three main structures used to carry per-function coverage info through different stages of compilation:
```text
- CoverageInfoHi       => CoverageEarlyInfo   // collected early, at the THIR/MIR boundary during MIR building
- FunctionCoverageInfo => CoverageMirInfo     // collected during the main MIR instrumentation pass
- CoverageIdsInfo      => CoverageCodegenInfo // collected during codegen, after MIR opts
```

The new names should hopefully help to keep the three structs distinct, while also avoiding the historical inconsistency of the previous names.

The renaming also resolves an old TODO of mine about `coverage_ids_info` no longer making sense as a name.

There should be no change to compiler behaviour.
Rerun `tests/debuginfo` tests if repr data has changed

Resolves rust-lang#161138

This also includes the necessary checking for GDB's data even though none exists atm (rust-lang#160377 will contain the first set). The extra handling doesn't hurt anything since we have to account for all the other tests that don't have repr data anyway.

In a followup, I can rename the `lldb_input` directory to something else (see: rust-lang#160137 (comment)). Doing so requires me to touch a bunch of other places where the name is used, so it should probably be it's own PR. Making sure the tests rerun when the data changes is higher priority though atm.

r? @jieyouxu , @Kobzol

cc @Mark-Simulacrum
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 30, 2026
@rustbot rustbot added 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 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. labels Aug 30, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

@rust-bors

rust-bors Bot commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a82ffdd 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 Aug 30, 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 Aug 30, 2026
@rust-bors

rust-bors Bot commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 7m 10s
Pushing 2e071b2 to main...

@github-actions

Copy link
Copy Markdown
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 93635a5 (parent) -> 2e071b2 (this PR)

Test differences

Show 148 test diffs

148 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 2e071b28ef7e8a066b49a179e1da753c53500c62 --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. x86_64-msvc-ext1: 1h 24m -> 2h 18m (+64.5%)
  2. x86_64-gnu-stdlib-semver-check: 10m 17s -> 16m 33s (+60.9%)
  3. x86_64-gnu-llvm-21-2: 1h 7m -> 1h 43m (+54.4%)
  4. x86_64-gnu-llvm-21-3: 1h 16m -> 1h 57m (+53.9%)
  5. i686-msvc-1: 2h 8m -> 3h 5m (+44.8%)
  6. x86_64-gnu-gcc-core-tests: 10m 15s -> 14m 50s (+44.7%)
  7. pr-check-2: 31m 50s -> 45m 6s (+41.7%)
  8. x86_64-gnu-next-trait-solver-polonius: 45m 1s -> 1h 1m (+36.2%)
  9. dist-riscv64-linux-musl: 1h 8m -> 1h 31m (+33.1%)
  10. i686-gnu-2: 1h 9m -> 1h 28m (+28.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
Copy Markdown
Collaborator

Finished benchmarking commit (2e071b2): 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.2% [-0.5%, -0.1%] 38
Improvements ✅
(secondary)
-0.7% [-2.0%, -0.1%] 36
All ❌✅ (primary) -0.2% [-0.5%, -0.1%] 38

Max RSS (memory usage)

Results (primary 1.3%, 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)
3.8% [3.8%, 3.8%] 1
Regressions ❌
(secondary)
6.7% [6.7%, 6.7%] 1
Improvements ✅
(primary)
-1.2% [-1.2%, -1.2%] 1
Improvements ✅
(secondary)
-3.0% [-3.0%, -3.0%] 1
All ❌✅ (primary) 1.3% [-1.2%, 3.8%] 2

Cycles

This perf run didn't have relevant results for this metric.

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 485.241s -> 475.013s (-2.11%)
Artifact size: 402.83 MiB -> 402.89 MiB (0.02%)

@rust-bors

rust-bors Bot commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#162004 Remove unneeded clone in macro deriving 8c101356f764f744791b3a065ba7f55f279a1269
(link)
#161902 coverage: Rename the three main coverage-info structs f63dc9960af60e05532c64c6c67e2ceb6ea2017e
(link)
#161967 Rerun tests/debuginfo tests if repr data has changed ff4dc8650b07f0b079048e1aeb8678456739aaaa
(link)
#161977 update target-cpus test d3aabd208aa4698e664cae312af369148c1bd167
(link)

parent commit: 93635a5d54

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

@JonathanBrouwer

Copy link
Copy Markdown
Member Author

Caused by #162004

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

Labels

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 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants