Rollup of 13 pull requests #100426

matthiaskrgr · 2022-08-11T20:53:11Z

Successful merges:

rustdoc: make item-infos dimmer on dark theme #93896 (rustdoc: make item-infos dimmer on dark theme)
rustdoc: simplify highlight.rs #99337 (rustdoc: simplify highlight.rs)
add crt-static for android #99421 (add crt-static for android)
Fix flags when using clang as linker for Fuchsia #99500 (Fix flags when using clang as linker for Fuchsia)
make raw_eq precondition more restrictive #99511 (make raw_eq precondition more restrictive)
Add x.sh and x.ps1 shell scripts #99992 (Add x.sh and x.ps1 shell scripts)
Fix test: chunks_mut_are_send_and_sync #100112 (Fix test: chunks_mut_are_send_and_sync)
provide correct size hint for unsupported platform CommandArgs #100203 (provide correct size hint for unsupported platform CommandArgs)
Fix #96847 #100307 (Fix internal error: entered unreachable code: in literal form when lowering mac args eq #96847)
Stringify non-shorthand visibility correctly #100350 (Stringify non-shorthand visibility correctly)
Improve crate selection on rustdoc search results page #100374 (Improve crate selection on rustdoc search results page)
Simplify visitors #100392 (Simplify visitors)
Add stability attributes to BacktraceStatus variants #100418 (Add stability attributes to BacktraceStatus variants)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Co-authored-by: Marco Colombo <mar.colombo13@gmail.com>

This is a more ambitious version of rust-lang#98716. It still changes the shebang back to python3, for compatibility with non-Unix systems, but also adds alternative entrypoints for systems without `python3` installed. These scripts will be necessary for the rust entrypoint (rust-lang#94829), so I see little downside in adding them early.

To get around the "following path contains more than 968 entries, you should move the test to some relevant subdirectory" tidy error.

Split render_with_highlighting, which took many optional parameters, into three functions for specific purposes, which each take a smaller number of mostly required parameters. Remove some plumbing to pass through an "edition" parameter, which was used solely to avoid highlighting some 2021 Edition keywords in non-2021 code.

Resolves all of issue rust-lang#93240 Reproduces a similar change as rust-lang#99086, but with improvements In particular, this PR inlcludes: * redesigning the crate-search selector so the background color matches its surroundings * decrease the font of the dropdown menu to a reaonable size * add a hover effect * make the color of the arrow theme-dependent, using a surrounding div, with :after pseudo-element that can then be transformed using CSS filters to approximate the desired color * fix the text "in" to match the title font * remove the "for xyz" in the "Results for xyz in [All crates]" title when searching for search term "xyz"; you can already see what you're searching for as it's typed in the search bar! * in line with rust-lang#99086, handle super-long crate names appropriately without a long <select> element escaping the screen area; the improvement is that we also keep the title within a single line now; uses some flex layout shenanigans... * the margins / paddings are adjusted so the selected label of the <select> fits within the rest of that title nicely; also some inconsistency in the way that Firefox renders a <select> with "appearance: none" (roughly 4px more padding left and right of the text than e.g. Chrome) is worked around, and it now produces a result that looks (essentially) identical to Chrome * the color of the help menu and settings menu border in light theme is made to match with the color of the corresponding buttons, like they do (match) in the ayu theme * the casing of "All crates" changes to "all crates" * the new tests from rust-lang#99086 are temporarily disabled, until they can be adapted later

Fix oversight duplicate property left in CSS (dark theme). Improve wording in comment that mentions `appearance: none`

Previously the item-info background colors were too bright for a dark theme, making a bright rectangle that draws the attention.

Co-authored-by: Frank Steffahn <fdsteffahn@gmail.com>

Don't add C runtime or set dynamic linker when linking with clang for Fuchsia. Clang already does this for us.

It has four arguments that are never used. This avoids lots of argument passing in functions that feed into `visit_variant_data`.

It's passed three arguments that are never used.

It is passed an argument that is never used.

Fixes rust-lang#96847.

Co-authored-by: Nicholas Nethercote <n.nethercote@gmail.com>

Fixes rust-lang#100399

rustdoc: make item-infos dimmer on dark theme Previously the item-info background colors were too bright for a dark theme, making a bright rectangle that draws the attention. Demo: https://rustdoc.crud.net/jsha/dark-colors/std/os/linux/process/struct.PidFd.html https://rustdoc.crud.net/jsha/dark-colors/std/error/trait.Error.html#method.description Before: <img width=300 src="https://user-images.githubusercontent.com/220205/153565049-f35ee83e-181d-491c-b2af-7cce1baa4912.png"> After: <img width=300 src="https://user-images.githubusercontent.com/220205/181166727-b4218e96-daf1-46cd-a2df-5fd870eaa857.png"> r? `@GuillaumeGomez`

…eGomez rustdoc: simplify highlight.rs Split render_with_highlighting, which took many optional parameters, into three functions for specific purposes, which each take a smaller number of mostly required parameters. Remove some plumbing to pass through an "edition" parameter, which was used solely to avoid highlighting some 2021 Edition keywords in non-2021 code. I've tested a build of std docs before and after, and this does not change the generated HTML at all. Followup from rust-lang#91264 (comment) r? ```@GuillaumeGomez```

…rochenkov add crt-static for android

Fix flags when using clang as linker for Fuchsia Don't add C runtime or set dynamic linker when linking with clang for Fuchsia. Clang already does this for us.

make raw_eq precondition more restrictive Specifically, don't allow comparing pointers that way. Comparing pointers is subtle because you have to talk about what happens to the provenance. This matches what [Miri already implements](https://play.rust-lang.org/?version=nightly&mode=debug&edition=2021&gist=9eb1dfb8a61b5a2d4a7cee43df2717af), and all existing users are fine with this. If raw_eq on pointers is ever desired, we can adjust the intrinsic spec and Miri implementation as needed, but for now that seems just unnecessary. Also, this is a const intrinsic, and in const, comparing pointers this way is *not possible* -- so if we allow the intrinsic to compare pointers in general, we need to impose an extra restrictions saying that in const-context, pointers are *not* okay.

…crum Add `x.sh` and `x.ps1` shell scripts This is a more ambitious version of rust-lang#98716. It still changes the x.py shebang back to python3, for compatibility with non-Unix systems, but also adds alternative entrypoints for systems without `python3` installed. These scripts will be necessary for the rust entrypoint (rust-lang#94829), so I see little downside in adding them early. I'll update the dev-guide to suggest using these instead of x.py once this is merged. Fixes rust-lang#98650 r? `@Mark-Simulacrum` cc `@dtolnay` `@CAD97` `@yoshuawuyts`

…-ou-se Fix test: chunks_mut_are_send_and_sync Follow-up to rust-lang#100023 to make the test actually effective

rust-timer · 2022-08-12T00:16:23Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#100418	66f7d7a347021235aebb25b103d3e1c934784d74
#100392	23936af287657fa4148aeab40cc2a780810fae52
#100374	c7c70456732e771da919afeccc998a9f942a94fe
#100350	0676a36399489aedf78c76ec5399f73c948f74bc
#100307	5832462aa1d9373b24ace96ad2c50b7a18af9952
#100203	afaef205ea1fee5729e725dd956e63d7772197b6
#100112	e0db87dd1f10243c55fae3dd7792473232a76d4b
#99992	1c35984ac8499845719c34e78085a2a906a02ae9
#99511	ef6a21aa65f44314c8bc9692cea606e18a08d141
#99500	05e76cc0e1b3a757d04277ba1afb50109f997378
#99421	33ef7b3c3ca37bc9301f85842138cedc1306d170
#99337	f370320e21804276c98109442f99598af33d7cce
#93896	f2c6f4b07ca370fd696dae4fbbf57b13c542516e

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-08-12T03:26:05Z

Finished benchmarking commit (2ed0f29): comparison url.

Instruction count

Primary benchmarks: mixed results
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions ❌ (primary)	0.3%	0.4%	4
Regressions ❌ (secondary)	0.5%	0.7%	5
Improvements ✅ (primary)	-0.9%	-0.9%	1
Improvements ✅ (secondary)	-1.8%	-1.8%	1
All ❌✅ (primary)	0.0%	-0.9%	5

Max RSS (memory usage)

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

Cycles

Results

Primary benchmarks: ❌ relevant regression found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions ❌ (primary)	2.1%	2.1%	1
Regressions ❌ (secondary)	4.9%	5.9%	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	-3.0%	2
All ❌✅ (primary)	2.1%	2.1%	1

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
cc @rust-lang/wg-compiler-performance

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

rylev · 2022-08-12T08:45:43Z

Going to do perf runs for a few of these:

@rust-timer build 5832462aa1d9373b24ace96ad2c50b7a18af9952 (#100307)
@rust-timer build 23936af287657fa4148aeab40cc2a780810fae52 (#100392)

rust-timer · 2022-08-12T08:45:45Z

Queued 5832462aa1d9373b24ace96ad2c50b7a18af9952 with parent 20ffea6, future comparison URL.

rylev · 2022-08-12T09:56:28Z

If anyone is curious why this only kicked off one build: rust-lang/rustc-perf#1396

rust-timer · 2022-08-12T10:00:36Z

Finished benchmarking commit (5832462aa1d9373b24ace96ad2c50b7a18af9952): comparison url.

Instruction count

Primary benchmarks: ❌ relevant regressions found
Secondary benchmarks: ❌ relevant regression found

	mean¹	max	count²
Regressions ❌ (primary)	0.2%	0.2%	2
Regressions ❌ (secondary)	0.6%	0.6%	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	0.2%	2

Max RSS (memory usage)

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: ✅ relevant improvement found

	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.9%	-2.9%	1
All ❌✅ (primary)	-	-	0

Cycles

Results

Primary benchmarks: ❌ relevant regressions found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions ❌ (primary)	2.8%	3.0%	2
Regressions ❌ (secondary)	2.8%	3.2%	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.7%	-2.7%	1
All ❌✅ (primary)	2.8%	3.0%	2

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

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.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

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

rylev · 2022-08-12T10:02:23Z

And now the other one:

@rust-timer build 23936af287657fa4148aeab40cc2a780810fae52 (#100392)

rust-timer · 2022-08-12T10:02:24Z

Queued 23936af287657fa4148aeab40cc2a780810fae52 with parent 20ffea6, future comparison URL.

rust-timer · 2022-08-12T11:17:25Z

Finished benchmarking commit (23936af287657fa4148aeab40cc2a780810fae52): comparison url.

Instruction count

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

Max RSS (memory usage)

Results

Primary benchmarks: ✅ relevant improvement found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.6%	-2.6%	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.6%	-2.6%	1

Cycles

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: ✅ relevant improvements found

	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.1%	-3.3%	2
All ❌✅ (primary)	-	-	0

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

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.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

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

rylev · 2022-08-12T11:41:04Z

And one last one (as I finally noticed that most of the regressions were in rustdoc):

@rust-timer build f370320e21804276c98109442f99598af33d7cce (#99337)

rust-timer · 2022-08-12T11:41:06Z

Queued f370320e21804276c98109442f99598af33d7cce with parent 20ffea6, future comparison URL.

rust-timer · 2022-08-12T15:09:08Z

Finished benchmarking commit (f370320e21804276c98109442f99598af33d7cce): comparison url.

Instruction count

Primary benchmarks: ❌ relevant regressions found
Secondary benchmarks: ❌ relevant regressions found

	mean¹	max	count²
Regressions ❌ (primary)	0.3%	0.4%	8
Regressions ❌ (secondary)	0.4%	0.7%	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	0.4%	8

Max RSS (memory usage)

Results

Primary benchmarks: ✅ relevant improvement found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.5%	3.5%	1
Improvements ✅ (primary)	-4.6%	-4.6%	1
Improvements ✅ (secondary)	-2.9%	-2.9%	1
All ❌✅ (primary)	-4.6%	-4.6%	1

Cycles

Results

Primary benchmarks: ❌ relevant regression found
Secondary benchmarks: ✅ relevant improvement found

	mean¹	max	count²
Regressions ❌ (primary)	2.5%	2.5%	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.1%	-3.1%	1
All ❌✅ (primary)	2.5%	2.5%	1

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

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

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

rylev · 2022-08-12T16:31:42Z

Definitely looks like #99337 is the cause of these perf regressions. We normally have a bit more tolerance for rustdoc perf regressions and these numbers are by no means large.

cc @jsha @GuillaumeGomez

GuillaumeGomez · 2022-08-12T16:34:19Z

I'm surprised there is an impact on performance at all. But it was a code improvement change so I think it's still worth it and we expect that it will be reverted with the changes we're currently doing on this part of rustdoc.

Mark-Simulacrum · 2022-08-16T13:22:21Z

Marking as triaged. I think the regression is within the bounds we don't need to track the fix closely, though it's great that it sounds like there will be work that may improve things in this area.

RalfJung and others added 30 commits July 20, 2022 10:22

make raw_eq precondition more restrictive

5848c27

fix typo

2d1c683

Co-authored-by: Marco Colombo <mar.colombo13@gmail.com>

actually call assert_send_and_sync

a61c841

provide correct size hint for unsupported platform CommandArgs

725da87

Move JSON tests into a directory.

c32969d

To get around the "following path contains more than 968 entries, you should move the test to some relevant subdirectory" tidy error.

Stringify non-shorthand visibility correctly

be5672e

Two small improvements:

e957480

Fix oversight duplicate property left in CSS (dark theme). Improve wording in comment that mentions `appearance: none`

Add missing ID into the ID map

107e039

Update GUI test

ea05be2

rustdoc: make item-infos dimmer on dark theme rust-lang#93896

20cc5f9

Previously the item-info background colors were too bright for a dark theme, making a bright rectangle that draws the attention.

add crt-static for android

874ee5b

grammar

d1cace5

Co-authored-by: Frank Steffahn <fdsteffahn@gmail.com>

Fix flags when using clang as linker for Fuchsia

55d5dcb

Don't add C runtime or set dynamic linker when linking with clang for Fuchsia. Clang already does this for us.

Simplify rustc_hir::intravisit::Visitor::visit_variant_data.

8c53038

It has four arguments that are never used. This avoids lots of argument passing in functions that feed into `visit_variant_data`.

Simplify rustc_ast::visit::Visitor::visit_enum_def.

421125f

It's passed three arguments that are never used.

Simplify rustc_ast::visit::Visitor::visit_poly_trait_ref.

232bd80

It is passed an argument that is never used.

Simplify rustc_hir::intravisit::Visitor::visit_enum_def.

b8b851f

It is passed an argument that is never used.

Avoid lowering a MacArgs::Eq twice.

ce78042

Fixes rust-lang#96847.

more typos

338d7c2

Co-authored-by: Nicholas Nethercote <n.nethercote@gmail.com>

Add stability attributes to BacktraceStatus variants

121fab0

Fixes rust-lang#100399

Rollup merge of rust-lang#99421 - Bryanskiy:android-crt-static, r=pet…

6737549

…rochenkov add crt-static for android

Rollup merge of rust-lang#99500 - tmandry:fuchsia-flags, r=petrochenkov

92b32e3

Fix flags when using clang as linker for Fuchsia Don't add C runtime or set dynamic linker when linking with clang for Fuchsia. Clang already does this for us.

Rollup merge of rust-lang#100112 - RalfJung:assert_send_and_sync, r=m…

275d4e7

…-ou-se Fix test: chunks_mut_are_send_and_sync Follow-up to rust-lang#100023 to make the test actually effective

bors merged commit 2ed0f29 into rust-lang:master Aug 12, 2022

rustbot added this to the 1.65.0 milestone Aug 12, 2022

rustbot added the perf-regression Performance regression. label Aug 12, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed perf-regression Performance regression. labels Aug 12, 2022

rylev added the perf-regression Performance regression. label Aug 12, 2022

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

ehuss mentioned this pull request Aug 24, 2022

Bisect through rollups using perf.rlo's individual PR artifacts rust-lang/cargo-bisect-rustc#202

Closed

matthiaskrgr deleted the rollup-0ks4dou branch October 9, 2022 00:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 13 pull requests #100426

Rollup of 13 pull requests #100426

matthiaskrgr commented Aug 11, 2022

rust-timer commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rylev commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rylev commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rylev commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rylev commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rylev commented Aug 12, 2022

GuillaumeGomez commented Aug 12, 2022

Mark-Simulacrum commented Aug 16, 2022

Rollup of 13 pull requests #100426

Rollup of 13 pull requests #100426

Conversation

matthiaskrgr commented Aug 11, 2022

rust-timer commented Aug 12, 2022

rust-timer commented Aug 12, 2022

Footnotes

rylev commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rylev commented Aug 12, 2022

rust-timer commented Aug 12, 2022

Footnotes

rylev commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rust-timer commented Aug 12, 2022

Footnotes

rylev commented Aug 12, 2022

rust-timer commented Aug 12, 2022

rust-timer commented Aug 12, 2022

Footnotes

rylev commented Aug 12, 2022

GuillaumeGomez commented Aug 12, 2022

Mark-Simulacrum commented Aug 16, 2022