Skip to content

Rollup of 6 pull requests#156870

Merged
rust-bors[bot] merged 25 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-PbM4nVA
May 24, 2026
Merged

Rollup of 6 pull requests#156870
rust-bors[bot] merged 25 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-PbM4nVA

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

fallofpheonix and others added 25 commits May 20, 2026 14:20
`reborrow_info` validates that all data fields of a struct implementing
`Reborrow` are either `Copy` or themselves `Reborrow`. When a field
implementing `Reborrow` was found, the loop returned `Ok(())` immediately,
so any remaining fields were never validated. This let a struct whose
first data field is `Reborrow` and whose second field is neither `Copy`
nor `Reborrow` incorrectly implement `Reborrow`.

Change the early `return Ok(())` to `continue` so every field is checked.
When a float literal ended with a dot, `float_literal_f32_fallback`
should not include it in its suggestion.
… r=jieyouxu

Use print instead of po in debuginfo path test

Fixes rust-lang#156660

This fixes `tests/debuginfo/path.rs` failing on newer Apple LLDB versions.

Root cause:
Apple LLDB 2100 reports missing Rust language plugin support:

warning: `po` was unsuccessful, running `p` instead

As a result, `po` falls back to `p`, producing expanded output that no longer matches the existing `lldb-check` directives.

Changes:
- replace `po` with `print`
- relax `lldb-check` expectations using `[...]`
- preserve validation of the displayed path value

This also aligns `path.rs` with the rest of the debuginfo tests, as it appears to be the only test using `po`.

---

EDIT(@jieyouxu): see digging rust-lang#156769 (comment)
…dingxiangfei2009

Fix reborrow_info early return skipping field validation

`reborrow_info` validates that all data fields of a struct implementing `Reborrow` are either `Copy` or themselves `Reborrow`. When iterating the fields, finding a `Reborrow` field returned `Ok(())` immediately, so any remaining fields were never validated. This let a struct with a non-`Copy`, non-`Reborrow` second field implement `Reborrow`.

Changing the early `return Ok(())` to `continue` makes the loop validate every field.

Tracking issue: rust-lang#145612
…f32_fallback-suggestion, r=Kivooeo

float_literal_f32_fallback: Don't suggest invalid code

When a float literal ended with a dot, `float_literal_f32_fallback` should not include it in its suggestion, as that would result in invalid syntax ([playgound](https://play.rust-lang.org/?version=nightly&mode=debug&edition=2024&gist=de47274bf2b07070b79a97ce6744ffcbO)):

```
2 |     let _: f32 = From::from(0.);
  |                             ^^ help: explicitly specify the type as `f32`: `0._f32`
```

Relevant tracking issue: rust-lang#154024
…=SimonSapin

Add unstable Share trait

Tracking issue: rust-lang#156756

This adds an initial unstable `Share` trait for clone-as-alias types, as part of the 2026 ergonomic ref-counting project goal.

```rust
pub trait Share: Clone {
    fn share(&self) -> Self {
        Clone::clone(self)
    }
}
```

This PR adds a separate unstable feature gate:

```rust
#![feature(share_trait)]
```

and places the trait next to `Clone` in `core::clone`.

Implemented initial impls:

- `impl<T: ?Sized> Share for &T`
- `impl<T: ?Sized, A: Allocator + Clone> Share for Rc<T, A>`
- `impl<T: ?Sized, A: Allocator + Clone> Share for Arc<T, A>`
- `impl<T> Share for std::sync::mpsc::Sender<T>`
- `impl<T> Share for std::sync::mpsc::SyncSender<T>`

The PR deliberately does not add `Share` to the prelude.

r? @nikomatsakis
@rustbot label F-ergonomic_clones
Add `#[doc(alias = "phi")]` for float `GOLDEN_RATIO` constants

- Adds "phi" doc alias for `f16`, `f32`, `f64`, and `f128`

I knew this constant was stabilized but I couldn't remember what it was called.
Searching "phi" in the docs only surfaces the π constant, `is_ascii_graphic`, and `spin_loop_hint` methods. This alias would make it much easier to find.
https://doc.rust-lang.org/nightly/std/?search=phi
…lmap, r=jieyouxu

Fix Pieter-Louis Schoeman mailmap entry

I'm listed twice on thanks.rust-lang
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 24, 2026
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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 May 24, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 24, 2026

📌 Commit 2843641 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 May 24, 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 May 24, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 24, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 17m 16s
Pushing 06b13d5 to main...

@rust-bors rust-bors Bot merged commit 06b13d5 into rust-lang:main May 24, 2026
12 checks passed
@rustbot rustbot added this to the 1.98.0 milestone May 24, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#156769 Use print instead of po in debuginfo path test 08eaf7fcc251e396ca9912f93b04214a990875a9 (link)
#156784 Fix reborrow_info early return skipping field validation e9ba107ed7f7ff3111f7c1cafc483d8baf02eac5 (link)
#156827 float_literal_f32_fallback: Don't suggest invalid code cc0893d9f215317837853341e158e9f0c2806a7a (link)
#156828 Add unstable Share trait 22efb079344c6a5fb710849435803f30f2259b62 (link)
#156830 Add #[doc(alias = "phi")] for float GOLDEN_RATIO consta… 5082ba83945e72ebf47f5f1787125c1d44ae7bc7 (link)
#156860 Fix Pieter-Louis Schoeman mailmap entry c92e2f3d0fea403b676e622a6b4a75df2a649d20 (link)

previous master: e1ff77d898

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 e1ff77d (parent) -> 06b13d5 (this PR)

Test differences

Show 1356 test diffs

Stage 1

  • [ui] tests/ui/reborrow/reborrow_multi_field_validation.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait-arc.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait-mpsc-sender.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait-mpsc-sync-sender.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait-no-feature.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait-non-implementors.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait-not-in-prelude.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait-rc.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait-requires-clone.rs: [missing] -> pass (J0)
  • [ui] tests/ui/share-trait/share-trait.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/reborrow/reborrow_multi_field_validation.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait-arc.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait-mpsc-sender.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait-mpsc-sync-sender.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait-no-feature.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait-non-implementors.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait-not-in-prelude.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait-rc.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait-requires-clone.rs: [missing] -> pass (J1)
  • [ui] tests/ui/share-trait/share-trait.rs: [missing] -> pass (J1)

Additionally, 1336 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 06b13d50ca813d84d93fcddbaaef069011b16fbb --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-i686-mingw: 1h 37m -> 2h 17m (+40.5%)
  2. dist-aarch64-linux: 1h 49m -> 2h 33m (+40.2%)
  3. dist-powerpc64-linux-gnu: 1h 30m -> 1h 53m (+26.3%)
  4. i686-gnu-2: 1h 10m -> 1h 29m (+25.5%)
  5. x86_64-gnu-aux: 1h 41m -> 2h 6m (+25.3%)
  6. dist-i686-linux: 1h 27m -> 1h 49m (+24.5%)
  7. dist-x86_64-solaris: 1h 37m -> 1h 14m (-22.9%)
  8. armhf-gnu: 1h 17m -> 1h 28m (+14.5%)
  9. dist-various-2: 50m 41s -> 43m 24s (-14.4%)
  10. i686-gnu-nopt-1: 2h 4m -> 2h 18m (+10.7%)
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 (06b13d5): comparison URL.

Overall result: ❌ regressions - 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.1% [0.1%, 0.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.8%, secondary 5.5%)

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

mean range count
Regressions ❌
(primary)
5.3% [5.3%, 5.3%] 1
Regressions ❌
(secondary)
5.5% [5.5%, 5.5%] 1
Improvements ✅
(primary)
-1.6% [-1.6%, -1.6%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.8% [-1.6%, 5.3%] 2

Cycles

Results (secondary -5.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)
4.9% [4.9%, 4.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-8.5% [-11.4%, -6.9%] 3
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 511.791s -> 509.286s (-0.49%)
Artifact size: 400.68 MiB -> 400.66 MiB (-0.00%)

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

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants