Skip to content

Rollup of 10 pull requests #138912

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 29 commits into from
Closed

Conversation

TaKO8Ki
Copy link
Member

@TaKO8Ki TaKO8Ki commented Mar 24, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

pietroalbini and others added 29 commits March 18, 2025 10:10
The old Makefile-based infrastructure included support for executing
binaries with remote-test-client if configured, but that didn't get
ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation
(and limitations) of the original Makefile-based support.
They're dodgy, covering all the keywords, including weak ones, and
edition-specific ones without considering the edition. They have a
single use in rustfmt. This commit changes that use to
`is_reserved_ident`, which is a much more widely used alternative and is
good enough, judging by the lack of effect on the test suite.
So the order of the `Symbol::is_*` predicates match the order of the
keywords list.
Now that there's also a meta relnotes tracking issue.
resolve: Avoid some unstable iteration 2

Continuation of rust-lang#138502.
…jieyouxu

Reintroduce remote-test support in run-make tests

The old Makefile-based infrastructure included support for executing binaries with remote-test-client if configured, but that didn't get ported to run_make_support as part of the rmake migration.

This PR re-introduces back that support, with the same implementation (and limitations) of the original Makefile-based support.

[Old Makefile-based implementation of this](https://github.com/rust-lang/rust/blob/9b8accbeb6336fa24d02b2a8bcaecaf44fe2bb65/tests/run-make/tools.mk#L65-L74)

try-job: armhf-gnu
…degen_backend, r=workingjubilee

Make default_codegen_backend serializable

This PR makes default_codegen_backend serializable.
… r=camelid

[rustdoc] Remove duplicated loop when computing doc cfgs

Working on implementing https://github.com/rust-lang/rfcs/blob/master/text/3631-rustdoc-cfgs-handling.md and found this weird case where the first loop was actually not doing anything since we were passing `cfg(...)` to `Cfg::parse` instead of `cfg(...)` items.

Well, that should be a first nice cleanup before the rest comes in.

cc ``@notriddle``
r? ``@camelid``
…group-desc, r=cuviper

Slightly reword triagebot ping message for `relnotes-interest-group`

Now that there's also a meta relnotes tracking issue.

r? ``@cuviper`` (or release)
resolve: Avoid remaining unstable iteration

Continuation of rust-lang#138580.
This should be the performance sensitive part.
…-tweaks, r=lcnr

Fix/tweak some tests in new solver

Bunch of miscellaneous new solver tweaks that I found from the failing tests. Can split these out, but they all seemed small enough to not warrant separate PRs.

r? lcnr
…for-doctests, r=notriddle

Ignore doctests only in specified targets

Quick fix for rust-lang#138863

FIxes  rust-lang#138863

cc ``@yotamofek`` ``@notriddle``
…=compiler-errors

Add a helper for building an owner id in ast lowering

Just some deduplication of owner-id creations. Will also help me later split up ast lowering into per-owner queries, as it won't be possible anymore to go from a NodeId to a DefId of an owner without doing extra work to check whether we have an owner id. So I'd just do that in the new `owner_id` function and keep the `local_def_id` function free of that logic
@rustbot rustbot added the A-meta Area: Issues & PRs about the rust-lang/rust repository itself label Mar 24, 2025
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Mar 24, 2025
@TaKO8Ki
Copy link
Member Author

TaKO8Ki commented Mar 24, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Mar 24, 2025

📌 Commit ad8b2fa has been approved by TaKO8Ki

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 24, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
Rollup of 10 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138877 (Ignore doctests only in specified targets)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Mar 25, 2025

⌛ Testing commit ad8b2fa with merge 9e0c777...

@bors
Copy link
Collaborator

bors commented Mar 25, 2025

💔 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 25, 2025
@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)
##[endgroup]
Image input checksum 7c3229fe54f42be3380afa257a05657d54628c1338a90340265d26ddcbcd1040e9e8a1c1d5e9b963fdbdd154b8bfc3431576c6008a46929bcada06d00844f1dd
##[group]Building docker image for x86_64-gnu
Docker version 26.1.3, build b72abbb
Error response from daemon: Get "https://ghcr.io/v2/": Get "https://ghcr.io/token?account=rust-lang-ci&client_id=docker&offline_token=true&service=ghcr.io": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers)
##[error]Process completed with exit code 1.
Post job cleanup.

@TaKO8Ki
Copy link
Member Author

TaKO8Ki commented Mar 25, 2025

@bors retry

@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 25, 2025
@bors
Copy link
Collaborator

bors commented Mar 25, 2025

⌛ Testing commit ad8b2fa with merge eacae09...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
Rollup of 10 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138877 (Ignore doctests only in specified targets)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

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

The job aarch64-apple failed! Check out the build log: (web) (plain)

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

1 
2 running 1 test
- test $DIR/per-target-ignores.rs - foo (line 6) ... ok
+ test $DIR/per-target-ignores.rs - foo (line 7) ... ok
4 
5 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
6 

Note: some mismatched output was normalized before being compared
- test tests/rustdoc-ui/doctest/per-target-ignores.rs - foo (line 7) ... ok
+ test $DIR/per-target-ignores.rs - foo (line 7) ... ok


The actual stdout differed from the expected stdout.
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args doctest/per-target-ignores.rs`

error: 1 errors occurred comparing output.
status: exit status: 0
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/bin/rustdoc" "/Users/runner/work/rust/rust/tests/rustdoc-ui/doctest/per-target-ignores.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/.cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/work/rust/rust/vendor" "--sysroot" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2" "--target=aarch64-apple-darwin" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-o" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/rustdoc-ui/doctest/per-target-ignores" "-A" "internal_features" "-Cdebuginfo=0" "-Lnative=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/native/rust-test-helpers" "--test"
--- stdout -------------------------------

running 1 test
test tests/rustdoc-ui/doctest/per-target-ignores.rs - foo (line 7) ... ok

@bors
Copy link
Collaborator

bors commented Mar 25, 2025

💔 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 25, 2025
@TaKO8Ki
Copy link
Member Author

TaKO8Ki commented Mar 25, 2025

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 25, 2025
@TaKO8Ki TaKO8Ki closed this Mar 25, 2025
# 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-run-make Area: port run-make Makefiles to rmake.rs rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. 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.