Skip to content

Rollup of 6 pull requests - #96015

Merged
bors merged 21 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-vhdprid
Apr 13, 2022
Merged

Rollup of 6 pull requests#96015
bors merged 21 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-vhdprid

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

willcrichtonand others added 21 commits March 27, 2022 18:10
Add missing article to fix "few" (not many) to "a few" (some).
Add a missing article
…illaumeGomez
Improve Rustdoc UI for scraped examples with multiline arguments, fix overflow in line numbers
This PR improves a few aspects of the scrape examples feature in Rustdoc.
* Only function names and not the full call expression are highlighted.
* For call-sites with multiline arguments, the minimized code viewer will scroll to the top of the call-site rather than the middle if the argument is larger than the viewer size, ensuring that the function name is visible.
* This fixes an issue where the line numbers column had a visible x-scroll bar.
r? `@GuillaumeGomez`
Improve error message in case of missing checksum
# Fixesrust-lang#94217
Document that DirEntry holds the directory open
I had a bug where holding onto DirEntry structs caused file descriptor exhaustion, and thought it would be good to document this.
…898, r=fee1-dead
fix: wrong trait import suggestion for T:
The suggestion to bound `T` had an extra `:`.
```rust
fn foo<T:>(t: T) {
t.clone();
}
```
```
error[E0599]: no method named `clone` found for type parameter `T` in the current scope
--> src/lib.rs:2:7
|
2 | t.clone();
| ^^^^^ method not found in `T`
|
= help: items from traits can only be used if the type parameter is bounded by the trait
help: the following trait defines an item `clone`, perhaps you need to restrict type parameter `T` with it:
|
1 | fn foo<T: Clone:>(t: T) {
| ~~~~~~~~
```
Fixes: rust-lang#95898
Add missing article to fix "few" to "a few".
Add missing article to fix "few" (not many) to "a few" (some).
Add a missing article
Add a missing article
@rustbotrustbot added 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 13, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Apr 13, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit e95f2db 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 13, 2022
@bors

bors commented Apr 13, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e95f2db with merge 0d13f6a...

@bors

bors commented Apr 13, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 13, 2022
@bors
bors merged commit 0d13f6a into rust-lang:masterApr 13, 2022
@rustbotrustbot added this to the 1.62.0 milestone Apr 13, 2022
@borsbors mentioned this pull request Apr 13, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (0d13f6a): comparison url.

Summary:

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count106020
mean2N/A0.7%N/A-0.3%N/A
maxN/A1.1%N/A-0.4%N/A

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 13, 2022
@pnkfelix

Copy link
Copy Markdown
Contributor

Visiting for weekly performance triage

  • only secondary regressions, and majority are to ctfe-stress-5 incr-unchanged (on all of check,debug,opt), on the order of 1.1%.
  • did local cachegrind run on check build: https://gist.github.com/4be85f17d74ee6bf2c92efcd922a6fc9
  • regression seems to be blamed upon rustc_data_structures::intern::Interned<rustc_middle::mir::interpret::allocation::Allocation> as rustc_data_structures::stable_hasher::HashStable<rustc_query_system::ich::hcx::StableHashingContext>>::hash_stable
  • but nothing in the rollup PR seems like it could possibly have had an impact there.
  • nonetheless, the graph of ctfe-stress-5-check does seem like there has been some gradual regression over time.

image

  • pnkfelix would not blame that on this rollup PR, though.

@rustbot label: +perf-regression-triaged

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.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Dylan-DPC@bors@rust-timer@pnkfelix@rustbot@willcrichton@sourcefrog@hkBst