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 9 pull requests #130165

Merged
merged 36 commits into from
Sep 9, 2024
Merged

Rollup of 9 pull requests #130165

merged 36 commits into from
Sep 9, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

folkertdev and others added 30 commits September 7, 2024 10:53
We support macOS 10.12 and above, so it now always uses linkat, so the
check is redundant.

This was missed in rust-lang#126351.
Lots of unnecessary `pub`s in this crate. Most are downgraded to
`pub(super)`, though some don't need any visibility.
When running tests without the `--force-rerun` flag, compiletest will
automatically skip any tests that (in its judgement) don't need to be run again
since the last time they were run.

This patch adds an explicit reason to those skipped tests, which is visible
when running with `rust.verbose-tests = true` in `config.toml`.
Currently it constructs two vectors `calls_to_terminated` and
`cleanups_to_remove` in the main loop, and then processes them after the
main loop. But the processing can be done in the main loop, avoiding the
need for the vectors.
Let chains are perfect for this kind of function.
Nothing comes after it within the loop.
It doesn't need to be, and it's 72 bytes on 64-bit platforms, which is
fairly large.
It's nicer than the `IndexVec` type.
In some cases `target` and `arg` are obtained fallibly, and in some
cases they are obtained infallibly. This commit changes them all to
infallible.
There are four related dataflow structs: `MaybeInitializedPlaces`,
`MaybeUninitializedPlaces`, and `EverInitializedPlaces`,
`DefinitelyInitializedPlaces`. They all have a `&Body` and a
`&MoveData<'tcx>` field. The first three use different lifetimes for the
two fields, but the last one uses the same lifetime for both.

This commit changes the first three to use the same lifetime, removing
the need for one of the lifetimes. Other structs that also lose a
lifetime as a result of this are `LivenessContext`, `LivenessResults`,
`InitializationData`.

It then does similar things in various other structs.
Also put the remaining lifetimes into the usual order.
Give them the names used in most places.
It's a very thin wrapper that pairs `MoveDataBuilder` with a `Location`,
and it has four lifetime arguments. This commit removes it by just
adding a `Location` to `MoveDataBuilder`.
It's a trivial wrapper around `ElaborateDropsCtxt` that serves no
apparent purpose.
…eanups-2, r=cjgillot

`rustc_mir_transform` cleanups, round 2

More cleanups in the style of rust-lang#129738.

r? ``@cjgillot``
…times, r=oli-obk

Dataflow/borrowck lifetime cleanups

These commits remove a bunch of unnecessary lifetimes from structs involved in dataflow/borrowck.

r? ``@lqd``
…piler-errors

fix ICE in CMSE type validation

fixes rust-lang#129983

tracking issue: rust-lang#81391

r? ``@compiler-errors``
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 9, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Sep 9, 2024

📌 Commit a0346bb 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 Sep 9, 2024
@bors
Copy link
Contributor

bors commented Sep 9, 2024

⌛ Testing commit a0346bb with merge c2f74c3...

@bors
Copy link
Contributor

bors commented Sep 9, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 9, 2024
@bors bors merged commit c2f74c3 into rust-lang:master Sep 9, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 9, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#129929 rustc_mir_transform cleanups, round 2 5029451e2da0e28a07fe4364890d13e80804e468 (link)
#130022 Dataflow/borrowck lifetime cleanups ecc2a149f0b7c7f56841b7eab921dea8a6509db1 (link)
#130064 fix ICE in CMSE type validation d2f277d0722b3109105a838ba0fac7dc80e50f8a (link)
#130067 Remove redundant check in symlink_hard_link test 3e5705685f964fc1c9b7c5559308b0f05e1a3005 (link)
#130131 Print a helpful message if any tests were skipped for being… 88e90f6249a4820323cd2cb25bb5bc66d3836689 (link)
#130137 Fix ICE caused by missing span in a region error 1cc76f577994b8e0460ede63590842a01ab073d9 (link)
#130153 use verbose flag as a default value for rust.verbose-tests 8d9911da358e203b2fe1414bfcc72ed6cacb32ef (link)
#130154 Stabilize char::MIN 53f11b69830a29b95cd70945c243d162660265cc (link)
#130158 Update books 202dabfe9459e454b65fbd07f5841422f10271fa (link)

previous master: d7522d8726

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 (c2f74c3): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

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

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: 756.6s -> 757.468s (0.11%)
Artifact size: 341.19 MiB -> 341.12 MiB (-0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-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.