Rollup of 14 pull requests #101295

matthiaskrgr · 2022-09-01T19:37:24Z

Successful merges:

Add special_module_name lint #94467 (Add special_module_name lint)
Use getuid to check instead of USER env var in rustbuild #100852 (Use getuid to check instead of USER env var in rustbuild)
bootstrap: Add llvm-has-rust-patches target option #101072 (bootstrap: Add llvm-has-rust-patches target option)
Make docs formulation more consistent for NonZero{int} #101190 (Make docs formulation more consistent for NonZero{int})
Remove unneeded where whitespace #101245 (Remove unneeded where whitespace)
Fix bad target name in Walkthrough #101251 (Fix bad target name in Walkthrough)
rustdoc: remove unused .docblock .impl-items CSS #101254 (rustdoc: remove unused .docblock .impl-items CSS)
Fixes/adjustments to Fuchsia doc walkthrough #101256 (Fixes/adjustments to Fuchsia doc walkthrough)
Update outdated comment about output capturing in print_to. #101270 (Update outdated comment about output capturing in print_to.)
Fix filename of armv4t-none-eabi.md #101271 (Fix filename of armv4t-none-eabi.md)
Fix typo in comment #101274 (Fix typo in comment)
Fix doc_auto_cfg for impl blocks in different modules with different cfg #101279 (Fix doc_auto_cfg for impl blocks in different modules with different cfg)
Do not suggest adding move to closure when move is already used #101285 (Do not suggest adding move to closure when move is already used)
rustdoc: remove unneeded CSS .content table td:first-child > a #101292 (rustdoc: remove unneeded CSS .content table td:first-child > a)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

This makes it consistent with `x.py` as changed in rust-lang#95671 Fixes rust-lang#100459

This is so you can check out an upstream commit in src/llvm-project and have everything just work.

Needed after changes in rust-lang#97513.

Use third person, as it is used for other std documentation.

Walkthrough currently say: ``` rustup target add aarch_64-fuchsia ``` but should say ``` rustup target add aarch64-fuchsia ```

The impl-items list stopped being nested inside a docblock since c1b1d68

The filename differed from the link in SUMMARY.md, causing it to 404.

This rule was added in c1c6175 to benefit the module items table. However, the module items table stopped using table tags when 6020c79 switched us over to grid layout.

Add `special_module_name` lint Declaring `lib` as a module is one of the most common beginner mistakes when trying to setup a binary and library target in the same crate. `special_module_name` lints against it, as well as `mod main;` ``` warning: found module declaration for main.rs --> $DIR/special_module_name.rs:4:1 | LL | mod main; | ^^^^^^^^^ | = note: a binary crate cannot be used as library warning: found module declaration for lib.rs --> $DIR/special_module_name.rs:1:1 | LL | mod lib; | ^^^^^^^^ | = note: `#[warn(special_module_name)]` on by default = note: lib.rs is the root of this crate's library target = help: to refer to it from other targets, use the library's name as the path ``` Note that the help message is not the best in that it doesn't provide an example of an import path (`the_actual_crate_name::`), and doesn't check whether the current file is part of a library/binary target to provide more specific error messages. I'm not sure where this lint would have to be run to access that information.

…lacrum Use `getuid` to check instead of `USER` env var in rustbuild This makes it consistent with `x.py` as changed in rust-lang#95671 Fixes rust-lang#100459

…mulacrum bootstrap: Add llvm-has-rust-patches target option This is so you can check out an upstream commit in src/llvm-project and have everything just work. This simplifies the logic in `is_rust_llvm` a bit; it doesn't need to check for download-ci-llvm because we would have already errored if both that and llvm-config were specified on the host platform.

Make docs formulation more consistent for NonZero{int} Use third person, as it is used for other `std` documentation.

…re-whitespace, r=notriddle Remove unneeded where whitespace It fixes these two bugs: ![Screenshot from 2022-08-31 18-14-40](https://user-images.githubusercontent.com/3050060/187727950-94657419-abfa-454c-9d27-004280fbcb45.png) ![Screenshot from 2022-08-31 18-14-49](https://user-images.githubusercontent.com/3050060/187727956-21d1b39d-62d7-4e7b-8f6f-631ceda67a19.png) It's a relic from a very old time (this commit: rust-lang@bfd01b7). You can test the result [here](https://rustdoc.crud.net/imperio/remove-unneeded-where-whitespace/lib2/struct.WhereWhitespace.html). cc `````````@jsha````````` r? `````````@notriddle`````````

Fix bad target name in Walkthrough Walkthrough currently say: ``` rustup target add aarch_64-fuchsia ``` but should say ``` rustup target add aarch64-fuchsia ```

…re-css, r=jsha rustdoc: remove unused `.docblock .impl-items` CSS The impl-items list stopped being nested inside a docblock since c1b1d68

… r=tmandry Fixes/adjustments to Fuchsia doc walkthrough Small fixes/adjustments missed during rust-lang#100927

…lett Update outdated comment about output capturing in print_to.

…_impl, r=notriddle Fix doc_auto_cfg for impl blocks in different modules with different `cfg` Fixes rust-lang#101129. Just like reexports, impl blocks don't necessarily share the same "space" as the item they implement so we need to merge attributes from its parents as well. r? `@notriddle`

…-when-closure-is-already-marked-as-move, r=oli-obk Do not suggest adding `move` to closure when `move` is already used Fixes rust-lang#101227

…first-child, r=GuillaumeGomez rustdoc: remove unneeded CSS `.content table td:first-child > a` This rule was added in c1c6175 to benefit the module items table. However, the module items table stopped using table tags when 6020c79 switched us over to grid layout.

matthiaskrgr · 2022-09-01T19:37:35Z

@bors r+ rollup=never p=14

bors · 2022-09-01T19:37:36Z

📌 Commit 1c12ded has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-09-01T22:12:36Z

⌛ Testing commit 1c12ded with merge 10706d6...

bors · 2022-09-02T00:53:43Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 10706d6 to master...

bors · 2022-09-02T00:53:44Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 10706d6 to master...

rust-timer · 2022-09-02T00:54:01Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha

previous master: 10706d62da

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-02T00:57:57Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101292	83abd0d47cca6babcf8aa2cbc717dc4be224461e
#101285	ff5c6a2e3eeb025006596ca7de16f8f7a57b8747
#101279	d3191247b17a806e5df88fb740ba418926f29e27
#101274	97a8485a82b585687c79af50f445907357317707
#101271	98d18d02c93caa17c51c761c7d9d04025db8f488
#101270	9492723120b01029176c9daa4bad6947cc1d4d75
#101256	9e2ab9407eefe3cd1cbde36b752e05dc19a335d4
#101254	2f46808343360bc505a3af2cd9bfc4bfe2385ba8
#101251	bad0d24f7f127faa82bf52af224268bd0aee1f22
#101245	f5d599e7dbf45b48a3e34b6f373c9a3ae55db996
#101190	f99c9a326699e91cd36c1a472e7e78458a6da927
#101072	903f8ea71fce3ebf680a8874d750d8638b29f73d
#100852	92adc8a918f12d5c1c53c3125f6f6d0d8ff8208b
#94467	afb84aa1be38761f797fb4ae4bdef7a3bc44ec8c

previous master: 2e35f954ad

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-02T04:20:21Z

Finished benchmarking commit (10706d6): comparison URL.

Overall result: ❌ regressions - 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.5%	[0.4%, 4.2%]	6
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.5%	[0.4%, 4.2%]	6

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
Regressions ❌ (secondary)	1.5%	[1.5%, 1.5%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.1%	[-8.6%, -3.3%]	3
All ❌✅ (primary)	-	-	0

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)	2.4%	[2.4%, 2.4%]	1
Regressions ❌ (secondary)	2.8%	[2.8%, 2.8%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.4%	[2.4%, 2.4%]	1

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

rylev · 2022-09-02T11:25:05Z

The regressions are all in the doc profile. One test case I looked at showed a 734% increase to the propagate-doc-cfg query which #101279 touches.

@rust-timer build d3191247b17a806e5df88fb740ba418926f29e27

rust-timer · 2022-09-02T11:25:07Z

Queued d3191247b17a806e5df88fb740ba418926f29e27 with parent 2e35f95, future comparison URL.

rust-timer · 2022-09-02T13:26:59Z

Finished benchmarking commit (d3191247b17a806e5df88fb740ba418926f29e27): comparison URL.

Overall result: ❌ regressions - 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)	1.4%	[0.3%, 4.3%]	7
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.4%	[0.3%, 4.3%]	7

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)	5.3%	[4.0%, 6.5%]	2
Regressions ❌ (secondary)	7.3%	[6.0%, 8.6%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.3%	[-9.1%, -3.3%]	3
All ❌✅ (primary)	5.3%	[4.0%, 6.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)	2.7%	[2.7%, 2.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.7%	[2.7%, 2.7%]	1

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

rylev · 2022-09-02T14:22:57Z

@GuillaumeGomez @notriddle it indeed looks like #101279 is responsible for these regressions.

GuillaumeGomez · 2022-09-02T14:26:28Z

Yes, a bugfix where some cfg attributes where not retrieved as expected on impl blocks. Fixed by browsing through parents and merging with their cfg attributes.

rylev · 2022-09-06T13:07:16Z

Since this was for a bug fix and we tend to be a bit more lenient with rustdoc regressions, I'll go ahead and mark this as triaged.

@rustbot label +perf-regression-triaged

ibraheemdev and others added 30 commits February 28, 2022 20:10

add special_module_name lint

4dded23

tidy

c08f460

move dummy test module to auxiliary directory

f479289

special_module_name: ignore inline modules

4fdf43f

Use getuid to check instead of USER env var in rustbuild

b9c47f6

This makes it consistent with `x.py` as changed in rust-lang#95671 Fixes rust-lang#100459

bootstrap: Add llvm-has-rust-patches target option

e136e02

This is so you can check out an upstream commit in src/llvm-project and have everything just work.

Ignore cargo target folder in src/bootstrap

73958fd

Needed after changes in rust-lang#97513.

Make docs formulation more consistent for NonZero{int}

de6a3ec

Use third person, as it is used for other std documentation.

Remove unneeded extra whitespace before where clause

803e35a

Update rustdoc tests

4304d1d

Add rustdoc GUI test

b112bfe

Fix bad target name in Walkthrough

a928255

Walkthrough currently say: ``` rustup target add aarch_64-fuchsia ``` but should say ``` rustup target add aarch64-fuchsia ```

rustdoc: remove unused .docblock .impl-items CSS

037a911

The impl-items list stopped being nested inside a docblock since c1b1d68

Tweaks to fuchsia doc walkthrough

d8b572b

Update outdated comment about output capturing in print_to.

a20318d

Fix filename of armv4t-none-eabi.md

098725c

The filename differed from the link in SUMMARY.md, causing it to 404.

Fix typo in comment

c9f4af6

Correctly merge impl block cfg attributes with its parents

fb14ad0

Add regression test for rust-lang#101129

68d0094

do not suggest adding move to closure when move is already used

78e9bea

rustdoc: remove unneeded CSS .content table td:first-child > a

3107133

This rule was added in c1c6175 to benefit the module items table. However, the module items table stopped using table tags when 6020c79 switched us over to grid layout.

Rollup merge of rust-lang#100852 - Samyak2:samyak/100459, r=Mark-Simu…

b05f97d

…lacrum Use `getuid` to check instead of `USER` env var in rustbuild This makes it consistent with `x.py` as changed in rust-lang#95671 Fixes rust-lang#100459

Rollup merge of rust-lang#101190 - yjhn:patch-1, r=Mark-Simulacrum

36d0506

Make docs formulation more consistent for NonZero{int} Use third person, as it is used for other `std` documentation.

Rollup merge of rust-lang#101251 - diminishedprime:patch-1, r=JohnTitor

f6c7c4e

Fix bad target name in Walkthrough Walkthrough currently say: ``` rustup target add aarch_64-fuchsia ``` but should say ``` rustup target add aarch64-fuchsia ```

Rollup merge of rust-lang#101254 - rust-lang:notriddle/remove-even-mo…

418748f

…re-css, r=jsha rustdoc: remove unused `.docblock .impl-items` CSS The impl-items list stopped being nested inside a docblock since c1b1d68

Rollup merge of rust-lang#101256 - andrewpollack:fuchsia-docs-adding,…

cbcea24

… r=tmandry Fixes/adjustments to Fuchsia doc walkthrough Small fixes/adjustments missed during rust-lang#100927

Rollup merge of rust-lang#101270 - m-ou-se:update-comment, r=joshtrip…

b36fd55

…lett Update outdated comment about output capturing in print_to.

matthiaskrgr added 3 commits September 1, 2022 21:37

Rollup merge of rust-lang#101285 - TaKO8Ki:do-not-suggest-adding-move…

1bafe0b

…-when-closure-is-already-marked-as-move, r=oli-obk Do not suggest adding `move` to closure when `move` is already used Fixes rust-lang#101227

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 1, 2022

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

bors merged commit 10706d6 into rust-lang:master Sep 2, 2022

rustbot added this to the 1.65.0 milestone Sep 2, 2022

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

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

rustbot added the perf-regression-triaged The performance regression has been triaged. label Sep 6, 2022

matthiaskrgr deleted the rollup-046o38p branch October 9, 2022 00:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 14 pull requests #101295

Rollup of 14 pull requests #101295

matthiaskrgr commented Sep 1, 2022

matthiaskrgr commented Sep 1, 2022

bors commented Sep 1, 2022

bors commented Sep 1, 2022

bors commented Sep 2, 2022

bors commented Sep 2, 2022

rust-timer commented Sep 2, 2022

rust-timer commented Sep 2, 2022

rust-timer commented Sep 2, 2022

rylev commented Sep 2, 2022

rust-timer commented Sep 2, 2022

rust-timer commented Sep 2, 2022

rylev commented Sep 2, 2022

GuillaumeGomez commented Sep 2, 2022

rylev commented Sep 6, 2022

Rollup of 14 pull requests #101295

Rollup of 14 pull requests #101295

Conversation

matthiaskrgr commented Sep 1, 2022

matthiaskrgr commented Sep 1, 2022

bors commented Sep 1, 2022

bors commented Sep 1, 2022

bors commented Sep 2, 2022

bors commented Sep 2, 2022

rust-timer commented Sep 2, 2022

rust-timer commented Sep 2, 2022

rust-timer commented Sep 2, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

rylev commented Sep 2, 2022

rust-timer commented Sep 2, 2022

rust-timer commented Sep 2, 2022

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

rylev commented Sep 2, 2022

GuillaumeGomez commented Sep 2, 2022

rylev commented Sep 6, 2022