Skip to content

Rollup of 10 pull requests #109189

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 24 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

notriddle and others added 24 commits March 7, 2023 11:20
…r=GuillaumeGomez

rustdoc: fix type search for `Option` combinators
…s, r=WaffleLapkin

error-msg: impl better suggestion for `E0532`

Fixes rust-lang#106862

No test as there is already a test which is nearly identical to the example in the linked issue.
…t-for-write, r=notriddle

rustdoc: DocFS: Replace rayon with threadpool and enable it for all targets

Fixes rust-lang#109060.

Switching to `threadpool` makes it a bit simpler for us to wait for all tasks in `DocFS` directly in the `Drop` implementation. I'm also curious if making all the writes into a thread pool could improve run time for rustdoc on all other platforms than Windows as well.

I'll run a perf check to see.

cc `@ehuss`
r? `@notriddle`
…, r=WaffleLapkin

Assert def-kind is correct for alias types

Make sure we're not constructing alias types for the wrong def-kind, at least for debug cases 😅
… r=oli-obk

make `define_opaque_types` fully explicit

based on the idea of rust-lang#108389. Moved `define_opaque_types` into the actual operations, e.g. `eq`, instead of `infcx.at` because normalization doesn't use `define_opaque_types` and even creates it's own `At` with a different `define_opaque_types` internally.

Somewhat surprisingly, coherence actually relies on `DefineOpaqueTypes::Yes` for soundness which was revealed because I've incorrectly used `DefineOpaqueTypes::No` in `equate_impl_headers`. It feels concerning that even though this is the case, we still sometimes use `DefineOpaqueTypes::No` in coherence. I did not look into this as part of this PR as it is purely changing the structure of the code without changing behavior in any way.

r? `@oli-obk`
…ompiler-errors

Some cleanups in our normalization logic

Changed a match to be exhaustive and deduplicated some code.

r? `@compiler-errors`

this pulls out the uncontroversial part of rust-lang#108860
…, r=WaffleLapkin

mv tests/codegen/issue-* tests/codegen/issues/

No changes to the contents; just a move.

Like how there's a <https://github.com/rust-lang/rust/tree/master/tests/ui/issues> folder.
Revert rust-lang#107376 to fix potential `bincode` breakage and `rustc-perf` benchmark.

rust-lang#107376 caused `rustc-perf`'s `webrender` benchmark to break, by regressing on the `bincode-1.3.3` crate.

~~This PR is a draft revert in case we can't land a fix soon enough, and we'd like to land the revert instead~~

(Though I myself think it'd be safer to do the revert, and run crater when relanding rust-lang#107376.)

cc `@aliemjay`
…tip, r=jsha

rustdoc: remove `std::` from primitive intra-doc link tooltips

Take the intra-doc link to the method `iter` from https://doc.rust-lang.org/nightly/std/slice/struct.Iter.html

Before: `method std::slice::iter`

After: `method slice::iter`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Mar 15, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Collaborator

bors commented Mar 15, 2023

📌 Commit a350c76 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 15, 2023
@bors
Copy link
Collaborator

bors commented Mar 15, 2023

⌛ Testing commit a350c76 with merge 9039dfbea2b5a6155836b43d94b0974c9f6ae8b0...

@bors
Copy link
Collaborator

bors commented Mar 15, 2023

💔 Test failed - checks-actions

@bors 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 15, 2023
@matthiaskrgr
Copy link
Member Author

@bors retry #108227

@bors 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 15, 2023
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[2564/3021] Linking CXX static library lib\libLLVMTransformUtils.a
[2565/3021] Linking CXX static library lib\libLLVMMCJIT.a
[2566/3021] Building CXX object utils/not/CMakeFiles/not.dir/not.cpp.obj
[2567/3021] Linking CXX static library lib\libLLVMAggressiveInstCombine.a
FAILED: lib/libLLVMAggressiveInstCombine.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMAggressiveInstCombine.a && D:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMAggressiveInstCombine.a  lib/Transforms/AggressiveInstCombine/CMakeFiles/LLVMAggressiveInstCombine.dir/AggressiveInstCombine.cpp.obj lib/Transforms/AggressiveInstCombine/CMakeFiles/LLVMAggressiveInstCombine.dir/TruncInstCombine.cpp.obj && D:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMAggressiveInstCombine.a && cd ."
D:\a\rust\rust\mingw32\bin\ar.exe: could not create temporary file whilst writing archive: no more archived files
[2568/3021] Building CXX object tools/llvm-ar/CMakeFiles/llvm-ar.dir/llvm-ar.cpp.obj
[2569/3021] Linking CXX static library lib\libLLVMInstrumentation.a
[2570/3021] Linking CXX static library lib\libLLVMInstCombine.a
[2571/3021] Linking CXX executable bin\yaml-bench.exe
[2571/3021] Linking CXX executable bin\yaml-bench.exe
[2572/3021] Building CXX object tools/llvm-config/CMakeFiles/llvm-config.dir/llvm-config.cpp.obj
[2573/3021] Building CXX object tools/lto/CMakeFiles/LTO.dir/lto.cpp.obj
[2574/3021] Linking CXX executable bin\UnicodeNameMappingGenerator.exe
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-1cd66030c949c28d\cmake-0.1.48\src\lib.rs:975:5
 finished in 271.406 seconds
Build completed unsuccessfully in 0:08:16

@bors
Copy link
Collaborator

bors commented Mar 16, 2023

⌛ Testing commit a350c76 with merge 1d5d9febed579f0a55ac13de7a37b1991091fcd5...

@bors
Copy link
Collaborator

bors commented Mar 16, 2023

💔 Test failed - checks-actions

@bors 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 16, 2023
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[180/3021] Linking CXX static library lib\libLLVMSupport.a
[181/3021] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenHwModes.cpp.obj
[182/3021] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/Attributes.cpp.obj
[183/3021] Linking CXX static library lib\libLLVMFileCheck.a
FAILED: lib/libLLVMFileCheck.a 
cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E rm -f lib\libLLVMFileCheck.a && D:\a\rust\rust\mingw32\bin\ar.exe qc lib\libLLVMFileCheck.a  lib/FileCheck/CMakeFiles/LLVMFileCheck.dir/FileCheck.cpp.obj && D:\a\rust\rust\mingw32\bin\ranlib.exe lib\libLLVMFileCheck.a && cd ."
D:\a\rust\rust\mingw32\bin\ranlib.exe: could not create temporary file whilst writing archive: no more archived files
[184/3021] Linking CXX static library lib\libLLVMFuzzerCLI.a
[185/3021] Linking CXX static library lib\libLLVMTableGen.a
[186/3021] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/AsmWriterInst.cpp.obj
[187/3021] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenDAGPatterns.cpp.obj
[187/3021] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenDAGPatterns.cpp.obj
[188/3021] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeGenRegisters.cpp.obj
[189/3021] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/AsmWriterEmitter.cpp.obj
[190/3021] Building CXX object utils/TableGen/CMakeFiles/llvm-tblgen.dir/CodeEmitterGen.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-1cd66030c949c28d\cmake-0.1.48\src\lib.rs:975:5
 finished in 38.689 seconds
Build completed unsuccessfully in 0:04:19

@oli-obk
Copy link
Contributor

oli-obk commented Mar 16, 2023

@bors retry failed to build llvm

@bors 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 16, 2023
@bors
Copy link
Collaborator

bors commented Mar 16, 2023

⌛ Testing commit a350c76 with merge 2fa3dc2709a6dc82474f094a2b33b539bda1dc73...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@matthiaskrgr matthiaskrgr deleted the rollup-dwsib2c branch March 16, 2024 18:19
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.