Rollup of 5 pull requests #104017

matthiaskrgr · 2022-11-05T17:06:08Z

Successful merges:

rustdoc: add hash to filename of toolchain files #101702 (rustdoc: add hash to filename of toolchain files)
Move browser opening logic in Builder #103920 (Move browser opening logic in Builder)
Do not make typo suggestions when suggesting pattern matching #103927 (Do not make typo suggestions when suggesting pattern matching)
Remove an option and choose a behaviour-preserving default instead. #103972 (Remove an option and choose a behaviour-preserving default instead.)
Fix search result bottom border color #103988 (Fix search result bottom border color)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

All static files used by rustdoc are now stored in static.files/ and include a hash of their contents. They no longer include the contents of the --resource-suffix flag. This clarifies caching semantics. Anything in static.files can use Cache-Control: immutable because any updates will show up as a new URL. Invocation-specific files like crates-NN.js, search-index-NN.js, and sidebar-items-NN.js still get the resource suffix. The --disable-minification flag is removed because it would vary the output of static files based on invocation flags. Instead, for rustdoc development purposes it's preferable to symlink static files to a non-minified copy for quick iteration.

Co-authored-by: Michael Howell <michael@notriddle.com>

This allows open() to be called from other places in bootstrap (I need this for Ferrocene), and it simplifies the callers by moving the "was_invoked_explicitly" check into the function.

Fixes rust-lang#103909.

…illaumeGomez rustdoc: add hash to filename of toolchain files All static files used by rustdoc are now stored in static.files/ and their filenames include a hash of their contents. Their filenames no longer include the contents of the --resource-suffix flag. This clarifies caching semantics. Anything in static.files can use Cache-Control: immutable because any updates will show up as a new URL. Invocation-specific files like crates-NN.js, search-index-NN.js, and sidebar-items-NN.js still get the resource suffix. This has a useful side effect: once toolchain files aren't affected by resource suffix, it will become possible for docs.rs to include crate version in the resource suffix. That should fix a caching issue with `/latest/` URLs: rust-lang/docs.rs#1593. My goal is that it should be safe to serve all rustdoc JS, CSS, and fonts with infinite caching headers, even when new versions of a crate are uploaded in the same place as old versions. The --disable-minification flag is removed because it would vary the output of static files based on invocation flags. Instead, for rustdoc development purposes it's preferable to symlink static files to a non-minified copy for quick iteration. Example listing: ``` $ cd build/x86_64-unknown-linux-gnu/doc/ && find . | egrep 'js$|css$' | egrep -v 'sidebar-items|implementors' | sort ./crates1.65.0.js ./rust.css ./search-index1.65.0.js ./source-files1.65.0.js ./static.files/ayu-2bfd0af01c176fd5.css ./static.files/dark-95d11b5416841799.css ./static.files/light-c83a97e93a11f15a.css ./static.files/main-efc63f77fb116394.js ./static.files/normalize-76eba96aa4d2e634.css ./static.files/noscript-5bf457055038775c.css ./static.files/rustdoc-7a422337900fa894.css ./static.files/scrape-examples-3dd10048bcead3a4.js ./static.files/search-47f3c289722672cf.js ./static.files/settings-17b08337296ac774.js ./static.files/settings-3f95eacb845293c0.css ./static.files/source-script-215e9db86679192e.js ./static.files/storage-26d846fcae82ff09.js ``` Fixes rust-lang#98413

…, r=jyn514 Move browser opening logic in `Builder` This allows `open()` to be called from other places in bootstrap (I need this for Ferrocene, as we keep our custom steps in `src/bootstrap/ferrocene`), and it simplifies the callers by moving the `was_invoked_explicitly` check into the function.

…en-pattern-matching, r=cjgillot Do not make typo suggestions when suggesting pattern matching Fixes rust-lang#103909.

Remove an option and choose a behaviour-preserving default instead. r? ``@fee1-dead``

…olor, r=notriddle Fix search result bottom border color It reverts a color change while keeping the improvement made in rust-lang#103938. I think it'll need to be backported once merged too. r? `@notriddle`

matthiaskrgr · 2022-11-05T17:06:28Z

@bors r+ rollup=never p=5

bors · 2022-11-05T17:06:30Z

📌 Commit e51e4a4 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-11-05T17:39:19Z

⌛ Testing commit e51e4a4 with merge 371100b...

bors · 2022-11-05T20:38:57Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 371100b to master...

rust-timer · 2022-11-05T20:40:25Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#103988	d4596259d80d288e92d2bb6bc37e95d31d476b43
#103972	39d6ef120b09fc68971461fce716648b41ee344b
#103927	978539163e7653d1d7b49c1b00fbdd61df903fce
#103920	8452883c9c6110422aae9d3320b4cbccaa22173e
#101702	8ff3741f43df442a668982e6a2838d745dd77e75

previous master: 6b8d9dd0a0

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-11-05T23:11:22Z

Finished benchmarking commit (371100b): 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)	1.4%	[1.4%, 1.4%]	1
Regressions ❌ (secondary)	0.5%	[0.3%, 0.8%]	2
Improvements ✅ (primary)	-1.0%	[-3.2%, -0.3%]	13
Improvements ✅ (secondary)	-2.3%	[-3.1%, -0.6%]	19
All ❌✅ (primary)	-0.9%	[-3.2%, 1.4%]	14

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)	0.5%	[0.5%, 0.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-1.9%	[-2.1%, -1.7%]	3
All ❌✅ (primary)	-0.1%	[-0.7%, 0.5%]	2

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)	-	-	0
Improvements ✅ (primary)	-1.9%	[-3.2%, -0.5%]	2
Improvements ✅ (secondary)	-3.1%	[-3.7%, -2.1%]	13
All ❌✅ (primary)	-1.9%	[-3.2%, -0.5%]	2

jsha and others added 15 commits October 29, 2022 12:47

Make --static-root-path point to static.files

bf25334

Generate static file hashes once

0b0bf10

Move string literal into format string

c9dbfe3

Co-authored-by: Michael Howell <michael@notriddle.com>

move browser opening logic in Builder

6bc36d1

This allows open() to be called from other places in bootstrap (I need this for Ferrocene), and it simplifies the callers by moving the "was_invoked_explicitly" check into the function.

address review comment

5e4618f

Remove an option and choose a behaviour-preserving default instead.

a2325fe

Do not make typo suggestions when suggesting pattern matching

b1994ce

Fixes rust-lang#103909.

Fix search result bottom border color

94ba7f0

Update GUI test for bottom border color

666873b

Rollup merge of rust-lang#103927 - fee1-dead-contrib:E0425-no-typo-wh…

51287f2

…en-pattern-matching, r=cjgillot Do not make typo suggestions when suggesting pattern matching Fixes rust-lang#103909.

Rollup merge of rust-lang#103972 - oli-obk:unoptional, r=fee1-dead

cf2d88d

Remove an option and choose a behaviour-preserving default instead. r? ``@fee1-dead``

Rollup merge of rust-lang#103988 - GuillaumeGomez:fix-bottom-border-c…

e51e4a4

…olor, r=notriddle Fix search result bottom border color It reverts a color change while keeping the improvement made in rust-lang#103938. I think it'll need to be backported once merged too. r? `@notriddle`

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 Nov 5, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 5, 2022

bors merged commit 371100b into rust-lang:master Nov 5, 2022

rustbot added this to the 1.67.0 milestone Nov 5, 2022

bors mentioned this pull request Nov 5, 2022

Only load one CSS theme by default #103971

Closed

rustbot added the perf-regression Performance regression. label Nov 5, 2022

matthiaskrgr deleted the rollup-k8i0j9m branch December 22, 2022 10:46

matthiaskrgr mentioned this pull request Nov 21, 2023

ice: ProjectionKinds Deref and Field were mismatched #118144

Closed

Jules-Bertholet mentioned this pull request Dec 29, 2023

ice: Field projection applied to a type other than Adt or Tuple with -Wrust-2021-incompatible-closure-captures #119382

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests #104017

Rollup of 5 pull requests #104017

Uh oh!

matthiaskrgr commented Nov 5, 2022

Uh oh!

matthiaskrgr commented Nov 5, 2022

Uh oh!

bors commented Nov 5, 2022

Uh oh!

bors commented Nov 5, 2022

Uh oh!

bors commented Nov 5, 2022

Uh oh!

rust-timer commented Nov 5, 2022

Uh oh!

rust-timer commented Nov 5, 2022

Uh oh!

Uh oh!

Rollup of 5 pull requests #104017

Rollup of 5 pull requests #104017

Uh oh!

Conversation

matthiaskrgr commented Nov 5, 2022

Uh oh!

matthiaskrgr commented Nov 5, 2022

Uh oh!

bors commented Nov 5, 2022

Uh oh!

bors commented Nov 5, 2022

Uh oh!

bors commented Nov 5, 2022

Uh oh!

rust-timer commented Nov 5, 2022

Uh oh!

rust-timer commented Nov 5, 2022

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Uh oh!