Skip to content

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Dec 21, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fmease and others added 24 commits November 26, 2025 04:57
Fixes library linking issues where libgcc_s was incorrectly being linked
instead of the appropriate LLVM runtime libraries for Hexagon targets.

* Set llvm-libunwind as default for all hexagon targets in bootstrap
* Exclude hexagon from automatic libgcc_s linking in unwind
* Enable libunwind.a copying for hexagon targets
* Remove manual library linking from hexagon target specification
If we convert the minimum length to `u64` up-front when creating
`TestableCase::Slice`, we can avoid more conversions to `u64` later.
This was accidentally added to the prelude in
3f4dc1e.
Don't strip shebang in expr-ctxt `include!(…)`

No longer strip shebang interpreter directives in files that were `include`d in expression (statement) contexts.
…=Mark-Simulacrum

Add const default for OnceCell and OnceLock

cc rust-lang#143894
…mulacrum

miri: add -Zbinary-dep-depinfo to dependency builds

Hopefully fixes rust-lang#149711

Cc ````@bjorn3````
…-Simulacrum

Enable llvm-libunwind by default for Hexagon targets

Fixes library linking issues where libgcc_s was incorrectly being linked instead of the appropriate LLVM runtime libraries for Hexagon targets.

* Set llvm-libunwind as default for all hexagon targets in bootstrap
* Exclude hexagon from automatic libgcc_s linking in unwind
* Enable libunwind.a copying for hexagon targets
* Remove manual library linking from hexagon target specification
fix docustring on fetch_or

The documentation had the same example twice in a row, but I think this was the intended second example.
tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case

Closes rust-lang#50280 which just **E-needs-test**.  See rust-lang#50280 (comment) for a bisect of the fix.

The issue description is quite vague, so in the test I am linking directly to the most descriptive comment rust-lang#50280 (comment).
mir_build: Use the same length type for `TestableCase::Slice` and `TestKind::Len`

If we convert the minimum length to `u64` up-front when creating `TestableCase::Slice`, we can avoid more conversions to `u64` later.

There should be no change to compiler behaviour.
…reexport, r=GuillaumeGomez

[rustdoc] Add missing close tags in extern crate reexports

Fixes rust-lang#150176
change non-canonical clone impl to {*self}, fix some doc comments
…om-prelude, r=jdonszelmann

Drop the From derive macro from the v1 prelude

This was accidentally added to the prelude in 3f4dc1e.

Fixes: rust-lang#150165

r? `````@jdonszelmann`````
@rustbot rustbot added 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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library 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 Dec 21, 2025
@rustbot rustbot added 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 Dec 21, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Dec 21, 2025

📌 Commit c91cbcd 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 Dec 21, 2025
@bors
Copy link
Collaborator

bors commented Dec 21, 2025

⌛ Testing commit c91cbcd with merge 542c040...

bors added a commit that referenced this pull request Dec 21, 2025
Rollup of 11 pull requests

Successful merges:

 - #146377 (Don't strip shebang in expr-ctxt `include!(…)`)
 - #149812 (Add const default for OnceCell and OnceLock)
 - #149882 (miri: add -Zbinary-dep-depinfo to dependency builds)
 - #150009 (Enable llvm-libunwind by default for Hexagon targets)
 - #150035 (fix docustring on fetch_or)
 - #150082 (tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case)
 - #150160 (Fix ICE (#149980) for invalid EII in statement position)
 - #150184 (mir_build: Use the same length type for `TestableCase::Slice` and `TestKind::Len`)
 - #150185 ([rustdoc] Add missing close tags in extern crate reexports)
 - #150191 (change non-canonical clone impl to {*self}, fix some doc comments)
 - #150203 (Drop the From derive macro from the v1 prelude)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member Author

looks like auto - dist-x86_64-linux is stuck, running since 4h 45m now :/

@matthiaskrgr
Copy link
Member Author

@bors retry r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 21, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 21, 2025

📌 Commit c91cbcd 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 21, 2025
@bors
Copy link
Collaborator

bors commented Dec 22, 2025

⌛ Testing commit c91cbcd with merge acfd264...

@bors
Copy link
Collaborator

bors commented Dec 22, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing acfd264 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 22, 2025
@bors bors merged commit acfd264 into rust-lang:main Dec 22, 2025
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 22, 2025
@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 f41f404 (parent) -> acfd264 (this PR)

Test differences

Show 23 test diffs

Stage 1

  • [rustdoc] tests/rustdoc/extern/pub-extern-crate-150176.rs: [missing] -> pass (J1)
  • [ui] tests/ui/eii/error_statement_position.rs: [missing] -> pass (J1)
  • [ui] tests/ui/include-macros/shebang-in-expr-ctxt.rs: [missing] -> pass (J1)
  • [ui] tests/ui/include-macros/shebang-in-item-ctxt.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/eii/error_statement_position.rs: [missing] -> pass (J0)
  • [ui] tests/ui/include-macros/shebang-in-expr-ctxt.rs: [missing] -> pass (J0)
  • [ui] tests/ui/include-macros/shebang-in-item-ctxt.rs: [missing] -> pass (J0)
  • [rustdoc] tests/rustdoc/extern/pub-extern-crate-150176.rs: [missing] -> pass (J2)

Additionally, 15 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 acfd264f4df23b15cf27a15a85f76ed61977b48a --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. aarch64-apple: 10225.6s -> 17414.3s (+70.3%)
  2. dist-apple-various: 3962.3s -> 4528.6s (+14.3%)
  3. x86_64-gnu-llvm-20-2: 5361.9s -> 5982.9s (+11.6%)
  4. x86_64-msvc-1: 8336.7s -> 9236.6s (+10.8%)
  5. dist-aarch64-apple: 6258.5s -> 5610.5s (-10.4%)
  6. test-various: 7456.3s -> 6716.2s (-9.9%)
  7. x86_64-gnu-llvm-20: 4372.6s -> 4797.1s (+9.7%)
  8. aarch64-msvc-2: 5782.2s -> 6317.0s (+9.2%)
  9. dist-aarch64-llvm-mingw: 5869.6s -> 6404.3s (+9.1%)
  10. dist-android: 1519.7s -> 1649.6s (+8.5%)
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
#146377 Don't strip shebang in expr-ctxt include!(…) e4a253908015c035807479543ea9ec927b4f75d1 (link)
#149812 Add const default for OnceCell and OnceLock 0e6256095ca8fe90ab2f66f2f75b160a6cf81f52 (link)
#149882 miri: add -Zbinary-dep-depinfo to dependency builds e03f2f436a1f5762ed75c0f58b92d288d4764aea (link)
#150009 Enable llvm-libunwind by default for Hexagon targets 3c54156c4f3e2137d7bd6c45c177cbe2a18308ab (link)
#150035 fix docustring on fetch_or 031372a14d7630a2fe3ec0abf6218cdd66334220 (link)
#150082 tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer c… 3ab1abf528da2d2f0974d3a3784cde5dc16d5ab7 (link)
#150160 Fix ICE (#149980) for invalid EII in statement position c07058bf174c0f91600c50c76b23459541263ea3 (link)
#150184 mir_build: Use the same length type for `TestableCase::Slic… f22c5cb53ad612e88f14677c3fe2df3217ff7295 (link)
#150185 [rustdoc] Add missing close tags in extern crate reexports a62280c580fa84fb1e7971e5bc3b6a2d59a9135f (link)
#150191 change non-canonical clone impl to {*self}, fix some doc co… fe67d3d052f676b2b05d60b3b8d0600d1a9a50d5 (link)
#150203 Drop the From derive macro from the v1 prelude e9c4b5eb7b85c6171cfd302455fd552a033d0912 (link)

previous master: f41f40408d

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 (acfd264): 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.5%, 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)
8.9% [8.9%, 8.9%] 1
Regressions ❌
(secondary)
3.2% [3.2%, 3.2%] 1
Improvements ✅
(primary)
-3.9% [-3.9%, -3.9%] 1
Improvements ✅
(secondary)
-1.6% [-1.6%, -1.6%] 1
All ❌✅ (primary) 2.5% [-3.9%, 8.9%] 2

Cycles

Results (secondary -3.3%)

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

Binary size

Results (primary -0.1%, secondary -0.1%)

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)
- - 0
Improvements ✅
(primary)
-0.1% [-0.1%, -0.0%] 36
Improvements ✅
(secondary)
-0.1% [-0.1%, -0.0%] 24
All ❌✅ (primary) -0.1% [-0.1%, -0.0%] 36

Bootstrap: 479.466s -> 480.152s (0.14%)
Artifact size: 390.63 MiB -> 390.54 MiB (-0.02%)

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

Labels

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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.