Skip to content

Rollup of 6 pull requests #142070

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 32 commits into from
Jun 5, 2025
Merged

Rollup of 6 pull requests #142070

merged 32 commits into from
Jun 5, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jun 5, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 30 commits May 28, 2025 10:56
use a relative path, so that this also works offline
This is standard for other chapters.
Add title and toc to Async chapter
Contents inside of an HTML element only get interpreted as Markdown
(as opposed to HTML) if its separated from the HTML tags with line breaks.
Fix some warning blocks that contain Markdown
Signed-off-by: onur-ozkan <[email protected]>
Signed-off-by: onur-ozkan <[email protected]>
…sed, r=workingjubilee

UnsafePinned: also include the effects of UnsafeCell

This tackles rust-lang#137750 by including an `UnsafeCell` in `UnsafePinned`, thus imbuing it with all the usual properties of interior mutability (no `noalias` nor `dereferenceable` on shared refs, special treatment by Miri's aliasing model). The soundness issue is not fixed yet because coroutine lowering does not use `UnsafePinned`.

The RFC said that `UnsafePinned` would not permit mutability on shared references, but since then, rust-lang#137750 has demonstrated that this is not tenable. In the face of those examples, I propose that we do the "obvious" thing and permit shared mutable state inside `UnsafePinned`. This seems loosely consistent with the fact that we allow going from `Pin<&mut T>` to `&T` (where the former can be aliased with other pointers that perform mutation, and hence the same goes for the latter) -- but the `as_ref` example shows that we in fact would need to add this `UnsafeCell` even if we didn't have a safe conversion to `&T`, since for the compiler and Miri, `&T` and `Pin<&T>` are basically the same type.

To make this possible, I had to remove the `Copy` and `Clone` impls for `UnsafePinned`.

Tracking issue: rust-lang#125735
Cc ``@rust-lang/lang`` ``@rust-lang/opsem``  ``@Sky9x``
I don't think this needs FCP since the type is still unstable -- we'll finally decide whether we like this approach when `UnsafePinned` is moved towards stabilization (IOW, this PR is reversible). However, I'd still like to make sure that the lang team is okay with the direction I am proposing here.
… r=marcoieni

Do not run PGO/BOLT in x64 Linux alt builds

Should unblock rust-lang#131077 and also reduce our CI costs. It seems to run ~1.5h on the x64 larger runner (free runner runs out of disk space, sadly).

Discussed [here](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Utility.20of.20the.20.60dist-x86_64-linux-alt.60.20job/with/521324477).

r? ``@marcoieni``

try-job: `dist-x86_64-linux*`
update rust offload bootstrap

r? ``@ghost``
rustc-dev-guide subtree update

r? ``@jieyouxu``
`tests/ui`: A New Order [3/N]

Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895.

r? ``@jieyouxu``
implement new `x` flag: `--skip-std-check-if-no-download-rustc`

One of our developers (``@RalfJung)`` [reported](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Surprising.20stages.20for.20check.20build.20after.20stage.20reorg/with/521925606)[#t-infra/bootstrap > Surprising stages for check build after stage reorg](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Surprising.20stages.20for.20check.20build.20after.20stage.20reorg/with/521925606) that working on both the compiler and the library simultaneously with RA enabled is extremely difficult because checking library creates a heavy load on machines (by building stage1 compiler) on each modification. `--skip-std-check-if-no-download-rustc` flag is intended to reduce this heavy load on their IDE integration as much as possible.

Fixes: rust-lang#141955
@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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. rollup A PR which is a rollup labels Jun 5, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 5, 2025

📌 Commit cfe78d9 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 Jun 5, 2025
@bors
Copy link
Collaborator

bors commented Jun 5, 2025

⌛ Testing commit cfe78d9 with merge 0b20963...

@bors
Copy link
Collaborator

bors commented Jun 5, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 0b20963 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2025
@bors bors merged commit 0b20963 into rust-lang:master Jun 5, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 5, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#140638 UnsafePinned: also include the effects of UnsafeCell 04cfcf289e00582680c74094082588436c33b6cd (link)
#141777 Do not run PGO/BOLT in x64 Linux alt builds 17fe1dc7553fab2f6198e95bf06a15e625f0d581 (link)
#141938 update rust offload bootstrap 72f4c064a15e2cc981b61f87436d34ebeb4ce61a (link)
#141962 rustc-dev-guide subtree update d29bd719366ef1c23f610a575ce2f99e98badda9 (link)
#141965 tests/ui: A New Order [3/N] 5d5a57288d354a00358725238ded02b11c595a27 (link)
#141970 implement new x flag: `--skip-std-check-if-no-download-ru… 2c78a525c4a865bbd50eeabfa5bbb0f6f47b072f (link)

previous master: c360e219f5

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
Contributor

github-actions bot commented Jun 5, 2025

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 c360e21 (parent) -> 0b20963 (this PR)

Test differences

Show 22 test diffs

Stage 1

  • [ui] tests/ui/break-diverging-value.rs: pass -> [missing] (J0)
  • [ui] tests/ui/builtin-clone-unwind.rs: pass -> [missing] (J0)
  • [ui] tests/ui/can-copy-pod.rs: pass -> [missing] (J0)
  • [ui] tests/ui/cancel-clean-via-immediate-rvalue-ref.rs: pass -> [missing] (J0)
  • [ui] tests/ui/cannot-mutate-captured-non-mut-var.rs: pass -> [missing] (J0)
  • [ui] tests/ui/closures/closure-immut-capture-error.rs: [missing] -> pass (J0)
  • [ui] tests/ui/codegen/rvalue-mut-ref-box-drop.rs: [missing] -> pass (J0)
  • [ui] tests/ui/loops/loop-break-never-type-mismatch.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/clone-unwind-rc-cleanup.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/copy-trait-implicit-copy.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/break-diverging-value.rs: pass -> [missing] (J1)
  • [ui] tests/ui/builtin-clone-unwind.rs: pass -> [missing] (J1)
  • [ui] tests/ui/can-copy-pod.rs: pass -> [missing] (J1)
  • [ui] tests/ui/cancel-clean-via-immediate-rvalue-ref.rs: pass -> [missing] (J1)
  • [ui] tests/ui/cannot-mutate-captured-non-mut-var.rs: pass -> [missing] (J1)
  • [ui] tests/ui/closures/closure-immut-capture-error.rs: [missing] -> pass (J1)
  • [ui] tests/ui/codegen/rvalue-mut-ref-box-drop.rs: [missing] -> pass (J1)
  • [ui] tests/ui/loops/loop-break-never-type-mismatch.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/clone-unwind-rc-cleanup.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/copy-trait-implicit-copy.rs: [missing] -> pass (J1)

Additionally, 2 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 0b20963d6b892651937fb3600e15ca285bdcfefd --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-apple-various: 9876.7s -> 5940.8s (-39.9%)
  2. aarch64-apple: 4005.1s -> 5118.6s (27.8%)
  3. x86_64-apple-2: 3130.4s -> 3962.7s (26.6%)
  4. dist-x86_64-linux-alt: 7769.2s -> 9583.8s (23.4%)
  5. test-various: 4008.1s -> 3643.2s (-9.1%)
  6. x86_64-msvc-ext1: 7279.5s -> 6681.9s (-8.2%)
  7. dist-x86_64-apple: 7514.7s -> 8091.5s (7.7%)
  8. dist-loongarch64-musl: 5139.6s -> 4797.4s (-6.7%)
  9. dist-powerpc64le-linux-gnu: 5006.0s -> 5296.9s (5.8%)
  10. dist-x86_64-musl: 7392.9s -> 7005.1s (-5.2%)
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 (0b20963): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary 0.7%, 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)
3.7% [3.7%, 3.7%] 1
Regressions ❌
(secondary)
2.3% [1.2%, 3.3%] 2
Improvements ✅
(primary)
-2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.7% [-2.2%, 3.7%] 2

Cycles

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

Binary size

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

Bootstrap: 750.544s -> 750.971s (0.06%)
Artifact size: 371.78 MiB -> 371.78 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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.