Skip to content

Rollup of 17 pull requests - #160278

Closed
JonathanBrouwer wants to merge 67 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-igu4ynF
Closed

Rollup of 17 pull requests#160278
JonathanBrouwer wants to merge 67 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-igu4ynF

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

Kobzol and others added 30 commits July 27, 2026 10:39
`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-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs 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

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-*

@rust-bors

rust-bors Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 658bb19 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

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-*
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
---- [run-make] tests\run-make\locate-panic-runtime stdout ----

error: rmake recipe failed to complete
status: exit code: 1
command: "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake.exe"
stdout: none
--- stderr -------------------------------
"D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "-L" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out" "core.rs" "-Cpanic=abort" "--sysroot" "./no_exists" "--target=i686-pc-windows-msvc"
output status: `exit code: 0`
=== STDOUT ===



=== STDERR ===



"D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "-L" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out" "panic_abort.rs" "-Cpanic=abort" "--out-dir" "panic_abort" "--sysroot" "./no_exists" "--target=i686-pc-windows-msvc"
output status: `exit code: 0`
=== STDOUT ===



=== STDERR ===



"D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "-L" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out" "std.rs" "--extern" "panic_abort=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out\\panic_abort\\libpanic_abort.rlib" "-Cpanic=abort" "--sysroot" "./no_exists" "--target=i686-pc-windows-msvc"
output status: `exit code: 0`
=== STDOUT ===



=== STDERR ===



"D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "-L" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out" "lib.rs" "-Cpanic=abort" "--sysroot" "./no_exists" "--target=i686-pc-windows-msvc"
output status: `exit code: 1`
=== STDOUT ===



=== STDERR ===
error[E0463]: can't find crate for `panic_abort` which `std` depends on
---
For more information about this error, try `rustc --explain E0463`.



"D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "-L" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out" "lib.rs" "-Cpanic=abort" "--sysroot" "./no_exists" "-L" "crate=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out\\panic_abort" "--target=i686-pc-windows-msvc"
output status: `exit code: 1`
=== STDOUT ===



=== STDERR ===
error[E0463]: can't find crate for `panic_abort` which `std` depends on
---



command failed at line 60
"D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "-L" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out" "lib.rs" "-Cpanic=abort" "--sysroot" "./no_exists" "-L" "dependency=D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out\\panic_abort" "--target=i686-pc-windows-msvc"
output status: `exit code: 1`
=== STDOUT ===



=== STDERR ===
error: linking with `link.exe` failed: exit code: 1120
  |
  = note: "C:\\Program Files\\Microsoft Visual Studio\\18\\Enterprise\\VC\\Tools\\MSVC\\14.51.36231\\bin\\HostX64\\x86\\link.exe" "/DEF:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out\\rustcyaQpqU\\lib.def" "/NOLOGO" "/LARGEADDRESSAWARE" "/SAFESEH" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out\\rustcyaQpqU\\symbols.o" "<1 object files omitted>" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out\\rustcyaQpqU\\rmeta.o" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out/libstd.rlib" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out\\panic_abort/libpanic_abort.rlib" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out/libcore.rlib" "/NXCOMPAT" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\run-make\\locate-panic-runtime\\rmake_out" "/OUT:lib.dll" "/OPT:REF,NOICF" "/DLL" "/IMPLIB:lib.dll.lib" "/DEBUG" "/PDBALTPATH:%_PDB%"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note:    Creating library lib.dll.lib and object lib.dll.exp
          LINK : error LNK2001: unresolved external symbol __DllMainCRTStartup@12
          lib.dll : fatal error LNK1120: 1 unresolved externals
          

error: aborting due to 1 previous error
------------------------------------------

---
Currently active steps:
test::RunMake { test_compiler: Compiler { stage: 2, host: i686-pc-windows-msvc, forced_compiler: false }, target: i686-pc-windows-msvc } at src\bootstrap\src\core\build_steps\test.rs:1961
test::Compiletest { test_compiler: Compiler { stage: 2, host: i686-pc-windows-msvc, forced_compiler: false }, target: i686-pc-windows-msvc, mode: run-make, suite: "run-make", path: "tests/run-make", compare_mode: None } at src\bootstrap\src\core\build_steps\test.rs:1961
Build completed unsuccessfully in 1:48:29
make: *** [Makefile:115: ci-msvc-py] Error 1
  local time: Fri Jul 31 13:43:12 CUT 2026
  network time: Fri, 31 Jul 2026 13:43:16 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

@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

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

This rollup was thus 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-bors rust-bors Bot added 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-bors

rust-bors Bot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

💔 Test for bc4805a failed: CI. Failed jobs:

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-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs 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 S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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.