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 8 pull requests #135319

Merged
merged 21 commits into from
Jan 10, 2025
Merged

Rollup of 8 pull requests #135319

merged 21 commits into from
Jan 10, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

hkBst and others added 21 commits December 22, 2024 18:29
I've removed the cryptic message about not being able to call `&mut self` methods while retaining a shared borrow of the iterator, such as `as_slice` produces. This is just normal borrowing rules and does not seem especially relevant here. I can whip up a replacement if someone thinks it has value.
The comment says that the expression involves no function call, but
that was only true for the example above, the example here _does_
contain a function call.
previously field ordering was using the same seed for all instances of Foo,
now we pass seed values through the layout tree so that not only
the struct itself affects layout but also its fields
…kingjubilee

`-Zrandomize-layout` harder. `Foo<T> != Foo<U>`

Tracking issue: rust-lang#106764

Previously randomize-layout only used a deterministic shuffle based on the seed stored in an Adt's ReprOptions, meaning that `Foo<T>`  and `Foo<U>` were shuffled by the same seed. This change adds a similar seed to each calculated LayoutData so that a struct can be randomized both based on the layout of its fields and its per-type seed.
Primitives start with simple seed derived from some of their properties. Though some types can no longer be distinguished at that point, e.g. usize and u64 will still be treated the same.
Improve prose around `as_slice` example of IterMut

I've removed the cryptic message about not being able to call `&mut self` methods while retaining a shared borrow of the iterator, such as `as_slice` produces. This is just normal borrowing rules and does not seem especially relevant here. I can whip up a replacement if someone thinks it has value.
…eemdev

Fix `ptr::from_ref` documentation example comment

The comment says that the expression involves no function call, but that was only true for the example above, the example here _does_ contain a function call.

``@rustbot`` label A-docs
…otes, r=BoxyUwU

Add Pin::as_deref_mut to 1.84 relnotes

Resolves rust-lang#131243 - I think this got missed in the relnotes sweep or something.

``@rustbot`` label relnotes
Make `bare-fn-no-impl-fn-ptr-99875` test less dependent on path width

This sets diagnostic-width to some arbitrary number. Seems to work on my machine.
…iler-errors

Add tests cases from review of rust-lang#132289

Adding my comments as test-cases as suggested by ``@jackh726`` in rust-lang#132289 (comment)
…-obk

Make sure to walk into nested const blocks in `RegionResolutionVisitor`

Fixes rust-lang#135306

I tried auditing the rest of the visitors that called `.visit_body`, and it seems like this is the only one that was missing it. I wonder if we should modify intravisit (specifcially, that `NestedBodyFilter` stuff) to make this less likely to happen, tho...

r? oli-obk
@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. rollup A PR which is a rollup labels Jan 10, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Jan 10, 2025

📌 Commit c51bfaf 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 Jan 10, 2025
@bors
Copy link
Contributor

bors commented Jan 10, 2025

⌛ Testing commit c51bfaf with merge 67951d9...

@bors
Copy link
Contributor

bors commented Jan 10, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 67951d9 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#133088 -Zrandomize-layout harder. Foo<T> != Foo<U> 96cd89f374a06f614534e6cdbdc5fa95007ce70b (link)
#134619 Improve prose around as_slice example of IterMut 8b5cd27b3c3e526315f2ec6a7c987c04f85e8ca6 (link)
#134855 Add default_field_values entry to unstable book 85862f72c93350789efbc93ca7647cd03d76eec0 (link)
#134908 Fix ptr::from_ref documentation example comment cfb859bcc8e9d597e790a09fcee641a91e0d8529 (link)
#135275 Add Pin::as_deref_mut to 1.84 relnotes f004cc8845e0f514e94b9d1c2e80f75dec6b574d (link)
#135294 Make bare-fn-no-impl-fn-ptr-99875 test less dependent on … 61d06d4ec5d34a97a75297280c6cb9547a0291b2 (link)
#135304 Add tests cases from review of #132289 4b1efa2b25818f29f5dc41f7d2ca39d115228af8 (link)
#135308 Make sure to walk into nested const blocks in `RegionResolu… 1f097690a8f612f3f87a74bccd403f149207b3fc (link)

previous master: 88ab2d8acb

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 (67951d9): 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.0% [0.0%, 0.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

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

Cycles

Results (secondary 4.9%)

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)
6.1% [5.3%, 7.1%] 6
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: 762.519s -> 763.376s (0.11%)
Artifact size: 325.74 MiB -> 325.75 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.