Skip to content

Rollup of 4 pull requests - #95680

Merged
bors merged 11 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-7jldtnz
Apr 5, 2022
Merged

Rollup of 4 pull requests#95680
bors merged 11 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-7jldtnz

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

notriddleand others added 11 commits April 4, 2022 12:16
…77, r=compiler-errors
Suggest derivable trait on E0277 error
Closesrust-lang#95099 .
…davidtwco
diagnostics: use correct span for const generics
Fixesrust-lang#95616
Update panic docs to make it clearer when to use panic vs Result
This is based on a question that came up in one of my [error handling office hours](https://twitter.com/yaahc_/status/1506376624509374467?s=20&t=Sp-cEjrx5kpMdNsAGPOo9w) meetings. I had a user who was fairly familiar with error type design, thiserror and anyhow, and rust in general, but who was still confused about when to use panics vs when to use Result and `Error`.
This will also be cross referenced in an error handling FAQ that I will be creating in the https://github.com/rust-lang/project-error-handling repo shortly.
…meters, r=davidtwco
Refactor: remove unused function parameters
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 5, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Apr 5, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 6832964 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 5, 2022
@bors

bors commented Apr 5, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6832964 with merge d4c7839...

@bors

bors commented Apr 5, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing d4c7839 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 5, 2022
@bors
bors merged commit d4c7839 into rust-lang:masterApr 5, 2022
@rustbotrustbot added this to the 1.62.0 milestone Apr 5, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (d4c7839): comparison url.

Summary:

  • Primary benchmarks: changes not relevant. 2 results were found to be statistically significant but the changes were too small to be relevant.
  • Secondary benchmarks: 😿 relevant regressions found
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count126002
mean20.4%1.1%N/AN/A0.4%
max0.4%1.3%N/AN/A0.4%

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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

Footnotes

  1. number of relevant changes

  2. the arithmetic mean of the percent change

@rustbotrustbot added the perf-regression Performance regression. label Apr 5, 2022
@Mark-Simulacrum

Copy link
Copy Markdown
Member

Regression seems maybe real, based on being across multiple profiles for keccak in particular. Cachegrind seems to point at it being in ObligationForest, though, which is not really modified by this PR -- probably inlining decisions changed, or we're seeing effects from diagnostic code being slightly slower and running in a way that doesn't end up actually emitting the diagnostic? Unclear if that can happen.

Given the limited impact though and likely difficulty of investigation, I'm going to mark this as triaged since I don't think spending further time is worthwhile.

@Mark-SimulacrumMark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Apr 12, 2022
@Mark-Simulacrum

Copy link
Copy Markdown
Member

Looking at the graphs for keccak over the last week, it's also plausible this is mostly noise:

image

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.perf-regressionPerformance regression.perf-regression-triagedThe performance regression has been triaged.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler 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

@Dylan-DPC@bors@rust-timer@Mark-Simulacrum@rustbot@notriddle@yaahc@ohno418@TaKO8Ki