Skip to content

Rollup of 3 pull requests - #161970

Merged
rust-bors[bot] merged 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-iI05UG8
Aug 29, 2026
Merged

Rollup of 3 pull requests#161970
rust-bors[bot] merged 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-iI05UG8

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

fmease and others added 6 commits August 26, 2026 03:56
…and d0-15 register classes

Add vfp2sp and fp64 unstable target features for arm as implied features of vfp2.
…olkertdev

On arm, only require fpregs instead of vfp2 to allow s0-s15, s0-s31, and d0-15 register classes

Add vfp2sp and fp64 unstable target features for arm as implied features of vfp2.

Fixes rust-lang#159976

Fixes rust-lang#161826
Fix handling of weak keyword `pin`

Part of rust-lang#130494.

On main, we use `is_ident_named` to detect weak keyword `pin` which is incorrect since it doesn't account for whether the identifier in question is raw (`r#`) or not. Namely, `r#pin` should *never* be considered (yes, even if it's followed by the disambiguator `const` or `mut`). As it stands, (1) we accept more code than we should (2) we're prone to rightfully triggering internal assertions thus ICE'ing.

Just use `is_keyword`&co which do those checks (indeed, it's also used for weak keywords). Furthermore, move `Symbol` `sym::pin` to `kw::Pin` and officially mark it as weak. This doesn't have any semantic effect, it's still a `Symbol`, but it's more conventional.

For reference, on main we ICE with `assertion failed: self.eat_keyword(expr!(Pin))` on inputs like the following:

* `type X = &r#pin const ();` (type)
* `fn scope() { let _ = &r#pin mut (); }` (expr)
* `fn scope() { let &r#pin const (); }` (pat)

Moreover, on main we wrongfully accept code like `trait Trait { fn f(&r#pin mut self); }` (assuming the feature is enabled).

<sub>(No LLM was or will be used by me during the entire creation process of this PR)</sub>
…kruppe

Improve to_int_checked performance

Related tracking issue: rust-lang#159913.

This PR improves the performance of `to_int_checked` by pre-computing the precise bounds needed instead of arithmetic at runtime, and also avoids the extra clamping that `as` introduces by dispatching to the `unchecked` variant once the bound checks have succeeded. The precise performance improvement may depend on your machine, but the new version simply does strictly less work. E.g. on x86-64 compare the new vs old assembly for `f64 -> i32`:

```asm
new:
        vmovsd  xmm1, qword ptr [rip + .LCPI1_0]
        vcmpltsd        xmm1, xmm1, xmm0
        vcmpltsd        xmm2, xmm0, qword ptr [rip + .LCPI1_1]
        vandpd  xmm1, xmm1, xmm2
        vcvttsd2si      edx, xmm0
        vmovd   eax, xmm1
        and     eax, 1
        ret

old:
        vmovsd  xmm1, qword ptr [rip + .LCPI0_0]
        vaddsd  xmm2, xmm0, xmm1
        vcmpltsd        xmm1, xmm0, xmm1
        vmovsd  xmm3, qword ptr [rip + .LCPI0_1]
        vcmpltsd        xmm2, xmm3, xmm2
        vandpd  xmm1, xmm1, xmm2
        vmaxsd  xmm2, xmm0, qword ptr [rip + .LCPI0_2]
        vminsd  xmm2, xmm2, qword ptr [rip + .LCPI0_3]
        vcvttsd2si      eax, xmm2
        xor     edx, edx
        vucomisd        xmm0, xmm0
        cmovnp  edx, eax
        vmovd   eax, xmm1
        and     eax, 1
        ret
```
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 29, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 29, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

@rust-bors

rust-bors Bot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit a789059 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 29, 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 29, 2026
@rust-bors

rust-bors Bot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 8m 36s
Pushing ee4a4a6 to main...

@rust-bors
rust-bors Bot merged commit ee4a4a6 into rust-lang:main Aug 29, 2026
14 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Aug 29, 2026
@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 6bb812b (parent) -> ee4a4a6 (this PR)

Test differences

Show 79 test diffs

Stage 1

  • [assembly] tests/assembly-llvm/asm/arm-fpregs.rs#armv7r: [missing] -> pass (J0)
  • [assembly] tests/assembly-llvm/asm/arm-fpregs.rs#armv8r: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/pin-ergonomics/raw-ident.rs: [missing] -> pass (J1)
  • [ui] tests/ui/pin-ergonomics/raw-ident.rs: [missing] -> pass (J3)

Stage 2

  • [ui] tests/ui/pin-ergonomics/raw-ident.rs: [missing] -> pass (J2)
  • [assembly] tests/assembly-llvm/asm/arm-fpregs.rs#armv7r: [missing] -> pass (J4)
  • [assembly] tests/assembly-llvm/asm/arm-fpregs.rs#armv8r: [missing] -> pass (J4)

Additionally, 72 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 ee4a4a6dc034290215fa6955062c6f4abf6c1d53 --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-gnu-debug: 1h 22m -> 2h 11m (+60.4%)
  2. armhf-gnu: 1h 12m -> 1h 38m (+35.4%)
  3. dist-ohos-armv7: 1h 20m -> 52m 10s (-34.8%)
  4. x86_64-gnu-stable: 1h 46m -> 2h 22m (+34.7%)
  5. dist-riscv64-linux-gnu: 1h 8m -> 1h 30m (+33.3%)
  6. x86_64-gnu-distcheck: 2h 21m -> 1h 37m (-31.3%)
  7. x86_64-gnu-llvm-22-3: 1h 58m -> 1h 28m (-25.6%)
  8. dist-armv7-linux: 1h 16m -> 1h 35m (+24.1%)
  9. dist-x86_64-llvm-mingw: 2h 6m -> 1h 36m (-23.7%)
  10. x86_64-gnu-tools: 57m 30s -> 1h 10m (+22.4%)
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-bors

rust-bors Bot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#159988 On arm, only require fpregs instead of vfp2 to allow s0-s15… 4103dc24e5c55c225d25d47f67341140bd3b0518
(link)
#161794 Fix handling of weak keyword pin df5eb49be5c9a5f77d4e0672d36c201891390cbd
(link)
#161928 Improve to_int_checked performance 2627e1135992af6a8d6966a20c51cc54d6a9262f
(link)

parent commit: 6bb812b714

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 (ee4a4a6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -0.5%, secondary -0.4%)

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.5% [-0.6%, -0.5%] 2
Improvements ✅
(secondary)
-0.4% [-0.5%, -0.4%] 3
All ❌✅ (primary) -0.5% [-0.6%, -0.5%] 2

Cycles

Results (secondary -2.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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 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.2%, -0.0%] 80
Improvements ✅
(secondary)
-0.1% [-0.2%, -0.0%] 66
All ❌✅ (primary) -0.1% [-0.2%, -0.0%] 80

Bootstrap: 475.357s -> 474.438s (-0.19%)
Artifact size: 402.87 MiB -> 402.82 MiB (-0.01%)

注册 for free to join this conversation on GitHub. Already have an account? 登录 to comment

标签

A-attributes Area: Attributes (`#[…]`, `#![…]`) merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

项目

None yet

Development

Successfully merging this pull request may close these issues.

6 participants