Rollup of 7 pull requests by matthiaskrgr · Pull Request #108771 · rust-lang/rust

matthiaskrgr · 2023-03-05T13:29:11Z

Successful merges:

Ignore files in .gitignore in tidy #106440 (Ignore files in .gitignore in tidy)
Remove llvm.skip-rebuild option #108613 (Remove llvm.skip-rebuild option)
Sync codegen defaults with compiler defaults and add a ping message so they stay in sync #108616 (Sync codegen defaults with compiler defaults and add a ping message so they stay in sync)
Rename src/etc/vscode_settings.json to rust_analyzer_settings.json #108618 (Rename src/etc/vscode_settings.json to rust_analyzer_settings.json)
rustdoc-json: switch from HashMap to FxHashMap to fix non-determinism #108626 (rustdoc-json: switch from HashMap to FxHashMap to fix non-determinism)
Don't ICE when encountering bound var in builtin copy/clone bounds #108744 (Don't ICE when encountering bound var in builtin copy/clone bounds)
Clean up rustdoc-js tester.js file #108749 (Clean up rustdoc-js tester.js file)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

This was added to in 2019 to speed up rebuild times when LLVM was modified. Now that download-ci-llvm exists, I don't think it makes sense to support an unsound option like this that can lead to miscompiles; and the code cleanup is nice too.

Signed-off-by: ozkanonur <work@onurozkan.dev>

…o they stay in sync

- Switch from `walkdir` to `ignore`. This required various changes to make `skip` thread-safe. - Ignore `build` anywhere in the source tree, not just at the top-level. We support this in bootstrap, we should support it in tidy too. As a nice side benefit, this also makes tidy a bit faster. Before: ``` ; hyperfine -i '"/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/home/gh-jyn514/rust2" "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0/bin/cargo" "/home/gh-jyn514/rust2/build" "32"' Benchmark 1: "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/home/gh-jyn514/rust2" "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0/bin/cargo" "/home/gh-jyn514/rust2/build" "32" Time (mean ± σ): 1.080 s ± 0.008 s [User: 2.616 s, System: 3.243 s] Range (min … max): 1.069 s … 1.099 s 10 runs ``` After: ``` ; hyperfine '"/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/home/gh-jyn514/rust2" "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0/bin/cargo" "/home/gh-jyn514/rust2/build" "32"' Benchmark 1: "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/home/gh-jyn514/rust2" "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0/bin/cargo" "/home/gh-jyn514/rust2/build" "32" Time (mean ± σ): 705.0 ms ± 1.4 ms [User: 3179.1 ms, System: 1517.5 ms] Range (min … max): 702.3 ms … 706.9 ms 10 runs ```

`WalkBuilder` handles top-level paths differently than `fn walk` used to: it doesn't run the `skip` function to determine if it should be skipped, instead assuming the top-level function is always included. This is a reasonable assumption; adapt our code so it doesn't make pointless calls to `walk`.

Ignore files in .gitignore in tidy - Switch from `walkdir` to `ignore`. This required various changes to make `skip` thread-safe. - Ignore `build` anywhere in the source tree, not just at the top-level. We support this in bootstrap, we should support it in tidy too. As a nice side benefit, this also makes tidy a bit faster. Before: ``` ; hyperfine -i '"/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/home/gh-jyn514/rust2" "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0/bin/cargo" "/home/gh-jyn514/rust2/build" "32"' Benchmark 1: "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/home/gh-jyn514/rust2" "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0/bin/cargo" "/home/gh-jyn514/rust2/build" "32" Time (mean ± σ): 1.080 s ± 0.008 s [User: 2.616 s, System: 3.243 s] Range (min … max): 1.069 s … 1.099 s 10 runs ``` After: ``` ; hyperfine '"/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/home/gh-jyn514/rust2" "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0/bin/cargo" "/home/gh-jyn514/rust2/build" "32"' Benchmark 1: "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-tidy" "/home/gh-jyn514/rust2" "/home/gh-jyn514/rust2/build/aarch64-unknown-linux-gnu/stage0/bin/cargo" "/home/gh-jyn514/rust2/build" "32" Time (mean ± σ): 705.0 ms ± 1.4 ms [User: 3179.1 ms, System: 1517.5 ms] Range (min … max): 702.3 ms … 706.9 ms 10 runs ``` r? `@the8472`

…ulacrum Remove `llvm.skip-rebuild` option This was added to in 2019 to speed up rebuild times when LLVM was modified. Now that download-ci-llvm exists, I don't think it makes sense to support an unsound option like this that can lead to miscompiles; and the code cleanup is nice too. r? `@Mark-Simulacrum` cc `@varkor` rust-lang#65612

Sync codegen defaults with compiler defaults and add a ping message so they stay in sync Looks like this got missed in rust-lang#107241.

Rename `src/etc/vscode_settings.json` to `rust_analyzer_settings.json` Fixes rust-lang#108614

…aDotInTheVoid rustdoc-json: switch from HashMap to FxHashMap to fix non-determinism Using `HashMap` in `rustdoc_json_types::Crate` were causing creating randomly ordered objects in the json doc files. Which might cause problems to people who are doing comparison on those files specially in CI pipelines. See rust-lang#103785 (comment) This PR fixes that issue and extends the coverage of `tests/run-make/rustdoc-verify-output-files` testing ability.

…rs-bad-copy-clone, r=jackh726 Don't ICE when encountering bound var in builtin copy/clone bounds Fixes rust-lang#108742

…-tester, r=notriddle Clean up rustdoc-js tester.js file A much needed cleanup. r? `@notriddle`

matthiaskrgr · 2023-03-05T13:29:30Z

@bors r+ rollup=never p=7

bors · 2023-03-05T13:29:32Z

📌 Commit 5219616 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-03-05T13:46:07Z

⌛ Testing commit 5219616 with merge 04e9575...

bors · 2023-03-05T16:45:13Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 04e9575 to master...

rust-timer · 2023-03-05T16:47:12Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#108749	5a2be9aca7f0376dc3ff4e9989539531edba71de
#108744	f7d3a0d51d3624e63f0c2c9b5f71e58c9c6415e5
#108626	3d357e45afc11cee777d1df961add8bfb612c685
#108618	21b90ebde7a9e8c18ec9d4454e6f91cdb79573d1
#108616	eaf7edea38db1a60662a1f996faa4c5e3d893e63
#108613	b799e06d4314f138518a70c16417e6b2255274f3
#106440	5447f72d43644e95d04373d93084a61254b64105

previous master: 0d439f8181

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 · 2023-03-05T18:03:32Z

Finished benchmarking commit (04e9575): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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

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.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

jyn514 and others added 16 commits March 1, 2023 10:49

Remove llvm.skip-rebuild option

daf99a4

This was added to in 2019 to speed up rebuild times when LLVM was modified. Now that download-ci-llvm exists, I don't think it makes sense to support an unsound option like this that can lead to miscompiles; and the code cleanup is nice too.

Rename src/etc/vscode_settings.json to rust_analyzer_settings.json

a90e7d4

Don't ICE when encountering bound var in builtin copy/clone bounds

32f1f01

Clean up rustdoc-js tester.js file

0b5165e

fix inconsistent json outputs from rustdoc

52c71e6

Signed-off-by: ozkanonur <work@onurozkan.dev>

Sync codegen defaults with compiler defaults and add a ping message s…

ba0b7af

…o they stay in sync

Reuse allocations between files

97cffd5

Rollup merge of rust-lang#108616 - jyn514:sync-codegen, r=albertlarsan68

c86ea5a

Sync codegen defaults with compiler defaults and add a ping message so they stay in sync Looks like this got missed in rust-lang#107241.

Rollup merge of rust-lang#108618 - KittyBorgX:master, r=Mark-Simulacrum

f7bd8af

Rename `src/etc/vscode_settings.json` to `rust_analyzer_settings.json` Fixes rust-lang#108614

Rollup merge of rust-lang#108744 - compiler-errors:non_lifetime_binde…

ec16270

…rs-bad-copy-clone, r=jackh726 Don't ICE when encountering bound var in builtin copy/clone bounds Fixes rust-lang#108742

Rollup merge of rust-lang#108749 - GuillaumeGomez:clean-up-rustdoc-js…

5219616

…-tester, r=notriddle Clean up rustdoc-js tester.js file A much needed cleanup. 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 Mar 5, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 5, 2023

bors merged commit 04e9575 into rust-lang:master Mar 5, 2023

rustbot added this to the 1.70.0 milestone Mar 5, 2023

matthiaskrgr deleted the rollup-whlvo2g branch March 16, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#108771

Rollup of 7 pull requests#108771
bors merged 16 commits intorust-lang:masterfrom
matthiaskrgr:rollup-whlvo2g

matthiaskrgr commented Mar 5, 2023

Uh oh!

matthiaskrgr commented Mar 5, 2023

Uh oh!

bors commented Mar 5, 2023

Uh oh!

bors commented Mar 5, 2023

Uh oh!

bors commented Mar 5, 2023

Uh oh!

rust-timer commented Mar 5, 2023

Uh oh!

rust-timer commented Mar 5, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

matthiaskrgr commented Mar 5, 2023

Uh oh!

matthiaskrgr commented Mar 5, 2023

Uh oh!

bors commented Mar 5, 2023

Uh oh!

bors commented Mar 5, 2023

Uh oh!

bors commented Mar 5, 2023

Uh oh!

rust-timer commented Mar 5, 2023

Uh oh!

rust-timer commented Mar 5, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants