Rollup of 17 pull requests - #160278
Closed
JonathanBrouwer wants to merge 67 commits into
Closed
Conversation
`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
Contributor
Author
Contributor
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 31, 2026
Rollup of 17 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-*
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
PR #160007, which is a member of this rollup, was unapproved. This rollup was thus unapproved. |
Contributor
|
💔 Test for bc4805a failed: CI. Failed jobs:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
override-allocatordirective #160100 (Add "system" option tooverride-allocatordirective)-Ldependencysearch paths for panic runtimes #160007 (allow-Ldependencysearch paths for panic runtimes)cfg_select!#154202 (rustfmt: Formatcfg_select!)#[allow_internal_unsafe/unstable]to attribute parser #160034 (Move "macro only" check for#[allow_internal_unsafe/unstable]to attribute parser)rustc_on_unimplementedattributes and lint malformed filters #160113 (Coalescerustc_on_unimplementedattributes and lint malformed filters)coroutine_hidden_typesfor the next solver #160119 (fix query cycle incoroutine_hidden_typesfor the next solver)-Zthreadsoptions from tests inui/parallel-rustc#160147 (tests: Remove-Zthreadsoptions from tests inui/parallel-rustc)va_list.rs#160157 (Remove outdated comments fromva_list.rs)invalid_reference_castinglint #160159 (More accurately check for interior mutability ininvalid_reference_castinglint)unused_muton&pin mut self#160246 (dont fireunused_muton&pin mut self)r? @ghost
Create a similar rollup