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 5 pull requests #119407

Merged
merged 10 commits into from
Dec 29, 2023
Merged

Rollup of 5 pull requests #119407

merged 10 commits into from
Dec 29, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

DaniPopes and others added 10 commits December 28, 2023 21:19
Instead of having separate `make_async/etc_expr` functions, this merges them them into one, reducing code duplication a bit.
The iteration order of this hashmap can potentially affect the relative
creation order of MIR blocks.
… r=compiler-errors

Merge Coroutine lowering functions

Instead of having separate `make_async/etc_expr` functions, this merges them them into one, reducing code duplication a bit.
Use filter instead of filter_map in Parser::expected_one_of_not_found
coverage: Avoid a possible query stability hazard in `CoverageCounters`

rust-lang#119252 revealed a possible query stability hazard in `CoverageCounters`: we iterate over the entries of an `FxHashMap` in a way that allows the iteration order to potentially affect the relative creation order of MIR blocks.

I'm not sure whether there's an actual stability problem or not in practice, but it's certainly a hazard, and I don't see any reason not to switch over to `FxIndexMap` to avoid potential issues.

---

This can either be merged on its own, or incorporated into rust-lang#119252.

cc `@Enselic`
r? `@cjgillot`
…ler-errors

Also walk bindings created by if-let guards

This change makes the `unused_variables` lint pick up unused bindings created by if-let guards.

Fixes rust-lang#119383
@rustbot rustbot added 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-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. rollup A PR which is a rollup labels Dec 29, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Dec 29, 2023

📌 Commit 761e058 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 Dec 29, 2023
@bors
Copy link
Contributor

bors commented Dec 29, 2023

⌛ Testing commit 761e058 with merge b74f5c4...

@bors
Copy link
Contributor

bors commented Dec 29, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 29, 2023
@bors bors merged commit b74f5c4 into rust-lang:master Dec 29, 2023
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Dec 29, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#119375 Merge Coroutine lowering functions 65ddf904bc4b7d5e69cac30e5470a43dd75e9f33 (link)
#119393 Use filter instead of filter_map in Parser::expected_one_of… e0683163e5b1f3fdb1c833f5d89335f43a0f1a2e (link)
#119401 coverage: Avoid a possible query stability hazard in `Cover… c15c7a4b4122a40896c4814c3c5cdb95550f0218 (link)
#119402 Also walk bindings created by if-let guards da86291bdbb336b854f89bd4c5fec01d8f1a0d88 (link)
#119404 Enable profiler in dist-powerpc-linux 52cf89dcc6f3e345c450aa25c3dd1f65d690fc55 (link)

previous master: 95613d1b23

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 (b74f5c4): 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

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

Cycles

Results

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

Binary size

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

Bootstrap: 672.269s -> 671.85s (-0.06%)
Artifact size: 312.29 MiB -> 312.32 MiB (0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-bsoz7bn branch March 16, 2024 18:18
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-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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants