Skip to content

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Dec 23, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tshepang and others added 30 commits December 16, 2025 06:04
This updates the rust-version file to 2dc3024.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 2dc3024
Filtered ref: 08ec2a0faafad679655e4349f1484bb25ed1fdbf
Upstream diff: rust-lang/rust@cec7008...2dc3024

This merge was created using https://github.com/rust-lang/josh-sync.
 Please enter the commit message for your changes. Lines starting
remove `MetadataDecodable` and add `BlobDecodable` and `LazyDecodable`.
stabilization_guide: add missing `)` in prose
Co-authored-by: Tshepang Mbambo <hopsi@tuta.io>
Clarify serialization macros documentation
add comment to closure-move-use-after-move-diagnostic.rs

add comment to missing-operator-after-float.rs

add comment to closure-array-break-length.rs

add comment to box-lifetime-argument-not-allowed.rs

add comment to const-return-outside-fn.rs

add comment to drop-conflicting-impls.rs

add comment to unbalanced-doublequote-2.rs

add comment to borrow-immutable-deref-box.rs

add comment to for-in-const-eval.rs

add comment to borrowck-annotated-static-lifetime.rs

cleaned up cast-rfc0401.rs

add comment to nll-anon-to-static.rs

add comment to cast-to-dyn-any.rs

add comment to missing-associated-items.rs

add comment to enum-discriminant-missing-variant.rs
Kobzol and others added 9 commits December 23, 2025 14:16
This keeps all build artefacts (even temporary ones) within the build directory.
to invalid-tmpdir-no-ice
…=bjorn3

Don't export upstream monomorphizations from compiler-builtins
Tidying up tests/ui/issues 15 tests [6/N]

> [!NOTE]
> Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge.

part of rust-lang#133895

r? Kivooeo
Update bors configuration

Updates the configuration of bors to bring it up to speed with homu, in preparation for rust-lang/infra-team#168. Mirrors configuration from homu's [configuration file](https://github.com/rust-lang/homu/blob/master/cfg.production.toml#L46).

This PR also enables reporting of merge conflicts, so that we can test this part of bors on `rust-lang/rust`. The merge conflict reports will be duplicated (until/unless we disable it in homu), but that hopefully shouldn't be such a big deal.

r? `@marcoieni`
Avoid using env::temp when linking a binary

This keeps all build artefacts (even temporary ones) within the build directory.

Fixes rust-lang#139963
rustc-dev-guide subtree update

Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@1127d2a.

Created using https://github.com/rust-lang/josh-sync.

r? `@ghost`
@rustbot rustbot added A-CI Area: Our Github Actions CI A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide 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-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. rollup A PR which is a rollup labels Dec 23, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Dec 23, 2025

📌 Commit 8965c2f has been approved by matthiaskrgr

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

bors commented Dec 23, 2025

⌛ Testing commit 8965c2f with merge 7a53ec4...

bors added a commit that referenced this pull request Dec 23, 2025
Rollup of 5 pull requests

Successful merges:

 - #150182 (Don't export upstream monomorphizations from compiler-builtins)
 - #150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - #150308 (Update bors configuration)
 - #150311 (Avoid using env::temp when linking a binary)
 - #150314 (rustc-dev-guide subtree update)

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

The job x86_64-mingw-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\invalid-tmpdir-no-ice stdout ----

error: rmake recipe failed to complete
status: exit code: 101
command: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make\\invalid-tmpdir-no-ice\\rmake.exe"
stdout: none
--- stderr -------------------------------
assert_not_contains:
=== HAYSTACK ===
error: linking with `x86_64-w64-mingw32-gcc` failed: exit code: 4
  |
  = note: "x86_64-w64-mingw32-gcc" "-fno-use-linker-plugin" "-Wl,--dynamicbase" "-Wl,--disable-auto-image-base" "-m64" "-Wl,--high-entropy-va" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make\\invalid-tmpdir-no-ice\\rmake_out\\rustcjHNrOu\\symbols.o" "<2 object files omitted>" "-Wl,-Bstatic" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-gnu\\lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libcfg_if-*,libwindows_targets-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,liblibc-*,librustc_std_workspace_core-*,liballoc-*,libcore-*,libcompiler_builtins-*}.rlib" "-Wl,-Bdynamic" "-lkernel32" "-lkernel32" "-lkernel32" "-lntdll" "-luserenv" "-lws2_32" "-ldbghelp" "-lgcc_eh" "-l:libpthread.a" "-lmsvcrt" "-lmingwex" "-lmingw32" "-lgcc" "-lmsvcrt" "-lmingwex" "-luser32" "-lkernel32" "-Wl,--nxcompat" "-L" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make\\invalid-tmpdir-no-ice\\rmake_out" "-o" "foo.exe" "-Wl,--gc-sections" "-no-pie" "-nodefaultlibs"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: Cannot create temporary file in D:\a\rust\rust\build\x86_64-pc-windows-gnu\test\run-make\invalid-tmpdir-no-ice\rmake_out\fake\: No such file or directory
          x86_64-w64-mingw32-gcc: internal compiler error: Aborted signal terminated program collect2
          Please submit a full bug report, with preprocessed source (by using -freport-bug).
          See <https://github.com/niXman/mingw-builds> for instructions.
          

error: aborting due to 1 previous error


---

Some tests failed in compiletest suite=run-make mode=run-make host=x86_64-pc-windows-gnu target=x86_64-pc-windows-gnu
Bootstrap failed while executing `test --stage 2 --skip=compiler --skip=src`
Build completed unsuccessfully in 2:33:28
make: *** [Makefile:123: ci-mingw-x] Error 1
  local time: Tue Dec 23 23:51:56 CUT 2025
  network time: Tue, 23 Dec 2025 23:51:56 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

@bors
Copy link
Collaborator

bors commented Dec 23, 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 Dec 23, 2025
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-run-make Area: port run-make Makefiles to rmake.rs A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.