Skip to content

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Nov 28, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

pvdrz and others added 21 commits November 21, 2025 10:56
It is now part of the main workspace.
typeck/qualified-path-params.rs

merged test removed ui/qualified directory
…-timeout, r=Enselic

Add a timeout to the `remote-test-client` connection

Currently, the `remote-test-client` doesn't have a timeout when connecting to the `remote-test-server`. This means that running tests using it can hang indefinitely which causes issues when running tests on CI, for example.

This PR now sets a default timeout of 5 minutes, meaning that if, for example, `TEST_DEVICE_ADDR=<IP:PORT> ./x test --target riscv64gc-unknown-linux-gnu tests/ui` is run and the `remote-test-server` is not reachable by the client, the client will panic after the timeout is reached.

Additionally, the `TEST_DEVICE_CONNECT_TIMEOUT` env variable can be used to set up the timeout to any value (in seconds).

This PR also wires up a test step for `remote-test-client`, which didn't previously have tool tests run in CI.

Edit: ~~blocked by rust-lang#149071~~
Fix ICE when include_str! reads binary files

ICE occurred when an invalid UTF8 file with an absolute path were included.

resolve: rust-lang#149304
…gn-struct-fields, r=Kivooeo

add regression test for issue rust-lang#143987

closes rust-lang#143987
Tidying up UI tests [5/N]

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

part of rust-lang#133895

merge directory

* `macro_backtrace` -> `macros`
* `missing_non_modrs_mod` -> `modules`
* `modules_and_files_visibility` -> `modules`
* `qualified` -> `typeck`
* `while` -> `for-loop-whlie`

r? Kivooeo
…ted-closure-ice, r=JonathanBrouwer

add test for issue 143821

closes rust-lang#143821
Remove test-float-parse from workspace list in tidy

It is now part of the main workspace.
@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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. rollup A PR which is a rollup labels Nov 28, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Nov 28, 2025

📌 Commit 3730b40 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 Nov 28, 2025
@bors
Copy link
Collaborator

bors commented Nov 28, 2025

⌛ Testing commit 3730b40 with merge 089bfa2...

bors added a commit that referenced this pull request Nov 28, 2025
Rollup of 6 pull requests

Successful merges:

 - #147952 (Add a timeout to the `remote-test-client` connection)
 - #149321 (Fix ICE when include_str! reads binary files)
 - #149398 (add regression test for issue #143987)
 - #149411 (Tidying up UI tests [5/N])
 - #149413 (add test for issue 143821)
 - #149415 (Remove test-float-parse from workspace list in tidy)

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

The job arm-android 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/clear-error-blank-output stdout ----

error: rmake recipe failed to complete
status: exit status: 101
command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/clear-error-blank-output/rmake_out" && env -u RUSTFLAGS AR="llvm-ar" BUILD_ROOT="/checkout/obj/build/x86_64-unknown-linux-gnu" CC="/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang" CC_DEFAULT_FLAGS="-DANDROID -ffunction-sections -fdata-sections -fPIC" CXX="/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++" CXX_DEFAULT_FLAGS="-DANDROID -ffunction-sections -fdata-sections -fPIC" HOST_RUSTC_DYLIB_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgputargetmca amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard cgdata codegen codegentypes core coroutines coverage csky cskyasmparser cskycodegen cskydesc cskydisassembler cskyinfo debuginfobtf debuginfocodeview debuginfodwarf debuginfodwarflowlevel debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarfcfichecker dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontendatomic frontenddirective frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld sandboxir scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser telemetry textapi textapibinaryreader transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray xtensa xtensaasmparser xtensacodegen xtensadesc xtensadisassembler xtensainfo" LLVM_FILECHECK="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck" PYTHON="/usr/bin/python3" REMOTE_TEST_CLIENT="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/remote-test-client" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUSTC_LINKER="/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" SOURCE_ROOT="/checkout" TARGET="arm-linux-androideabi" TARGET_EXE_DYLIB_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-linux-androideabi/lib" __RUSTC_DEBUG_ASSERTIONS_ENABLED="1" __STD_DEBUG_ASSERTIONS_ENABLED="1" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/clear-error-blank-output/rmake"
stdout: none
--- stderr -------------------------------

thread 'main' (284715) panicked at /checkout/tests/run-make/clear-error-blank-output/rmake.rs:11:64:
called `Result::unwrap()` on an `Err` value: Os { code: 32, kind: BrokenPipe, message: "Broken pipe" }

@bors
Copy link
Collaborator

bors commented Nov 28, 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 Nov 28, 2025
@matthiaskrgr
Copy link
Member Author

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

bors commented Nov 28, 2025

⌛ Testing commit 3730b40 with merge cc3eee7...

@bors bors mentioned this pull request Nov 28, 2025
@bors
Copy link
Collaborator

bors commented Nov 28, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing cc3eee7 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 28, 2025
@bors bors merged commit cc3eee7 into rust-lang:main Nov 28, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 28, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#147952 Add a timeout to the remote-test-client connection c141add71ded88eb40751cbaeaf168dbe3d44e0c (link)
#149321 Fix ICE when include_str! reads binary files ad30afe2d260b04419777755f1db03122f7697cf (link)
#149398 add regression test for issue #143987 147a5979a21d92f39d842f198cdeaa1397d7ce28 (link)
#149411 Tidying up UI tests [5/N] 959d02e2f816e4c0a22372cefa63c9b2709cdc91 (link)
#149413 add test for issue 143821 fdc61329786dec928a6dcf79b38484954e3045f0 (link)
#149415 Remove test-float-parse from workspace list in tidy af2c27d5e1fef23386bf7cf72e241eac1369f554 (link)

previous master: 9050733395

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 9050733 (parent) -> cc3eee7 (this PR)

Test differences

Show 67 test diffs

Stage 0

  • test_timeout: [missing] -> pass (J2)

Stage 1

  • [ui] tests/ui/attributes/align-on-fields-143987.rs: [missing] -> pass (J1)
  • [ui] tests/ui/borrowck/nested-closure-with-generic-ice.rs: [missing] -> pass (J1)
  • [ui] tests/ui/for-loop-while/while-else-err.rs: [missing] -> pass (J1)
  • [ui] tests/ui/for-loop-while/while-else-let-else-err.rs: [missing] -> pass (J1)
  • [ui] tests/ui/for-loop-while/while-let-scope.rs: [missing] -> pass (J1)
  • [ui] tests/ui/include-macros/invalid-utf8-binary-file.rs: [missing] -> pass (J1)
  • [ui] tests/ui/macro_backtrace/main.rs#-Zmacro-backtrace: pass -> [missing] (J1)
  • [ui] tests/ui/macro_backtrace/main.rs#default: pass -> [missing] (J1)
  • [ui] tests/ui/macros/macro-backtrace-complex.rs#-Zmacro-backtrace: [missing] -> pass (J1)
  • [ui] tests/ui/macros/macro-backtrace-complex.rs#default: [missing] -> pass (J1)
  • [ui] tests/ui/missing_non_modrs_mod/foo.rs: ignore (ignored used by another main test file ((used by ./missing_non_modrs_mod.rs))) -> [missing] (J1)
  • [ui] tests/ui/missing_non_modrs_mod/foo_inline.rs: ignore (ignored used by another main test file ((used by ./missing_non_modrs_mod_inline.rs))) -> [missing] (J1)
  • [ui] tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs: pass -> [missing] (J1)
  • [ui] tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs: pass -> [missing] (J1)
  • [ui] tests/ui/modules/missing_mod.rs: [missing] -> ignore (ignored used by another main test file ((used by ./missing_non_modrs_mod.rs))) (J1)
  • [ui] tests/ui/modules/missing_mod_inline.rs: [missing] -> ignore (ignored used by another main test file ((used by ./missing_non_modrs_mod_inline.rs))) (J1)
  • [ui] tests/ui/modules/missing_non_modrs_mod.rs: [missing] -> pass (J1)
  • [ui] tests/ui/modules/missing_non_modrs_mod_inline.rs: [missing] -> pass (J1)
  • [ui] tests/ui/modules/mod_file_aux.rs: ignore (ignored used by another main test file ((used by ./mod_file_with_path_attr.rs and mod_file.rs))) -> ignore (ignored used by another main test file ((used by ./mod_file_with_path_attr.rs and mod_file.rs and mod_file_correct_spans.rs))) (J1)
  • [ui] tests/ui/modules/mod_file_correct_spans.rs: [missing] -> pass (J1)
  • [ui] tests/ui/modules/mod_file_disambig.rs: [missing] -> pass (J1)
  • [ui] tests/ui/modules/mod_file_disambig_aux.rs: [missing] -> ignore (ignored used by another main test file ((used by ./mod_file_disambig.rs))) (J1)
  • [ui] tests/ui/modules_and_files_visibility/mod_file_aux.rs: ignore (ignored used by another main test file ((used by ./mod_file_correct_spans.rs))) -> [missing] (J1)
  • [ui] tests/ui/modules_and_files_visibility/mod_file_correct_spans.rs: pass -> [missing] (J1)
  • [ui] tests/ui/modules_and_files_visibility/mod_file_disambig.rs: pass -> [missing] (J1)
  • [ui] tests/ui/modules_and_files_visibility/mod_file_disambig_aux.rs: ignore (ignored used by another main test file ((used by ./mod_file_disambig.rs))) -> [missing] (J1)
  • [ui] tests/ui/qualified/qualified-path-params-2.rs: pass -> [missing] (J1)
  • [ui] tests/ui/qualified/qualified-path-params.rs: pass -> [missing] (J1)
  • [ui] tests/ui/typeck/qualified-path-params.rs: [missing] -> pass (J1)
  • [ui] tests/ui/while/while-else-err.rs: pass -> [missing] (J1)
  • [ui] tests/ui/while/while-else-let-else-err.rs: pass -> [missing] (J1)
  • [ui] tests/ui/while/while-let-scope-issue-40235.rs: pass -> [missing] (J1)

Stage 2

  • [ui] tests/ui/attributes/align-on-fields-143987.rs: [missing] -> pass (J0)
  • [ui] tests/ui/borrowck/nested-closure-with-generic-ice.rs: [missing] -> pass (J0)
  • [ui] tests/ui/for-loop-while/while-else-err.rs: [missing] -> pass (J0)
  • [ui] tests/ui/for-loop-while/while-else-let-else-err.rs: [missing] -> pass (J0)
  • [ui] tests/ui/for-loop-while/while-let-scope.rs: [missing] -> pass (J0)
  • [ui] tests/ui/include-macros/invalid-utf8-binary-file.rs: [missing] -> pass (J0)
  • [ui] tests/ui/macro_backtrace/main.rs#-Zmacro-backtrace: pass -> [missing] (J0)
  • [ui] tests/ui/macro_backtrace/main.rs#default: pass -> [missing] (J0)
  • [ui] tests/ui/macros/macro-backtrace-complex.rs#-Zmacro-backtrace: [missing] -> pass (J0)
  • [ui] tests/ui/macros/macro-backtrace-complex.rs#default: [missing] -> pass (J0)
  • [ui] tests/ui/missing_non_modrs_mod/foo.rs: ignore (ignored used by another main test file ((used by ./missing_non_modrs_mod.rs))) -> [missing] (J0)
  • [ui] tests/ui/missing_non_modrs_mod/foo_inline.rs: ignore (ignored used by another main test file ((used by ./missing_non_modrs_mod_inline.rs))) -> [missing] (J0)
  • [ui] tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.rs: pass -> [missing] (J0)
  • [ui] tests/ui/missing_non_modrs_mod/missing_non_modrs_mod_inline.rs: pass -> [missing] (J0)
  • [ui] tests/ui/modules/missing_mod.rs: [missing] -> ignore (ignored used by another main test file ((used by ./missing_non_modrs_mod.rs))) (J0)
  • [ui] tests/ui/modules/missing_mod_inline.rs: [missing] -> ignore (ignored used by another main test file ((used by ./missing_non_modrs_mod_inline.rs))) (J0)
  • [ui] tests/ui/modules/missing_non_modrs_mod.rs: [missing] -> pass (J0)
  • [ui] tests/ui/modules/missing_non_modrs_mod_inline.rs: [missing] -> pass (J0)
  • [ui] tests/ui/modules/mod_file_aux.rs: ignore (ignored used by another main test file ((used by ./mod_file_with_path_attr.rs and mod_file.rs))) -> ignore (ignored used by another main test file ((used by ./mod_file_with_path_attr.rs and mod_file.rs and mod_file_correct_spans.rs))) (J0)
  • [ui] tests/ui/modules/mod_file_correct_spans.rs: [missing] -> pass (J0)
  • [ui] tests/ui/modules/mod_file_disambig.rs: [missing] -> pass (J0)
  • [ui] tests/ui/modules/mod_file_disambig_aux.rs: [missing] -> ignore (ignored used by another main test file ((used by ./mod_file_disambig.rs))) (J0)
  • [ui] tests/ui/modules_and_files_visibility/mod_file_aux.rs: ignore (ignored used by another main test file ((used by ./mod_file_correct_spans.rs))) -> [missing] (J0)
  • [ui] tests/ui/modules_and_files_visibility/mod_file_correct_spans.rs: pass -> [missing] (J0)
  • [ui] tests/ui/modules_and_files_visibility/mod_file_disambig.rs: pass -> [missing] (J0)
  • [ui] tests/ui/modules_and_files_visibility/mod_file_disambig_aux.rs: ignore (ignored used by another main test file ((used by ./mod_file_disambig.rs))) -> [missing] (J0)
  • [ui] tests/ui/qualified/qualified-path-params-2.rs: pass -> [missing] (J0)
  • [ui] tests/ui/qualified/qualified-path-params.rs: pass -> [missing] (J0)
  • [ui] tests/ui/typeck/qualified-path-params.rs: [missing] -> pass (J0)
  • [ui] tests/ui/while/while-else-err.rs: pass -> [missing] (J0)
  • [ui] tests/ui/while/while-else-let-else-err.rs: pass -> [missing] (J0)
  • [ui] tests/ui/while/while-let-scope-issue-40235.rs: pass -> [missing] (J0)

Additionally, 2 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard cc3eee7fbe17ea4b7238531cb97e1b7b8bd6afce --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-apple-various: 4508.5s -> 3383.7s (-24.9%)
  2. dist-x86_64-apple: 6765.0s -> 8224.4s (+21.6%)
  3. aarch64-apple: 8722.6s -> 7442.7s (-14.7%)
  4. x86_64-gnu-llvm-20-1: 2933.1s -> 3293.6s (+12.3%)
  5. dist-aarch64-msvc: 6041.5s -> 6591.6s (+9.1%)
  6. tidy: 161.0s -> 175.3s (+8.9%)
  7. dist-x86_64-freebsd: 4821.6s -> 5236.9s (+8.6%)
  8. aarch64-msvc-2: 4787.9s -> 5153.4s (+7.6%)
  9. x86_64-gnu-llvm-20: 2526.4s -> 2361.8s (-6.5%)
  10. x86_64-gnu-gcc: 2820.6s -> 2999.2s (+6.3%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cc3eee7): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.3%, -0.3%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 5.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
5.1% [5.1%, 5.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 5.1% [5.1%, 5.1%] 1

Cycles

Results (secondary -0.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.7% [2.7%, 2.7%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.2% [-4.2%, -4.2%] 1
All ❌✅ (primary) - - 0

Binary size

Results (primary 0.1%, secondary 0.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
0.1% [0.1%, 0.1%] 4
Regressions ❌
(secondary)
0.1% [0.1%, 0.1%] 34
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [0.1%, 0.1%] 4

Bootstrap: 473.019s -> 472.717s (-0.06%)
Artifact size: 386.89 MiB -> 386.88 MiB (-0.00%)

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

Labels

A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants