Skip to content

Rollup of 8 pull requests #125557

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 17 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Kobzol and others added 17 commits May 21, 2024 19:38
… r=Mark-Simulacrum

tidy: stop special-casing tests/ui entry limit

It is genuinely more annoying to have this error, now that this value is below the general `ENTRY_LIMIT` cap, when one is trying to clean out tests from tests/ui! This code has served its purpose well, let it rest now rather than force it to continue haunting us.
…, r=compiler-errors

drop region constraints for ambiguous goals

See the comment in `compute_external_query_constraints`. While the underlying issue is preexisting, this fixes a bug introduced by rust-lang#125343.

It slightly weakens the leak chec, even if we didn't have any test which was affected. I want to write such a test before merging this PR.

r? `@compiler-errors`
A small diagnostic improvement for dropping_copy_types

For a value `m`  which implements `Copy` trait, `drop(m);` does nothing.
We now suggest user to ignore it by a abstract and general note: `let _ = ...`.
I think we can give a clearer note here: `let _ = m;`

fixes rust-lang#125189

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->
cleanup dependence of `ExtCtxt` in transcribe when macro expansion

part of rust-lang#125356
We can remove `transcribe`’s dependence on `ExtCtxt` to facilitate subsequent work (such as moving macro expansion into the incremental compilation system)

r? `@petrochenkov`
Thanks for the reviewing!
…ific, r=Mark-Simulacrum

Also mention my-self for other check-cfg docs changes

This PR adds a mention for my-self for the recently added `src/doc/rustc/src/check-cfg` directory.

*I had to add a second mention just for the directory since [`Path::starts_with`](https://doc.rust-lang.org/std/path/struct.Path.html#method.starts_with) as used by [triagebot](https://github.com/rust-lang/triagebot/blob/48f29f351cae774caa90f555fbbc6d0df7dce80e/src/handlers/mentions.rs#L69), matches on path components and so can never return true for a file and directory at the same time.*
…acrum

Try to not reinstall tools in mingw CI

Reinstalling the tools seems prone to failure (e.g. [latest](rust-lang#125529 (comment))) and is more work. It also seems unnecessary as CI actually uses a vendored tarball for builds.

cc `@mati865`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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 May 25, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented May 25, 2024

📌 Commit f1bd912 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 May 25, 2024
@bors
Copy link
Collaborator

bors commented May 26, 2024

⌛ Testing commit f1bd912 with merge 0e9a615...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 26, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125413 (drop region constraints for ambiguous goals)
 - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion)
 - rust-lang#125544 (Also mention my-self for other check-cfg docs changes)
 - rust-lang#125546 (Try to not reinstall tools in mingw CI)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
installing mingw-w64-x86_64-libffi...
installing mingw-w64-x86_64-mpdecimal...
installing mingw-w64-x86_64-openssl...
Optional dependencies for mingw-w64-x86_64-openssl
    mingw-w64-x86_64-ca-certificates [pending]
installing mingw-w64-x86_64-readline...
installing mingw-w64-x86_64-tcl...
installing mingw-w64-x86_64-sqlite3...
installing mingw-w64-x86_64-tk...
---
[169/3411] Building CXX object lib\TableGen\CMakeFiles\LLVMTableGen.dir\TGLexer.cpp.obj
[170/3411] Building CXX object utils\TableGen\CMakeFiles\obj.LLVMTableGenCommon.dir\Attributes.cpp.obj
[171/3411] Building CXX object utils\TableGen\CMakeFiles\obj.LLVMTableGenCommon.dir\CodeGenIntrinsics.cpp.obj
[172/3411] Building RC object utils\TableGen\CMakeFiles\llvm-min-tblgen.dir\__\__\resources\windows_version_resource.rc.res
FAILED: utils/TableGen/CMakeFiles/llvm-min-tblgen.dir/__/__/resources/windows_version_resource.rc.res 
RC C:\a\rust\rust\src\llvm-project\llvm\resources\windows_version_resource.rc utils\TableGen\CMakeFiles\llvm-min-tblgen.dir\__\__\resources\windows_version_resource.rc.res.d utils\TableGen\CMakeFiles\llvm-min-tblgen.dir\__\__\resources\windows_version_resource.rc.res "" "C:/a/rust/rust/build/bootstrap/debug/sccache-plus-cl.exe" C:\PROGRA~2\WI3CF2~1\10\bin\100226~1.0\x64\rc.exe -DGTEST_HAS_RTTI=0 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DRC_FILE_VERSION=\"0\" -DRC_INTERNAL_NAME=\"llvm-tblgen\" -DRC_PRODUCT_NAME=\"LLVM\" -DRC_PRODUCT_VERSION=\"0\" -DRC_VERSION_FIELD_1=18 -DRC_VERSION_FIELD_2=1 -DRC_VERSION_FIELD_3=6 -DRC_VERSION_FIELD_4=0 -I C:\a\rust\rust\build\x86_64-pc-windows-msvc\llvm\build\utils\TableGen -I C:\a\rust\rust\src\llvm-project\llvm\utils\TableGen -I C:\a\rust\rust\build\x86_64-pc-windows-msvc\llvm\build\include -I C:\a\rust\rust\src\llvm-project\llvm\include -DWIN32 /nologo /fo utils\TableGen\CMakeFiles\llvm-min-tblgen.dir\__\__\resources\windows_version_resource.rc.res C:\a\rust\rust\src\llvm-project\llvm\resources\windows_version_resource.rc
Microsoft (R) Windows (R) Resource Compiler Version 10.0.10011.16384
Copyright (C) Microsoft Corporation.  All rights reserved.





fatal error RC1107: invalid usage; use RC /? for Help

[173/3411] Building CXX object lib\TableGen\CMakeFiles\LLVMTableGen.dir\TGParser.cpp.obj
[174/3411] Building CXX object utils\TableGen\CMakeFiles\obj.LLVMTableGenCommon.dir\DirectiveEmitter.cpp.obj
[175/3411] Building CXX object utils\TableGen\CMakeFiles\obj.LLVMTableGenCommon.dir\IntrinsicEmitter.cpp.obj
---
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 finished in 43.789 seconds
##[endgroup]
Build completed unsuccessfully in 0:01:22
make: *** [Makefile:101: ci-msvc-ps1] Error 1
  network time: Sun, 26 May 2024 00:52:15 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

@bors
Copy link
Collaborator

bors commented May 26, 2024

💔 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 May 26, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-r58xtkc branch September 1, 2024 17:36
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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.