Rollup of 6 pull requests #101805

Dylan-DPC · 2022-09-14T13:56:24Z

Successful merges:

Emit a note that static bounds from HRTBs are a bug #101433 (Emit a note that static bounds from HRTBs are a bug)
smol grammar changes to README.md #101684 (smol grammar changes to README.md)
rustdoc: remove redundant CSS .out-of-band > span.since { position } #101769 (rustdoc: remove redundant CSS .out-of-band > span.since { position })
Also replace the placeholder for the stable_features lint #101772 (Also replace the placeholder for the stable_features lint)
rustdoc: remove outdated CSS .content table etc #101773 (rustdoc: remove outdated CSS .content table etc)
Update test output for drop tracking #101779 (Update test output for drop tracking)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…text

At the time this CSS was added, it was just `span.since`, because the version info could be rendered in two different ways: 1. `<div class='since'>` was used for associated items like methods. It was absolutely positioned, and the selector in rustdoc.css that targetted it was just `.since`. https://github.com/rust-lang/rust/blob/a5a2f2b951ea982a666eaf52b1874d8f1b17290b/src/librustdoc/html/static/rustdoc.css#L522-L529 2. `<span class='since'>` was introduced in a5a2f2b for page-global version info, so that it could be laid out alongside the `[-]`/`[+]` button. This CSS rule was added to override the absolute position introduced in (1). https://github.com/rust-lang/rust/blob/a5a2f2b951ea982a666eaf52b1874d8f1b17290b/src/librustdoc/html/static/rustdoc.css#L637-L641 The selector was changed in 8fc6e42 so that everything could use a `<span>` tag, but the dichotomy of the absolutely-positioned version info for associated items and the static positioned item version info remained. The absolutely positioned `.since` was changed to one nested below a `<div class="rightside">` container in 5de1391, so the version information is now always statically-positioned, and, as described in the commit message, "their DOM representation is consistent."

The `.content table` / `.content td` / `.content tr` family of selectors date back to 4fd061c, when module indexes and other parts of rustdoc used `<table>` tags for layout and content presentation. The `.content td h1, .content td h2` has only been changed since then to tweak the font size in dd5ff42. https://github.com/rust-lang/rust/blob/4fd061c426902b0904c65e64a3780b21f9ab3afb/src/rustdoc_ng/html/static/main.css#L155-L162 This CSS would have affected: * search result tables, which were removed in b615c0c * module item tables, which were removed in 6020c79 * docblock tables from markdown, which still exist It may also have affected a few other tables over the last decade, but they've been gradually replaced with grid layouts and flexbox to make layouts that work better on narrow viewports. For example, 34bd2b8. These rules have no affect on the appearance of docblock tables =============================================================== .content table { border-spacing: 0 5px; } According to MDN, [border-spacing] only has an effect when `border-collapse` is `separate`. However, `border-collapse: collapse` is set globally for all tables, so this rule does nothing. [border-spacing]: https://developer.mozilla.org/en-US/docs/Web/CSS/border-spacing .content td p:first-child { margin-top: 0; } Tables with paragraphs in them are impossible without dropping down to raw HTML. Also, the rustdoc stylesheet sets paragraphs to have no top margin anyway, so this rule is a no-op. .content td h1, .content td h2 { margin-left: 0; font-size: 1.125rem; } Tables with headers in them are impossible without dropping down to raw HTML. This is considered unlikely, especially since it looks weird right now (`.docblock h2` has an underline that is redundant with the table cell's own border). .content tr:first-child td { border-top: 0; } This has no effect because of border collapsing. This rule is removed, because tables look fine without it ========================================================= .content td:first-child { padding-right: 20px; } By removing this rule, the first cell in each row has the same padding as all other cells in the row. This rule is kept, and converted to directly target `.docblock` =============================================================== .content td { vertical-align: top; } Removing this rule would cause it to be aligned to the middle instead.

…-error, r=compiler-errors Emit a note that static bounds from HRTBs are a bug This note isn't perfect, but opening this to either 1) land as is or 2) get some feedback on how to improve it Let r? `@compiler-errors` and cc. `@nikomatsakis`

smol grammar changes to README.md smol grammar changes to README.md

…an-since, r=GuillaumeGomez rustdoc: remove redundant CSS `.out-of-band > span.since { position }` At the time this CSS was added, it was just `span.since`, because the version info could be rendered in two different ways: 1. `<div class='since'>` was used for associated items like methods. It was absolutely positioned, and the selector in rustdoc.css that targetted it was just `.since`. https://github.com/rust-lang/rust/blob/a5a2f2b951ea982a666eaf52b1874d8f1b17290b/src/librustdoc/html/static/rustdoc.css#L522-L529 2. `<span class='since'>` was introduced in a5a2f2b for page-global version info, so that it could be laid out alongside the `[-]`/`[+]` button. This CSS rule was added to override the absolute position introduced in (1). https://github.com/rust-lang/rust/blob/a5a2f2b951ea982a666eaf52b1874d8f1b17290b/src/librustdoc/html/static/rustdoc.css#L637-L641 The selector was changed in 8fc6e42 so that everything could use a `<span>` tag, but the dichotomy of the absolutely-positioned version info for associated items and the static positioned item version info remained. The absolutely positioned `.since` was changed to one nested below a `<div class="rightside">` container in 5de1391, so the version information is now always statically-positioned, and, as described in the commit message, "their DOM representation is consistent."

…ics, r=jackh726 Also replace the placeholder for the stable_features lint Follow up of rust-lang#101215 and rust-lang#100591 . Fixes rust-lang#101766

… r=GuillaumeGomez rustdoc: remove outdated CSS `.content table` etc # Screenshot before ![image](https://user-images.githubusercontent.com/1593513/189992665-238aab28-d224-4466-901c-6e35e79182fb.png) # Screenshot after ![image](https://user-images.githubusercontent.com/1593513/189992762-35c8efe4-e980-40bd-b72c-3ae4cfd6f830.png) # Description The `.content table` / `.content td` / `.content tr` family of selectors date back to 4fd061c, when module indexes and other parts of rustdoc used `<table>` tags for layout and content presentation. The `.content td h1, .content td h2` has only been changed since then to tweak the font size in dd5ff42. https://github.com/rust-lang/rust/blob/4fd061c426902b0904c65e64a3780b21f9ab3afb/src/rustdoc_ng/html/static/main.css#L155-L162 This CSS would have affected: * search result tables, which were removed in b615c0c * module item tables, which were removed in 6020c79 * docblock tables from markdown, which still exist It may also have affected a few other tables over the last decade, but they've been gradually replaced with grid layouts and flexbox to make layouts that work better on narrow viewports. For example, 34bd2b8. These rules have no affect on the appearance of docblock tables --------------------------------------------------------------- .content table { border-spacing: 0 5px; } According to MDN, [border-spacing] only has an effect when `border-collapse` is `separate`. However, `border-collapse: collapse` is set globally for all tables, so this rule does nothing. [border-spacing]: https://developer.mozilla.org/en-US/docs/Web/CSS/border-spacing .content td p:first-child { margin-top: 0; } Tables with paragraphs in them are impossible without dropping down to raw HTML. Also, the rustdoc stylesheet sets paragraphs to have no top margin anyway, so this rule is a no-op. .content td h1, .content td h2 { margin-left: 0; font-size: 1.125rem; } Tables with headers in them are impossible without dropping down to raw HTML. This is considered unlikely, especially since it looks weird right now (`.docblock h2` has an underline that is redundant with the table cell's own border). .content tr:first-child td { border-top: 0; } This has no effect because of border collapsing. This rule is removed, because tables look fine without it --------------------------------------------------------- .content td:first-child { padding-right: 20px; } By removing this rule, the first cell in each row has the same padding as all other cells in the row. This rule is kept, and converted to directly target `.docblock` --------------------------------------------------------------- .content td { vertical-align: top; } Removing this rule would cause it to be aligned to the middle instead.

…=jyn514 Update test output for drop tracking rust-lang#97334 has a lot of updates to test outputs that makes the PR larger than it needs to be. This PR pulls those changes out so we can keep the other one as simple as possible. r? `@jyn514`

Dylan-DPC · 2022-09-14T13:56:35Z

@bors r+ rollup=never p=5

bors · 2022-09-14T13:56:39Z

📌 Commit 15a5bc9 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-09-14T15:19:16Z

⌛ Testing commit 15a5bc9 with merge a926696...

bors · 2022-09-14T18:02:12Z

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

rust-timer · 2022-09-14T18:04:10Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101779	0d080239d24e53d7039ee125b3e73fa8ebf94de5
#101773	ab8f87c07fe0a00ce11aee24113477f506dcffaf
#101772	735bf03814ffcc67df37ef6fdc02c55a8af2b844
#101769	d7bdd8e67b8e9f1b2e71f29300766419fdbcccb8
#101684	7831752920e90e5f1b5bd7e951c9e78d24b06b36
#101433	b512bbede20f6f1ec7a77e2a226dbc38578f118a

previous master: c97922dca5

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 · 2022-09-14T19:18:57Z

Finished benchmarking commit (a926696): 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.4%	[0.4%, 0.5%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.5%	[-5.0%, -4.1%]	6
All ❌✅ (primary)	0.4%	[0.4%, 0.5%]	2

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)	1.2%	[0.6%, 2.6%]	11
Regressions ❌ (secondary)	1.9%	[1.2%, 2.5%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.2%	[0.6%, 2.6%]	11

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)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-3.3%, -1.6%]	13
All ❌✅ (primary)	-	-	0

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

nnethercote · 2022-09-14T21:20:43Z

Interesting perf results. The small diesel regression looks real, but the large wg-grammar improvement also looks real. And if you look at cycles there are improvements to wg-grammar, tt-muncher, and deep-vector, all of which are benchmarks that chew through large amounts of repetitive code. Which suggests some kind of improvement to AST traversal or something like that. # #101433 seems the most likely cause:

@rust-timer build b512bbede20f6f1ec7a77e2a226dbc38578f118a

rust-timer · 2022-09-14T21:20:45Z

Queued b512bbede20f6f1ec7a77e2a226dbc38578f118a with parent c97922d, future comparison URL.

rust-timer · 2022-09-14T23:26:27Z

Finished benchmarking commit (b512bbede20f6f1ec7a77e2a226dbc38578f118a): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf +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.5%	[0.4%, 0.5%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.5%	[-5.0%, -4.1%]	6
All ❌✅ (primary)	0.5%	[0.4%, 0.5%]	2

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

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)	2.7%	[2.2%, 3.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.2%	[-3.0%, -1.7%]	9
All ❌✅ (primary)	-	-	0

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

nnethercote · 2022-09-15T09:26:42Z

That confirms #101433 is responsible for the perf effects of this rollup.

Mark-Simulacrum · 2022-09-20T12:49:50Z

Moving the perf regression label to #101433.

zahash and others added 23 commits September 11, 2022 16:39

smol grammar changes to README.md

5b758f0

replace i.e. with e.g. in readme which is more accurate given the con…

a91e618

…text

very minor readme.md changes

e82922f

Update async-await-let-else for drop tracking

9bcc107

Update issue-64130-4-async-move.rs

777db10

Update issue-68114.rs

5114cf3

Update issue-70935-complex-spans.rs

911c178

Update issue-65436-raw-ptr-not-send.rs

b950ae4

Update partial-drop-partial-reinit.rs

5671a76

Update must_not_suspend/ref.rs

87bb475

Remove unused body args

2be6301

Cleanup retrieve_closure_constraint_info

ff623ff

Better errors for implied static bound

c75817b

Use Predicate ConstraintCategory when normalizing

aae37f8

Also replace the placeholder for the stable_features lint

3a38d56

Rollup merge of rust-lang#101684 - zahash:readme-changes, r=jyn514

706e4d3

smol grammar changes to README.md smol grammar changes to README.md

Rollup merge of rust-lang#101772 - est31:replace_placeholder_diagnost…

94bc08d

…ics, r=jackh726 Also replace the placeholder for the stable_features lint Follow up of rust-lang#101215 and rust-lang#100591 . Fixes rust-lang#101766

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 14, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 14, 2022

bors merged commit a926696 into rust-lang:master Sep 14, 2022

rustbot added this to the 1.65.0 milestone Sep 14, 2022

This was referenced Sep 14, 2022

Stabilize let else #93628

Merged

Two mig-diag that fail ui test #101275

Closed

Reorder nesting scopes and declare bindings without drop schedule #101410

Merged

rustbot added the perf-regression Performance regression. label Sep 14, 2022

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 14, 2022

Dylan-DPC deleted the rollup-mpdlbin branch September 15, 2022 05:53

Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Sep 20, 2022

Mark-Simulacrum mentioned this pull request Sep 20, 2022

Emit a note that static bounds from HRTBs are a bug #101433

Merged

davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #101805

Rollup of 6 pull requests #101805

Dylan-DPC commented Sep 14, 2022

Dylan-DPC commented Sep 14, 2022

bors commented Sep 14, 2022

bors commented Sep 14, 2022

bors commented Sep 14, 2022

rust-timer commented Sep 14, 2022

rust-timer commented Sep 14, 2022

nnethercote commented Sep 14, 2022

rust-timer commented Sep 14, 2022

rust-timer commented Sep 14, 2022

nnethercote commented Sep 15, 2022

Mark-Simulacrum commented Sep 20, 2022

Rollup of 6 pull requests #101805

Rollup of 6 pull requests #101805

Conversation

Dylan-DPC commented Sep 14, 2022

Dylan-DPC commented Sep 14, 2022

bors commented Sep 14, 2022

bors commented Sep 14, 2022

bors commented Sep 14, 2022

rust-timer commented Sep 14, 2022

rust-timer commented Sep 14, 2022

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

nnethercote commented Sep 14, 2022

rust-timer commented Sep 14, 2022

rust-timer commented Sep 14, 2022

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

nnethercote commented Sep 15, 2022

Mark-Simulacrum commented Sep 20, 2022