Skip to content

Rollup of 7 pull requests - #125569

Closed
matthiaskrgr wants to merge 15 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-8f32rfs
Closed

Rollup of 7 pull requests#125569
matthiaskrgr wants to merge 15 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-8f32rfs

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Kobzoland others added 15 commits May 21, 2024 19:38
This is another step toward making opt-dist work in sandboxed environments
opt-dist verifies the final built rustc against a subset of rustc test
suite. However it overwrote the pre-existing `config.toml` [^1],
and that results in ./vendor/ directory removed [^2].
Instead of overwriting, this patch use `--set <config-value>` to
override paths to rustc / cargo / llvm-config.
[^1]: https://github.com/rust-lang/rust/blob/606afbb617a2949a4e35c4b0258ff94c980b9451/src/tools/opt-dist/src/tests.rs#L62-L77
[^2]: https://github.com/rust-lang/rust/blob/8679004993f08807289911d9f400f4ac4391d2bc/src/bootstrap/bootstrap.py#L1057
… 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.
…toml, r=Kobzol
fix(opt-dist): respect existing config.toml
This is another step toward making opt-dist work in sandboxed environments. See also <rust-lang#125465>.
opt-dist verifies the final built rustc against a subset of rustc test
suite. However it overwrote the pre-existing `config.toml` [^1],
and that results in ./vendor/ directory removed [^2].
Instead of overwriting, this patch use `--set <config-value>` to
override paths to rustc / cargo / llvm-config.
[^1]: https://github.com/rust-lang/rust/blob/606afbb617a2949a4e35c4b0258ff94c980b9451/src/tools/opt-dist/src/tests.rs#L62-L77
[^2]: https://github.com/rust-lang/rust/blob/8679004993f08807289911d9f400f4ac4391d2bc/src/bootstrap/bootstrap.py#L1057
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.*
…=workingjubilee
Simplify the `unchecked_sh[lr]` ub-checks a bit
It can use the constant in the check, rather than passing it as a parameter.
@rustbotrustbot 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 26, 2024
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=7

@bors

bors commented May 26, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit ac9558d has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 26, 2024
@bors

bors commented May 26, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ac9558d with merge 4e3fa17...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 26, 2024
…iaskrgr
Rollup of 7 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#125473 (fix(opt-dist): respect existing config.toml)
- 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#125559 (Simplify the `unchecked_sh[lr]` ub-checks a bit)
r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
Total Installed Size: 166.93 MiB
:: Proceed with installation? [Y/n] :: Retrieving packages...
error: failed retrieving file 'mingw-w64-i686-openssl-3.2.0-1-any.pkg.tar.zst.sig' from mirror.umd.edu : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-i686-gcc-libs-13.2.0-3-any.pkg.tar.zst.sig' from mirror.umd.edu : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-i686-cmake-3.28.1-1-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-i686-cmake-3.28.1-1-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-i686-gettext-0.22.4-3-any.pkg.tar.zst.sig' from mirror.umd.edu : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
warning: too many errors from mirror.umd.edu, skipping for the remainder of this transaction
mingw-w64-i686-cmake-3.28.1-1-any downloading...
mingw-w64-i686-openssl-3.2.0-1-any downloading...
mingw-w64-i686-gettext-0.22.4-3-any downloading...
mingw-w64-i686-curl-8.5.0-1-any downloading...

@bors

bors commented May 26, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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-8f32rfs branch September 1, 2024 17:35
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-metaArea: Issues & PRs about the rust-lang/rust repository itselfA-testsuiteArea: The testsuite used to check the correctness of rustcrollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@matthiaskrgr@bors@rust-log-analyzer@rustbot@Kobzol@workingjubilee@SparrowLii@scottmcm@Urgau@weihanglo