Skip to content

Rollup of 21 pull requests - #160283

Closed
JonathanBrouwer wants to merge 72 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-DJjXn4s
Closed

Rollup of 21 pull requests#160283
JonathanBrouwer wants to merge 72 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-DJjXn4s

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

ravlynd and others added 30 commits July 25, 2026 08:28
`cfg_select!` parsing needs to be implemented in rustfmt right now
because there's no good way to call `rustc_attr_parsing::parse_cfg_select`.
The plan is to leverage `rewrite_match_body` to help with `cfg_select!`
formatting.
This allows a per-target `override-allocator` to revert to the system allocator
even if there is a global rule specifying a different allocator.

Remap `jemalloc = false` to `override-allocator = "system"` instead of mapping
it to "override-allocator is unset"; this restores the correct precedence
behaviour of this setting.

This also allows `Config::override_allocator()` to always resolve the directive
to a definite value, rather than needing it to be wrapped in an `Option`,
which simplifies some other code.

Finally, print a more specific warning when `jemalloc` is set, telling users
the appropriate setting to use for `override-allocator` depending on whether
`jemalloc` is set to true or false.

Fixes rust-lang#160084
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-js Area: Rustdoc's JS front-end A-rustdoc-search Area: Rustdoc's search feature A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 31, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

📌 Commit b3c2c02 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jul 31, 2026
@rust-bors

rust-bors Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

⌛ Testing commit b3c2c02 with merge 71a03d3...

Workflow: https://github.com/rust-lang/rust/actions/runs/30636194800

rust-bors Bot pushed a commit that referenced this pull request Jul 31, 2026
…uwer

Rollup of 21 pull requests

Successful merges:

 - #160100 (Add "system" option to `override-allocator` directive)
 - #159675 (rustc: Support `--jobs` options for limiting parallelism in various parts of the compiler)
 - #159999 (Fix invalidation of stdlib in bootstrap when using non-LLVM codegen backends)
 - #160233 (Bubble bad path error while parsing field to avoid unecessary second error)
 - #160272 (rustc_metadata: Move native library search code to `rustc_codegen_ssa`)
 - #154202 (rustfmt: Format `cfg_select!`)
 - #158835 (rustc_passes: lint unused `#[path]` attributes on inline modules)
 - #159520 (Suggest `Vec<T>` instead of `[T]`)
 - #160034 (Move "macro only" check for `#[allow_internal_unsafe/unstable]` to attribute parser)
 - #160066 (rustc_middle: lint attribute cleanups)
 - #160085 (Remove various superfluous lint attributes)
 - #160113 (Coalesce `rustc_on_unimplemented` attributes and lint malformed filters)
 - #160119 (fix query cycle in `coroutine_hidden_types` for the next solver)
 - #160147 (tests: Remove `-Zthreads` options from tests in `ui/parallel-rustc`)
 - #160157 (Remove outdated comments from `va_list.rs`)
 - #160159 (More accurately check for interior mutability in `invalid_reference_casting` lint)
 - #160208 (rustdoc: Fix crash when trying to list attributes on an opaque type)
 - #160244 (Rename splat to rustc_splat in error messages)
 - #160246 (dont fire `unused_mut` on `&pin mut self`)
 - #160247 (Configure backport nominations for rustfmt)
 - #160274 (renovate: update lock files weekly)
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r-

@rust-bors rust-bors Bot 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 31, 2026
@rust-bors

rust-bors Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved.

Auto build was cancelled due to unapproval. Cancelled workflows:

View changes since this unapproval

@rust-bors

rust-bors Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

PR #158835, which is a member of this rollup, was unapproved.

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 31, 2026
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job aarch64-gnu-llvm-21-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test [ui] tests/ui/compile-flags/invalid/remap-path-scope.rs#foo ... ok
test [ui] tests/ui/compile-flags/invalid/regparm/requires-x86.rs#x86 ... ok
test [ui] tests/ui/compile-flags/invalid/regparm/requires-x86.rs#x86_64 ... ok
test [ui] tests/ui/compile-flags/invalid/remap-path-scope.rs#underscore ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-conflict.rs#b ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-conflict.rs#c ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-conflict.rs#a ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-conflict.rs#d ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-conflict.rs#e ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-conflict.rs#f ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-conflict.rs#g ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-gate.rs#a ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-gate.rs#d ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-gate.rs#b ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-gate.rs#c ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-gate.rs#e ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-gate.rs#f ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#b ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#a ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#c ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#d ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#e ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#f ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#g ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#i ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#j ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#h ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#l ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-fail-range.rs#k ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-pass.rs#a ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-pass.rs#b ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-pass-link.rs ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-pass.rs#d ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-pass.rs#e ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-pass.rs#c ... ok
test [ui] tests/ui/compile-flags/removed_ar.rs ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-pass.rs#f ... ok
test [ui] tests/ui/compile-flags/jobs/jobs-pass.rs#g ... ok
test [ui] tests/ui/compile-flags/version-info-flags.rs#long-verbose-version ... ok
test [ui] tests/ui/compile-flags/version-info-flags.rs#verbose-version ... ok
test [ui] tests/ui/compile-flags/version-info-flags.rs#version ... ok
test [ui] tests/ui/compiletest-self-test/compile-flags-incremental.rs#bad ... ok
test [ui] tests/ui/compiletest-self-test/compile-flags-incremental.rs#bad-space ... ok
---
---- [ui] tests/ui/proc-macro/inner-attr-file-mod-cfg-attr.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/proc-macro/inner-attr-file-mod-cfg-attr.rs" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2" "--target=aarch64-unknown-linux-gnu" "--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" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/proc-macro/inner-attr-file-mod-cfg-attr" "-A" "unused" "-W" "unused_attributes" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/proc-macro/inner-attr-file-mod-cfg-attr/auxiliary" "--edition=2024" "--cfg" "enabled" "--check-cfg=cfg(enabled)" "--extern" "test_macros=/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/proc-macro/inner-attr-file-mod-cfg-attr/auxiliary/libtest_macros.so"
stdout: none
--- stderr -------------------------------
error: unused attribute
##[error]  --> /checkout/tests/ui/proc-macro/inner-attr-file-mod-cfg-attr.rs:12:1
   |

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-js Area: Rustdoc's JS front-end A-rustdoc-search Area: Rustdoc's search feature A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic rollup A PR which is a rollup 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. 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. T-rustfmt Relevant to the rustfmt 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.