Skip to content

Rollup of 5 pull requests #139417

New issue

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

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

Already on GitHub? # to your account

Merged
merged 11 commits into from
Apr 5, 2025
Merged

Rollup of 5 pull requests #139417

merged 11 commits into from
Apr 5, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Sky9x and others added 11 commits February 11, 2025 11:49
This module is named in reference to the keyword, but the term is
somewhat overloaded. Rename it to more clearly describe it and avoid the
misspelling.
…r=jhpratt

Fix missing const for inherent pointer `replace` methods

`ptr::replace` (the free fn) is already const stable. However, there are inherent convenience methods on `*mut T` and `NonNull<T>`, allowing you to write eg. `unsafe { foo.replace(bar) }` where `foo` is `*mut T` or `NonNull<T>`.

It seems const was never added to the inherent method (likely oversight), so this PR adds it.
I don't believe this needs another[^1] FCP as the inherent methods are already stable and `ptr::replace` is already const stable, so this adds no new API.

Original tracking issue: rust-lang#83164
`ptr::replace` constified in rust-lang#83091
`ptr::replace` const stabilized in rust-lang#130954

[^1]: `const_replace` FCP completed: rust-lang#83164 (comment)
… r=lcnr

Fix `ProvenVia` for global where clauses

When we're merging one (or more) global where clauses in the presence of no other candidates, ensure that we return `TraitGoalProvenVia::ParamEnv` so that rigid projections work correctly. This fixes some tests with `feature(trivial_bounds)`.

Fixes rust-lang#139408
…atik, r=Noratrieb

Rename internal module from `statik` to `no_threads`

This module is named in reference to the keyword, but the term is somewhat overloaded. Rename it to more clearly describe it and avoid the misspelling.
StableMIR: Prepare for refactoring

Temporarily make `stable_mir` "parasitic" on the `rustc_smir` crate.

It aims to resolve the circular dependency that would arise if we directly invert the dependency order between `rustc_smir` and `stable_mir`.

Once the refactoring is complete (`rustc_smir` does not depend on `stable_mir`), we will migrate it back to the `stable_mir` crate. See more details: [here](https://hackmd.io/jBRkZLqAQL2EVgwIIeNMHg).
…ler-errors

Small smir cleanup

First commit might have small positive perf effect, second one is just to make code a bit shorter
@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Apr 5, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 5, 2025

📌 Commit 91377bd 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 Apr 5, 2025
@bors
Copy link
Collaborator

bors commented Apr 5, 2025

⌛ Testing commit 91377bd with merge 5e17a2a...

@bors
Copy link
Collaborator

bors commented Apr 5, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5e17a2a to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#136877 Fix missing const for inherent pointer replace methods a1b2e19b7d3b598cd5994980403712e9e0150e8a (link)
#138797 Fix ProvenVia for global where clauses 1aa80daf7cbf5c5e0e78a934c25a40d50983d228 (link)
#139121 Rename internal module from statik to no_threads 6e323364c3aff036a5a2c487f08675dfd513e1f8 (link)
#139319 StableMIR: Prepare for refactoring e991facaefbafbf9cd317afa912f4bcb3440d9b6 (link)
#139404 Small smir cleanup 278e5234ff08af3ed8d6ab06f58fada5fc63eeca (link)

previous master: 0c478fdfe1

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

github-actions bot commented Apr 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 0c478fd (parent) -> 5e17a2a (this PR)

Test differences

Show 102 test diffs

Stage 1

  • [ui] tests/ui/codegen/mono-impossible-drop.rs: pass -> [missing] (J0)
  • [ui] tests/ui/codegen/mono-impossible-drop.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/codegen/mono-impossible-drop.rs#next: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/codegen/mono-impossible-drop.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/mono-impossible-drop.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/codegen/mono-impossible-drop.rs#next: [missing] -> pass (J1)

Additionally, 96 doctest diffs were found. These are ignored, as they are noisy.

Job group index

  • J0: x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3
  • J1: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-2, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1

Job duration changes

  1. dist-i586-gnu-i586-i686-musl: 5093.4s -> 5802.6s (13.9%)
  2. dist-aarch64-linux: 7600.5s -> 8564.8s (12.7%)
  3. x86_64-mingw-2: 7108.3s -> 7493.5s (5.4%)
  4. i686-msvc-2: 7165.7s -> 7487.5s (4.5%)
  5. aarch64-gnu-debug: 4007.8s -> 4186.0s (4.4%)
  6. x86_64-gnu-aux: 5965.3s -> 6145.1s (3.0%)
  7. dist-loongarch64-linux: 6365.5s -> 6554.3s (3.0%)
  8. i686-gnu-nopt-1: 8300.2s -> 8487.3s (2.3%)
  9. dist-arm-linux: 5437.3s -> 5533.6s (1.8%)
  10. test-various: 4176.2s -> 4246.7s (1.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
Collaborator

Finished benchmarking commit (5e17a2a): 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 5.8%)

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

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: 775.534s -> 776.183s (0.08%)
Artifact size: 365.93 MiB -> 365.91 MiB (-0.01%)

# for free to join this conversation on GitHub. Already have an account? # 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants