Skip to content

Rollup of 4 pull requests #141529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
May 25, 2025
Merged

Rollup of 4 pull requests #141529

merged 17 commits into from
May 25, 2025

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented May 25, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

clubby789 and others added 17 commits May 12, 2025 14:49
this is because the mobile sidebar cannot be resized,
unlike on desktop.
…tence

As inspired by the equivalent methods from other collection types.

Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
…alue`

A minor change, but it seemed interesting to unify this one's
description, especially considering all the other equivalents use
`element` as well.

Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
…owing ones

This also seems like a small mistake: the first main sentence is put in
the same paragraph as the other two following ones while other
equivalents all have it split. Therefore, do the same here.

Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
Also fixes `HashSet`'s that incorrectly designated itself as a `list`.

Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
Take the one from `BTreeMap` that seems the best-worded and most
precise among the available variations.

Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
Make it consistent in this regard with `BTreeMap`'s.

Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>
stuff like "clicking the settings menu closes the mobile sidebar"
is now impossible for users to observe, since the mobile sidebar
will always cover the settings menu due to being full-width,
which is good because that behavior is also now impossible for
our testing framework to observe.
…r, r=GuillaumeGomez

rustdoc: on mobile, make the sidebar full width and linewrap

this is because the mobile sidebar cannot be resized, unlike on desktop.
…-Simulacrum

More option optimization tests

I noticed that although adding a manual implementation for PartialOrd on Option in rust-lang#122024, I didn't add a test so that we can easily check if this behavior has improved.

This also adds a couple of `should-fail` tests - this will allow us to remove these hacky implementations if upstream LLVM improves.
…ark-Simulacrum

Docs(lib): Fix `extract_if` docs

Various fixes to the documentation comments of the several `extract_if` collection methods available. It originally started with a small typo fix in `Vec`'s spotted when reading the 1.87 release notes, but then by looking at the others' for comparison in order to try determining what was the intended sentence, some inconsistencies were spotted. Therefore, some other changes are also proposed here to reduce these avoidable differences, going more and more nit-picky along the way. See the individual commits for more details about each change.

`@rustbot` label T-libs A-collections A-docs
…ubilee

use `cfg_select!` to select the right `VaListImpl` definition

tracking issue: rust-lang#44930

Just a bit of cleanup really.

We could use `PhantomInvariantLifetime<'f>` (rust-lang#135806) to make it more precise what that `PhantomData<&'f mut &'f c_void>` marker is doing. I'm not sure how ready that feature is though, `@jhpratt` are these types good to use internally?

---

Some research into the lifetimes of `VaList` and `VaListImpl`:

It's easy to see why the lifetime of these types should not be extended, a `VaList` or `VaListImpl` escaping its function is a bad idea. I don't currently see why coercing the lifetime to a shorter lifetime is problematic though, but probably I just don't understand variance well enough to see it. The history does not provide much explanation:

- immunant@0814087 original implementation
- immunant@b9ea653 adds `VaListImpl<'f>`, but it is only covariant in `'f`
- rust-lang#62639 makes `VaListImpl<'f>` invariant over `'f` (because `VaList<'a, 'f>` is already invariant over `'f`, but I think that is just an implementation detail?)

Beyond that I don't see how the lifetime situation can be simplified significantly, e.g. this function really needs `'copy` to be unconstrained.

```rust
/// Copies the `va_list` at the current location.
pub unsafe fn with_copy<F, R>(&self, f: F) -> R
where
    F: for<'copy> FnOnce(VaList<'copy, 'f>) -> R,
{
    let mut ap = self.clone();
    let ret = f(ap.as_va_list());
    // SAFETY: the caller must uphold the safety contract for `va_end`.
    unsafe {
        va_end(&mut ap);
    }
    ret
}
```

`@rustbot` label +F-c_variadic
r? `@workingjubilee`
@rustbot rustbot added 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. 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 May 25, 2025
@jhpratt
Copy link
Member Author

jhpratt commented May 25, 2025

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented May 25, 2025

📌 Commit c27b7c2 has been approved by jhpratt

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 May 25, 2025
@bors
Copy link
Collaborator

bors commented May 25, 2025

⌛ Testing commit c27b7c2 with merge aa57e46...

@bors
Copy link
Collaborator

bors commented May 25, 2025

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing aa57e46 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 25, 2025
@bors bors merged commit aa57e46 into rust-lang:master May 25, 2025
7 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 25, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#139831 rustdoc: on mobile, make the sidebar full width and linewrap 1ad0f76740de36bc750699ccb43448b88abd36f7 (link)
#140950 More option optimization tests 71a2064428a11ab73b2182686482a833455fbdc8 (link)
#141108 Docs(lib): Fix extract_if docs 3e70d7a9f874afe061764f57346442e946c14f52 (link)
#141361 use cfg_select! to select the right VaListImpl definiti… f7443a8e5ddf3618e3b7a594e50e2e3236d1b9ba (link)

previous master: 3d86494a0d

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Copy link

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 3d86494 (parent) -> aa57e46 (this PR)

Test differences

Show 94 test diffs

Stage 1

  • [codegen] tests/codegen/option-niche-eq.rs: pass -> ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) (J1)
  • [codegen] tests/codegen/option-niche-unfixed/option-bool-eq.rs: [missing] -> pass (J2)
  • [codegen] tests/codegen/option-niche-unfixed/option-nonzero-eq.rs: [missing] -> pass (J2)

Stage 2

  • [codegen] tests/codegen/option-niche-eq.rs: pass -> ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) (J0)
  • [codegen] tests/codegen/option-niche-unfixed/option-bool-eq.rs: [missing] -> pass (J3)
  • [codegen] tests/codegen/option-niche-unfixed/option-nonzero-eq.rs: [missing] -> pass (J3)

Additionally, 88 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 aa57e46e24a4a08cc336325e92567b40b0c2ba62 --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-linux: 5561.0s -> 8568.4s (54.1%)
  2. aarch64-gnu: 6464.4s -> 7784.1s (20.4%)
  3. x86_64-apple-1: 9079.7s -> 7811.3s (-14.0%)
  4. aarch64-gnu-debug: 4118.8s -> 4592.8s (11.5%)
  5. mingw-check: 1170.8s -> 1265.9s (8.1%)
  6. dist-aarch64-apple: 5089.7s -> 4678.9s (-8.1%)
  7. dist-x86_64-apple: 8504.5s -> 7879.4s (-7.3%)
  8. dist-ohos-armv7: 4048.3s -> 4326.2s (6.9%)
  9. dist-x86_64-linux-alt: 7571.6s -> 7107.4s (-6.1%)
  10. dist-apple-various: 6780.8s -> 6433.6s (-5.1%)
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

Finished benchmarking commit (aa57e46): 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 (secondary 2.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
7.0% [7.0%, 7.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.4% [-2.4%, -2.4%] 1
All ❌✅ (primary) - - 0

Cycles

Results (secondary -2.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

This benchmark run did not return any relevant results for this metric.

Bootstrap: 775.592s -> 776.084s (0.06%)
Artifact size: 366.33 MiB -> 366.32 MiB (-0.00%)

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-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.

8 participants