Rollup of 7 pull requests #108840

matthiaskrgr · 2023-03-07T05:12:51Z

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)
Remove references to PassManagerBuilder #108822 (Remove references to PassManagerBuilder)
Add tracking issue for cf-protection to unstable book #108823 (Add tracking issue for cf-protection to unstable book)

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.

This is a legacy PM concept that we no longer use.

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`

Remove references to PassManagerBuilder This is a legacy PM concept that we no longer use.

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

matthiaskrgr · 2023-03-07T05:13:08Z

@bors r+ rollup=never p=7

bors · 2023-03-07T05:13:10Z

📌 Commit 7ba7c54 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-03-07T06:49:42Z

⌛ Testing commit 7ba7c54 with merge 31fa685415f1e6fcbd16df4b84ead4a71252655b...

bors · 2023-03-07T07:01:50Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-03-08T00:39:08Z

The job x86_64-mingw-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[2023/3025] Building CXX object lib/Target/MSP430/Disassembler/CMakeFiles/LLVMMSP430Disassembler.dir/MSP430Disassembler.cpp.obj
[2024/3025] Building CXX object lib/Target/MSP430/AsmParser/CMakeFiles/LLVMMSP430AsmParser.dir/MSP430AsmParser.cpp.obj
[2025/3025] Linking CXX static library lib\libLLVMMSP430Disassembler.a
FAILED: lib/libLLVMMSP430Disassembler.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMMSP430Disassembler.a && D:\a\rust\rust\mingw64\bin\ar.exe qc lib\libLLVMMSP430Disassembler.a  lib/Target/MSP430/Disassembler/CMakeFiles/LLVMMSP430Disassembler.dir/MSP430Disassembler.cpp.obj && D:\a\rust\rust\mingw64\bin\ranlib.exe lib\libLLVMMSP430Disassembler.a && cd ."
D:\a\rust\rust\mingw64\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[2026/3025] Linking CXX static library lib\libLLVMMSP430AsmParser.a
[2027/3025] Building CXX object lib/Target/Mips/CMakeFiles/LLVMMipsCodeGen.dir/Mips16InstrInfo.cpp.obj
[2028/3025] Building CXX object lib/Target/Mips/CMakeFiles/LLVMMipsCodeGen.dir/Mips16HardFloat.cpp.obj
[2029/3025] Building CXX object lib/Target/Mips/CMakeFiles/LLVMMipsCodeGen.dir/Mips16FrameLowering.cpp.obj
[2029/3025] Building CXX object lib/Target/Mips/CMakeFiles/LLVMMipsCodeGen.dir/Mips16FrameLowering.cpp.obj
[2030/3025] Building CXX object lib/Target/Mips/CMakeFiles/LLVMMipsCodeGen.dir/Mips16ISelDAGToDAG.cpp.obj
[2031/3025] Building CXX object lib/Target/Mips/CMakeFiles/LLVMMipsCodeGen.dir/MipsDelaySlotFiller.cpp.obj
[2032/3025] Building CXX object lib/Target/Mips/CMakeFiles/LLVMMipsCodeGen.dir/Mips16ISelLowering.cpp.obj
ninja: build stopped: subcommand failed.
command did not execute successfully, got: exit code: 1


build script failed, must exit now', C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\cmake-0.1.48\src\lib.rs:975:5
 finished in 192.400 seconds
Build completed unsuccessfully in 0:06:23
Build completed unsuccessfully in 0:06:23
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

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

Remove references to PassManagerBuilder

2c7beed

This is a legacy PM concept that we no longer use.

Add tracking issue for cf-protection to unstable book

545fe60

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

732df3f

…lwoerister infer: fix and improve comments

Rollup merge of rust-lang#108822 - nikic:legacy-pm-removal-2, r=cuviper

7ac657b

Remove references to PassManagerBuilder This is a legacy PM concept that we no longer use.

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

7ba7c54

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

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 S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2023

matthiaskrgr closed this Mar 7, 2023

matthiaskrgr deleted the rollup-qquktd8 branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #108840

Rollup of 7 pull requests #108840

matthiaskrgr commented Mar 7, 2023

matthiaskrgr commented Mar 7, 2023

bors commented Mar 7, 2023

bors commented Mar 7, 2023

bors commented Mar 7, 2023

rust-log-analyzer commented Mar 8, 2023

Rollup of 7 pull requests #108840

Rollup of 7 pull requests #108840

Conversation

matthiaskrgr commented Mar 7, 2023

matthiaskrgr commented Mar 7, 2023

bors commented Mar 7, 2023

bors commented Mar 7, 2023

bors commented Mar 7, 2023

rust-log-analyzer commented Mar 8, 2023