Skip to content
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

Rollup of 7 pull requests #136371

Merged
merged 15 commits into from
Feb 1, 2025
Merged

Rollup of 7 pull requests #136371

merged 15 commits into from
Feb 1, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

vayunbiyani and others added 15 commits January 23, 2025 14:32
…param_warning, r=oli-obk

omit unused args warnings for intrinsics without body

potential fix for rust-lang#135598
Manually walk into WF obligations in `BestObligation` proof tree visitor

When we encounter a `WellFormed` obligation in the `BestObligation` proof tree visitor, ignore the proof tree and call `wf::unnormalized_obligations` to derive well-formed obligations with the correct cause codes. This is to avoid having to replicate the somewhat delicate logic that `wf.rs` does to set up its obligation causes... Don't see a better way to do this.

vibes?? r? lcnr
…=Mark-Simulacrum

Fix off-by-one error causing slice::sort to abort the program

Fixes rust-lang#136103.
Based on the analysis by ``@jonathan-gruber-jg`` and ``@orlp.``
…=fee1-dead

Use proper type when applying deref adjustment in const

When applying a deref adjustment to some type `Wrap<T>` which derefs to `T`, we were checking that `T: ~const Deref`, not `Wrap<T>: ~const Deref` like we should have been.

r? project-const-traits

Fixes rust-lang#136273
Fixes rust-lang#135210 -- I just deleted the test since the regression test is uninteresting
…-obk

miri: make float min/max non-deterministic

This makes Miri match the documentation that landed in rust-lang#136296.

r? ``@oli-obk``
…mpiler-errors

Add documentation for derive(CoercePointee)

Part of [RFC 3621][rfc] tracked by rust-lang#123430. This text is heavily based on the guide-level explanation from the RFC.

``@rustbot`` label F-derive_coerce_pointee

[rfc]: https://rust-lang.github.io/rfcs/3621-derive-smart-pointer.html
@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-release Relevant to the release subteam, 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 Feb 1, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Feb 1, 2025

📌 Commit 70894fe 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 Feb 1, 2025
@bors
Copy link
Contributor

bors commented Feb 1, 2025

⌛ Testing commit 70894fe with merge 9e48dfe...

@bors
Copy link
Contributor

bors commented Feb 1, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 9e48dfe to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 1, 2025
@bors bors merged commit 9e48dfe into rust-lang:master Feb 1, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 1, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135840 omit unused args warnings for intrinsics without body 1400ee861aede7d18d950ee3c805d3fca6a5f32b (link)
#135900 Manually walk into WF obligations in BestObligation proof… 83c0bfbfa15bbf5be8de34b52fba934b89678044 (link)
#136163 Fix off-by-one error causing slice::sort to abort the progr… 95fe37a5f2d2269401d0242d2c6c4db4668eb714 (link)
#136266 fix broken release notes id b60ae4ab65604ff7605f5e46b2193f7eb990920e (link)
#136314 Use proper type when applying deref adjustment in const bd781ce2243943d32df0b792ced5e43ea6e1cb73 (link)
#136348 miri: make float min/max non-deterministic 8e3eb5a44f5acea4e8c9e31bfddda0e540913e4b (link)
#136351 Add documentation for derive(CoercePointee) 1df1c648298435e24d85a9b961ae17b678be8967 (link)

previous master: 9709af7901

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
Collaborator

Finished benchmarking commit (9e48dfe): 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.2% [0.2%, 0.3%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [0.2%, 0.3%] 2

Max RSS (memory usage)

Results (primary 1.5%)

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)
4.7% [2.4%, 9.1%] 5
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.8% [-4.5%, -2.4%] 3
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.5% [-4.5%, 9.1%] 8

Cycles

Results (secondary 2.1%)

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

Binary size

Results (primary 0.1%)

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.2% [0.1%, 0.3%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.1%, -0.0%] 3
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [-0.1%, 0.3%] 5

Bootstrap: 778.098s -> 777.638s (-0.06%)
Artifact size: 328.85 MiB -> 328.85 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-release Relevant to the release subteam, 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.

10 participants