Skip to content

Rollup of 15 pull requests - #146468

Merged
bors merged 42 commits into
rust-lang:masterfrom
Zalathar:rollup-6u3s44d
Sep 12, 2025
Merged

Rollup of 15 pull requests#146468
bors merged 42 commits into
rust-lang:masterfrom
Zalathar:rollup-6u3s44d

Conversation

@Zalathar

@ZalatharZalathar commented Sep 12, 2025

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

folkertdevand others added 30 commits September 3, 2025 00:19
This fixes
```
error: unused import: `str`
--> library/std/src/sys/pal/hermit/os.rs:6:22
|
6 | use crate::{fmt, io, str};
| ^^^
|
= note: `-D unused-imports` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(unused_imports)]`
```
This was caused by 845311a.
Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>
Co-authored-by: Ralf Jung <post@ralfj.de>
These "you are using $RUSTC_VERSION" help messages were removed in
rust-lang#142943, but rust-lang#142681 started before that and
merged later, so its normalization is vestigial.
match clang's `va_arg` assembly on arm targets
tracking issue: rust-lang#44930
For this example
```rust
#![feature(c_variadic)]
#[unsafe(no_mangle)]
unsafe extern "C" fn variadic(a: f64, mut args: ...) -> f64 {
let b = args.arg::<f64>();
let c = args.arg::<f64>();
a + b + c
}
```
We currently generate (via llvm):
```asm
variadic:
sub sp, sp, rust-lang#12
stmib sp, {r2, r3}
vmov d0, r0, r1
add r0, sp, rust-lang#4
vldr d1, [sp, rust-lang#4]
add r0, r0, rust-lang#15
bic r0, r0, rust-lang#7
vadd.f64 d0, d0, d1
add r1, r0, rust-lang#8
str r1, [sp]
vldr d1, [r0]
vadd.f64 d0, d0, d1
vmov r0, r1, d0
add sp, sp, rust-lang#12
bx lr
```
LLVM is not doing a good job. In fact, it's well-known that LLVM's implementation of `va_arg` is kind of bad, and we implement it ourselves (based on clang) for many targets already. For arm, our own `emit_ptr_va_arg` saves 3 instructions.
Next, it turns out it's important for LLVM to explicitly start and end the lifetime of the `va_list`. In rust-lang#146059 I already end the lifetime, but when looking at this again, I noticed that it is important to also start it, see https://godbolt.org/z/EGqvKTTsK: failing to explicitly start the lifetime uses an extra register.
So, the combination of `emit_ptr_va_arg` with starting/ending the lifetime makes rustc emit exactly the instructions that clang generates::
```asm
variadic:
sub sp, sp, rust-lang#12
stmib sp, {r2, r3}
vmov d16, r0, r1
vldr d17, [sp, rust-lang#4]
vadd.f64 d16, d16, d17
vldr d17, [sp, rust-lang#12]
vadd.f64 d16, d16, d17
vmov r0, r1, d16
add sp, sp, rust-lang#12
bx lr
```
The arguments to `emit_ptr_va_arg` are based on [the clang implementation](https://github.com/llvm/llvm-project/blob/03dc2a41f3d9a500e47b513de5c5008c06860d65/clang/lib/CodeGen/Targets/ARM.cpp#L798-L844).
r? ``@workingjubilee`` (I can re-roll if your queue is too full, but you do seem like the right person here)
try-job: armhf-gnu
thread parking: fix docs and examples
Fixesrust-lang#145816
r? ```@joboet```
Cc ```@m-ou-se``` ```@Amanieu```
…=jackh726
support integer literals in `${concat()}`
Tracking issue: rust-lang#124225
Adds support for using integer literals as arguments to `${concat()}` macro expressions.
Integer formatting such as `1_000` is preserved by this.
…r=GuillaumeGomez
Change the default value of `gcc.download-ci-gcc` to `true`
It makes sense for the vast majority of uses (rust-lang/rustc-dev-guide#2587 (comment)).
r? ```@GuillaumeGomez```
…r=RalfJung
fix cfg for poison test macro
Fixes test regression in rust-lang#144648
Continuation of rust-lang#146433
I think this is right? Not really sure how to test this myself to be honest.
r? ```@RalfJung```
I'll also leave the improvement to the test macro for a separate PR (described [here](rust-lang#146433 (comment))) since I've never done something like that before. Though since this fixes all of the tests, it might not be necessary since anyone in the future will see the `cfg()` and not `cfg_attr()`?
…paths, r=lolbinarycat
[rustdoc] Correctly handle literal search on paths
Fixesrust-lang#146129.
cc ```@notriddle```
r? ```@lolbinarycat```
…eGomez
Fix `libgccjit` symlink when we build GCC locally
Unblocks rust-lang#146414.
r? ```@GuillaumeGomez```
test: remove an outdated normalization for rustc versions
These "you are using $RUSTC_VERSION" help messages were removed in
rust-lang#142943, but rust-lang#142681 started before that and
merged later, so its normalization is vestigial.
@rustbotrustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustdoc-search Area: Rustdoc's search feature A-tidy Area: The tidy tool O-hermit Operating System: Hermit 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-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. rollup A PR which is a rollup labels Sep 12, 2025
@Zalathar

Copy link
Copy Markdown
MemberAuthor

Subset of #146462.

@bors r+ rollup=never p=5

@bors

bors commented Sep 12, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit be33ef2 has been approved by Zalathar

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 Sep 12, 2025
@bors

bors commented Sep 12, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit be33ef2 with merge 408eacf...

@bors

bors commented Sep 12, 2025

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 408eacf to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 12, 2025
@bors
bors merged commit 408eacf into rust-lang:masterSep 12, 2025
11 checks passed
@rustbotrustbot added this to the 1.91.0 milestone Sep 12, 2025
@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 ac4495a (parent) -> 408eacf (this PR)

Test differences

Show 72 test diffs

Stage 1

  • [assembly] tests/assembly-llvm/c-variadic-arm.rs: [missing] -> ignore (only executed when the architecture is arm) (J0)
  • [codegen] tests/codegen-llvm/c-variadic-lifetime.rs: [missing] -> pass (J0)
  • [rustdoc-js] tests/rustdoc-js/literal-path.rs: [missing] -> pass (J0)

Stage 2

  • [rustdoc-js] tests/rustdoc-js/literal-path.rs: [missing] -> pass (J1)
  • [codegen] tests/codegen-llvm/c-variadic-lifetime.rs: [missing] -> pass (J2)
  • [assembly] tests/assembly-llvm/c-variadic-arm.rs: [missing] -> pass (J3)
  • [assembly] tests/assembly-llvm/c-variadic-arm.rs: [missing] -> ignore (only executed when the architecture is arm) (J4)
  • [assembly] tests/assembly-llvm/c-variadic-arm.rs: [missing] -> ignore (ignored when the operating system is android) (J5)

Additionally, 64 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 408eacfb95ea19e248c0fe5e377980bc00682c1b --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-msvc-2: 5311.6s -> 4804.2s (-9.6%)
  2. aarch64-apple: 6117.5s -> 6651.0s (8.7%)
  3. dist-x86_64-mingw: 8469.9s -> 9126.6s (7.8%)
  4. dist-aarch64-msvc: 5529.9s -> 5955.9s (7.7%)
  5. dist-apple-various: 3995.4s -> 4272.6s (6.9%)
  6. x86_64-mingw-1: 10546.8s -> 9861.5s (-6.5%)
  7. x86_64-gnu-llvm-19-3: 6140.5s -> 6521.6s (6.2%)
  8. dist-x86_64-netbsd: 5064.0s -> 4760.9s (-6.0%)
  9. dist-ohos-armv7: 4178.5s -> 3942.6s (-5.6%)
  10. x86_64-gnu-llvm-20-3: 6197.2s -> 6538.6s (5.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
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#144549match clang's va_arg assembly on arm targets9e866f9502dd7c1b1c26f758b53a180a798294eb (link)
#145895thread parking: fix docs and examples49cd298c07961aee373ff548f3872e07594aa154 (link)
#146308support integer literals in ${concat()}d1fbb282d4a4d7948c7d8a6bf0aa122048c3fcfd (link)
#146323check before test for hardware capabilites in bits 32~63 of…65abf0dfbed93964f6283712a3d7172ebb1e5256 (link)
#146332tidy: make behavior of extra-checks more uniformfb7722dfe26fbab5f594e93d114fea2e1600d752 (link)
#146374Update browser-ui-test version to 0.22.2ac15edbb5fe39c168a5e453d61867a7fead7cbf3 (link)
#146413Improve suggestion in case a bare URL is surrounded by brac…1e944555c96af0c61453e952d174b26fc3c3a5d5 (link)
#146426Bump miow to 0.60.1af1d623ea01578836ca941e46bd97e3e9f4a4e9f (link)
#146432Implement Socket::take_error for Hermit5e73b9f024f3d75fe10f7c38b0fe1f8f2c16166b (link)
#146433rwlock tests: fix miri macos test regression17cb86865d78b973230fde1403e91d524913f3b9 (link)
#146435Change the default value of gcc.download-ci-gcc to truedb6235d4135778761753e2c4122e300d35332737 (link)
#146439fix cfg for poison test macro0666236ec34460b58f331468d659e0ec56639e12 (link)
#146448[rustdoc] Correctly handle literal search on pathsc0b12c4b6ba382f46b0307db38fe78aa4c4b962f (link)
#146449Fix libgccjit symlink when we build GCC locallye5ef98e608f09e5add0d8ea0f99a75753446a7b8 (link)
#146455test: remove an outdated normalization for rustc versions5eec7394cdabc52650aaa954abe69999d481883a (link)

previous master: ac4495a10d

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
Copy Markdown
Collaborator

Finished benchmarking commit (408eacf): comparison URL.

Overall result: ❌✅ regressions and 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.3%[0.3%, 0.3%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-0.5%[-0.8%, -0.2%]2
All ❌✅ (primary)--0

Max RSS (memory usage)

Results (secondary 0.1%)

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

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

Cycles

Results (secondary 4.7%)

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

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

Binary size

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

Bootstrap: 465.228s -> 468.519s (0.71%)
Artifact size: 387.86 MiB -> 387.84 MiB (-0.00%)

@Zalathar
Zalathar deleted the rollup-6u3s44d branch September 13, 2025 02:49
github-actionsBot pushed a commit to model-checking/verify-rust-std that referenced this pull request Oct 9, 2025
Rollup of 15 pull requests
Successful merges:
- rust-lang#144549 (match clang's `va_arg` assembly on arm targets)
- rust-lang#145895 (thread parking: fix docs and examples)
- rust-lang#146308 (support integer literals in `${concat()}`)
- rust-lang#146323 (check before test for hardware capabilites in bits 32~63 of usize)
- rust-lang#146332 (tidy: make behavior of extra-checks more uniform)
- rust-lang#146374 (Update `browser-ui-test` version to `0.22.2`)
- rust-lang#146413 (Improve suggestion in case a bare URL is surrounded by brackets)
- rust-lang#146426 (Bump miow to 0.60.1)
- rust-lang#146432 (Implement `Socket::take_error` for Hermit)
- rust-lang#146433 (rwlock tests: fix miri macos test regression)
- rust-lang#146435 (Change the default value of `gcc.download-ci-gcc` to `true`)
- rust-lang#146439 (fix cfg for poison test macro)
- rust-lang#146448 ([rustdoc] Correctly handle literal search on paths)
- rust-lang#146449 (Fix `libgccjit` symlink when we build GCC locally)
- rust-lang#146455 (test: remove an outdated normalization for rustc versions)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.A-rustdoc-searchArea: Rustdoc's search featureA-tidyArea: The tidy toolmerged-by-borsThis PR was explicitly merged by bors.O-hermitOperating System: HermitrollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library 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.

15 participants

@Zalathar@bors@rust-timer@rustbot@folkertdev@RalfJung@cyrgani@h3fang@lolbinarycat@GuillaumeGomez@dpaoliello@mkroening@Kobzol@connortsui20@cuviper