Skip to content

Rollup of 3 pull requests #126581

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

Jump to bottom
Merged
merged 6 commits into from
Jun 17, 2024
Merged

Rollup of 3 pull requests #126581

merged 6 commits into from
Jun 17, 2024

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

gurry and others added 6 commits June 10, 2024 16:28
@gurry
Make suggestion to change Fn to FnMut work with methods well
e47ea38
@nnethercote
Convert a span_bug to a span_delayed_bug.
bd32c4c 
PR rust-lang#121208 converted this from a `span_delayed_bug` to a `span_bug`
because nothing in the test suite caused execution to hit this path. But
now fuzzing has found a test case that does hit it. So this commit
converts it back to `span_delayed_bug` and adds the relevant test.

Fixes rust-lang#126385.
@GuillaumeGomez
Add missing test annotation
20d6485
@GuillaumeGomez
Rollup merge of rust-lang#126226 - gurry:125325-improve-closure-arg-s…
9f5e2e3 
…ugg, r=oli-obk

Make suggestion to change `Fn` to `FnMut` work with methods as well

Fixes rust-lang#125325

The issue occurred because the code that emitted the suggestion to change `Fn` to `FnMut` worked only for function calls  and not method calls. This PR makes it work with methods as well.
@GuillaumeGomez
Rollup merge of rust-lang#126570 - nnethercote:fix-126385, r=lcnr
020c077 
Convert a `span_bug` to a `span_delayed_bug`.

PR rust-lang#121208 converted this from a `span_delayed_bug` to a `span_bug` because nothing in the test suite caused execution to hit this path. But now fuzzing has found a test case that does hit it. So this commit converts it back to `span_delayed_bug` and adds the relevant test.

Fixes rust-lang#126385.

r? `@lcnr`
@GuillaumeGomez
Rollup merge of rust-lang#126580 - GuillaumeGomez:add-missing-annotat…
9092ffb 
…ion, r=bjorn3

Add `run-make/const_fn_mir` missing test annotation

Fixes comment from rust-lang#126270.

r? `@bjorn3`
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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. rollup A PR which is a rollup labels Jun 17, 2024
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=3 rollup=never

@bors
Copy link
Collaborator

bors commented Jun 17, 2024

📌 Commit 9092ffb has been approved by GuillaumeGomez

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 Jun 17, 2024
@bors
Copy link
Collaborator

bors commented Jun 17, 2024

⌛ Testing commit 9092ffb with merge 3baa20b...

@bors
Copy link
Collaborator

bors commented Jun 17, 2024

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 3baa20b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 17, 2024
@bors bors merged commit 3baa20b into rust-lang:master Jun 17, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 17, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126226 Make suggestion to change Fn to FnMut work with methods… 5fee5d0ed049019682ca77a2e1ed7b7da20ddbbd (link)
#126570 Convert a span_bug to a span_delayed_bug. c15cef6c5ad9a4907273de0a6783466b568dd970 (link)
#126580 Add run-make/const_fn_mir missing test annotation d5f21529087a315b6854b05f4b57517d43d6dba6 (link)

previous master: e23ae72ac7

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@GuillaumeGomez GuillaumeGomez deleted the rollup-dx4fadn branch June 17, 2024 12:06
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3baa20b): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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)		 1.3% [1.3%, 1.3%] 1
Improvements ✅
(primary)		 -0.3% [-0.4%, -0.2%] 6
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.3% [-0.4%, -0.2%] 6

Max RSS (memory usage)

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

Cycles

Results (secondary -3.4%)

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

Binary size

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

Bootstrap: 671.588s -> 669.445s (-0.32%)
Artifact size: 319.89 MiB -> 320.51 MiB (0.19%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 17, 2024
@rylev
Copy link
Member

rylev commented Jun 20, 2024

Regression might be noise (and isn't big enough to care about even if it isn't)

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 20, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-run-make Area: port run-make Makefiles to rmake.rs merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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.
Projects
None yet
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
7 participants
@GuillaumeGomez @bors @rust-timer @rylev @rustbot @gurry @nnethercote