Skip to content

Rollup of 4 pull requests - #148245

Merged
bors merged 8 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-rudy14y
Oct 29, 2025
Merged

Rollup of 4 pull requests#148245
bors merged 8 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-rudy14y

Conversation

@matthiaskrgr

@matthiaskrgrmatthiaskrgr commented Oct 29, 2025

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

areofyland others added 8 commits October 26, 2025 19:16
Reorganize rustdoc tests into their correct subdirectories for better
categorization:
- Move lint-related tests to rustdoc-ui/lints/
- Move intra-doc link tests to rustdoc-ui/intra-doc/
- Move deref-related tests to rustdoc-ui/deref/
- Move doc-cfg test to rustdoc/doc-cfg/
This improves test organization and makes it easier to find tests
related to specific rustdoc functionality.
Slightly reword the issue prioritization and beta backport Zulip messages
…dirs, r=GuillaumeGomez
Move rustdoc tests to appropriate subdirectories
## Summary
This PR reorganizes rustdoc tests into their correct subdirectories for better categorization and maintainability.
## Changes
- Moved 6 lint-related tests to `tests/rustdoc-ui/lints/`
- Moved 2 intra-doc link tests to `tests/rustdoc-ui/intra-doc/`
- Moved 3 deref-related tests to `tests/rustdoc-ui/deref/`
- Moved 1 doc-cfg test to `tests/rustdoc/doc-cfg/`
## Tests
All moved tests have been verified and pass in their new locations.
…r=Urgau,jieyouxu
Update T-compiler/ops Zulip messages
Slightly reword the issue prioritization and beta backport Zulip messages
r? `@jieyouxu` wdyt? (we discussed together this wording)
…, r=nnethercote
Run regression test for rust-lang#147964 on next solver too
Original regression: rust-lang#147964
Longer-term tracking of issue: rust-lang#148028
For now, this just makes sure that whatever tests we keep are working the same under both the current solver and the next solver, until we decide what to do with them.
citool: Always print a signed percentage in job duration changes
I found myself confused by these percentage deltas, because it's not immediately obvious whether a change of 110% means “a little bit worse” (+10%, 110% overall) or ”more than twice as long” (+110%, 210% overall). The correct interpretation is “more than twice as long”.
Including a sign for positive percentages should hopefully make it clearer that they are relative to a baseline of ±0%, not a baseline of 100%.
Manually tested with:
```text
cargo run --manifest-path src/ci/citool/Cargo.toml post-merge-report df984edc9537a9
```
r? Kobzol
@rustbotrustbot added A-CI Area: Our Github Actions CI 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-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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Oct 29, 2025
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Oct 29, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit e677944 has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 Oct 29, 2025
@bors

bors commented Oct 29, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e677944 with merge 292db4a...

@bors

bors commented Oct 29, 2025

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 292db4a to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 29, 2025
@bors
bors merged commit 292db4a into rust-lang:masterOct 29, 2025
12 checks passed
@rustbotrustbot added this to the 1.93.0 milestone Oct 29, 2025
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#148159Move rustdoc tests to appropriate subdirectoriescdff958eaa75cddfc8ae2dc1ec05747da23bca3c (link)
#148218Update T-compiler/ops Zulip messagesf05e8954e551596872682eec47bca2f2b6c1057a (link)
#148228Run regression test for #147964 on next solver too22b9bb23787cd43e113353a847da9382014d23e4 (link)
#148237citool: Always print a signed percentage in job duration ch…62f38840fbb79537586d60b289ddceec51653c28 (link)

previous master: c6d42d774d

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
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 c6d42d7 (parent) -> 292db4a (this PR)

Test differences

Show 56 test diffs

Stage 1

  • [rustdoc] tests/rustdoc/doc-cfg/duplicate-cfg.rs: [missing] -> pass (J0)
  • [rustdoc] tests/rustdoc/duplicate-cfg.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/circular-intra-doc-link-48414.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/deref-generic.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/deref/deref-generic.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/deref/ice-blanket-impl-56701.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/deref/recursive-deref-ice.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/diagnostic-width.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/disambiguator-endswith-named-suffix.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/ice-blanket-impl-56701.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/include-str-bare-urls.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/intra-doc/circular-intra-doc-link-48414.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/lints/diagnostic-width.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/lints/include-str-bare-urls.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/lints/redundant-explicit-links-123677.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/lints/remap-path-prefix-lint.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/lints/unescaped_backticks.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/recursive-deref-ice.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/redundant-explicit-links-123677.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/remap-path-prefix-lint.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/unescaped_backticks.rs: pass -> [missing] (J0)
  • [ui] tests/ui/traits/generic-cow-inference-regression.rs: pass -> [missing] (J0)
  • [ui] tests/ui/traits/generic-cow-inference-regression.rs#new: [missing] -> pass (J0)
  • [ui] tests/ui/traits/generic-cow-inference-regression.rs#old: [missing] -> pass (J0)

Stage 2

  • [rustdoc] tests/rustdoc/doc-cfg/duplicate-cfg.rs: [missing] -> pass (J1)
  • [rustdoc] tests/rustdoc/duplicate-cfg.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/circular-intra-doc-link-48414.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/deref-generic.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/deref/deref-generic.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/deref/ice-blanket-impl-56701.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/deref/recursive-deref-ice.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/diagnostic-width.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/disambiguator-endswith-named-suffix.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/ice-blanket-impl-56701.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/include-str-bare-urls.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/intra-doc/circular-intra-doc-link-48414.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/lints/diagnostic-width.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/lints/include-str-bare-urls.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/lints/redundant-explicit-links-123677.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/lints/remap-path-prefix-lint.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/lints/unescaped_backticks.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/recursive-deref-ice.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/redundant-explicit-links-123677.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/remap-path-prefix-lint.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/unescaped_backticks.rs: pass -> [missing] (J1)
  • [ui] tests/ui/traits/generic-cow-inference-regression.rs: pass -> [missing] (J2)
  • [ui] tests/ui/traits/generic-cow-inference-regression.rs#new: [missing] -> pass (J2)
  • [ui] tests/ui/traits/generic-cow-inference-regression.rs#old: [missing] -> pass (J2)

Additionally, 2 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 292db4a13ce3f329579a581b424c6cec3b1cbd2b --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-apple: 5419.5s -> 8310.2s (+53.3%)
  2. i686-gnu-2: 6732.8s -> 5375.2s (-20.2%)
  3. tidy: 234.1s -> 187.3s (-20.0%)
  4. dist-x86_64-apple: 7055.7s -> 8342.8s (+18.2%)
  5. aarch64-gnu-llvm-20-1: 3889.7s -> 3270.9s (-15.9%)
  6. x86_64-gnu-gcc: 3643.0s -> 3104.7s (-14.8%)
  7. test-various: 6180.8s -> 7093.6s (+14.8%)
  8. x86_64-gnu-tools: 3900.9s -> 3374.5s (-13.5%)
  9. i686-gnu-nopt-1: 8426.0s -> 7346.4s (-12.8%)
  10. aarch64-gnu-llvm-20-2: 2469.2s -> 2181.9s (-11.6%)
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 (292db4a): 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.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-2.9%[-2.9%, -2.9%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-2.9%[-2.9%, -2.9%]1

Max RSS (memory usage)

Results (secondary -3.0%)

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-3.0%[-3.6%, -2.4%]2
All ❌✅ (primary)--0

Cycles

Results (primary -2.9%, secondary 0.3%)

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
2.0%[1.9%, 2.0%]2
Improvements ✅
(primary)
-2.9%[-2.9%, -2.9%]1
Improvements ✅
(secondary)
-3.2%[-3.2%, -3.2%]1
All ❌✅ (primary)-2.9%[-2.9%, -2.9%]1

Binary size

Results (primary -1.1%)

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

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-1.1%[-1.1%, -1.1%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-1.1%[-1.1%, -1.1%]1

Bootstrap: 475.179s -> 476.353s (0.25%)
Artifact size: 390.26 MiB -> 390.24 MiB (-0.01%)

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

Labels

A-CIArea: Our Github Actions CIA-metaArea: Issues & PRs about the rust-lang/rust repository itselfA-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@matthiaskrgr@bors@rust-timer@rustbot@areofyl@apiraino@clarfonthey@Zalathar