Rollup of 7 pull requests#108863

JohnTitor · 2023-03-07T14:06:25Z

Successful merges:

Remove the option to disable llvm-version-check #108619 (Remove the option to disable llvm-version-check)
infer: fix and improve comments #108728 (infer: fix and improve comments)
feat: impl better help for .poll() not found on impl Future #108731 (feat: impl better help for .poll() not found on impl Future)
Greatly improve the error messages when run-make/translation fails #108774 (Greatly improve the error messages when run-make/translation fails)
Update askama to 0.12 and improve whitespace control #108805 (Update askama to 0.12 and improve whitespace control)
Add tracking issue for cf-protection to unstable book #108823 (Add tracking issue for cf-protection to unstable book)
Custom MIR: Support as casts #108855 (Custom MIR: Support as casts)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Before: ``` LD_LIBRARY_PATH="/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage2/lib:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage0/lib" '/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation -L /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation test.rs --sysroot /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation/fakeroot -Ztranslate-lang=zh-CN 2>&1 | grep "this is a test message" ------------------------------------------ --- stderr ------------------------------- make: *** [Makefile:51: sysroot] Error 1 ------------------------------------------ failures: [run-make] tests/run-make/translation ``` After: ``` LD_LIBRARY_PATH="/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage2/lib:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage0/lib" '/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation -L /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation test.rs --sysroot /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation/fakeroot -Ztranslate-lang=zh-CN 2>&1 | grep "this is a test message" [[[ begin stdout ]]] error: failed to load fluent bundle: failed to add resource: Attempt to override an existing message: "parse_struct_literal_body_without_path". [[[ end stdout ]]] Error: cannot match: this is a test message ------------------------------------------ --- stderr ------------------------------- make: *** [Makefile:51: sysroot] Error 1 ------------------------------------------ failures: [run-make] tests/run-make/translation ```

We don't support old versions of LLVM; there's no reason to have an easy way to force bootstrap to use them anyway. If someone really needs to use an unsupported version, they can modify bootstrap to change the version range.

Remove the option to disable `llvm-version-check` We don't support old versions of LLVM; there's no reason to have an easy way to force bootstrap to use them anyway. If someone really needs to use an unsupported version, they can modify bootstrap to change the version range. r? ``@cuviper`` on whether we want to do this or not, since you maintain rust on Fedora and touched this config last.

…lwoerister infer: fix and improve comments

…ture, r=petrochenkov feat: impl better help for `.poll()` not found on `impl Future` Partially address rust-lang#108572 I'd like to also address suggestions for generalized `Self` parameters as well. That'll be a separate PR.

…twco Greatly improve the error messages when `run-make/translation` fails Before: ``` LD_LIBRARY_PATH="/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage2/lib:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage0/lib" '/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation -L /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation test.rs --sysroot /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation/fakeroot -Ztranslate-lang=zh-CN 2>&1 | grep "this is a test message" ------------------------------------------ --- stderr ------------------------------- make: *** [Makefile:51: sysroot] Error 1 ------------------------------------------ failures: [run-make] tests/run-make/translation ``` After: ``` LD_LIBRARY_PATH="/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage2/lib:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage0/lib" '/home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation -L /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation test.rs --sysroot /home/gh-jyn514/rust/build/aarch64-unknown-linux-gnu/test/run-make/translation/translation/fakeroot -Ztranslate-lang=zh-CN 2>&1 | grep "this is a test message" [[[ begin stdout ]]] error: failed to load fluent bundle: failed to add resource: Attempt to override an existing message: "parse_struct_literal_body_without_path". [[[ end stdout ]]] Error: cannot match: this is a test message ------------------------------------------ --- stderr ------------------------------- make: *** [Makefile:51: sysroot] Error 1 ------------------------------------------ failures: [run-make] tests/run-make/translation ```

…triddle Update askama to 0.12 and improve whitespace control `askama` 0.12 was just released, and it adds the possibility to have "whitespace suppression" enabled by default in the configuration so I switched to it. r? ``@notriddle``

…king_issue, r=Nilstrieb Add tracking issue for cf-protection to unstable book

Custom MIR: Support `as` casts Small changes to support this low hanging fruit r? `@oli-obk` or `@tmiasko` or `@JakobDegen`

JohnTitor · 2023-03-07T14:06:41Z

@bors r+ rollup=never p=7

bors · 2023-03-07T14:06:44Z

📌 Commit fddd861 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-03-07T15:58:42Z

⌛ Testing commit fddd861 with merge 1a521db...

bors · 2023-03-07T18:18:35Z

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 1a521db to master...

rust-timer · 2023-03-07T18:20:37Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#108855	5eba28175145298f3d8a1c777887a9113ebaf47a
#108823	15b505a4a8926d1f18035a671d3306c0b0d6fa54
#108805	b6f7feae405ef6218c2db0bc2d2ca5e14a72f242
#108774	50cfffcde061609606f653ac31c5a4366ed5c8c1
#108731	6d72c064f99a9c84be11b62e2d448d95625d46d4
#108728	01d813dbf5b86b3262dd0e638bfc4b1e65a1476c
#108619	91e4ab63ee07219965ffbd0cd78d649403c61e05

previous master: 160c2ebeca

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-07T19:36:42Z

Finished benchmarking commit (1a521db): 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)	1.3%	[1.3%, 1.3%]	1
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-1.1%	[-1.1%, -1.1%]	1
All ❌✅ (primary)	-0.7%	[-0.7%, -0.7%]	1

Cycles

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

tshepang and others added 16 commits March 4, 2023 07:38

infer: fix and improve comments

34063c5

feat: impl better help for .poll() not found on impl Future

aaaffa9

Remove the option to disable llvm-version-check

8becfed

We don't support old versions of LLVM; there's no reason to have an easy way to force bootstrap to use them anyway. If someone really needs to use an unsupported version, they can modify bootstrap to change the version range.

Update askama version to 0.12

76714c3

Remove unneeded minus sign in jinja tags

a776c17

Update documentation for HTML templates style

511d262

Add tracking issue for cf-protection to unstable book

545fe60

Custom MIR: Support as casts

7281cd0

Rollup merge of rust-lang#108728 - tshepang:fix-and-improve, r=michae…

2a196db

…lwoerister infer: fix and improve comments

Rollup merge of rust-lang#108823 - wesleywiser:add_cf-protection_trac…

b866e1e

…king_issue, r=Nilstrieb Add tracking issue for cf-protection to unstable book

Rollup merge of rust-lang#108855 - cbeuw:mir-cast, r=tmiasko

fddd861

Custom MIR: Support `as` casts Small changes to support this low hanging fruit r? `@oli-obk` or `@tmiasko` or `@JakobDegen`

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 7, 2023

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

bors merged commit 1a521db into rust-lang:master Mar 7, 2023

rustbot added this to the 1.70.0 milestone Mar 7, 2023

This was referenced Mar 7, 2023

Only load one CSS theme by default #106915

Merged

Make clipboard button copy crate version too instead of just crate_name #107012

Closed

rustdoc: change the +/- icons #107658

Closed

Use dynamic dispatch for queries #108638

Merged

JohnTitor deleted the rollup-haydnsw branch March 7, 2023 23:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#108863