Rollup of 7 pull requests by matthiaskrgr · Pull Request #140017 · rust-lang/rust

matthiaskrgr · 2025-04-18T20:36:23Z

Successful merges:

not lint break with label and unsafe block #137454 (not lint break with label and unsafe block)
support config extensions #138934 (support config extensions)
Deduplicate & clean up Nix shell #139297 (Deduplicate & clean up Nix shell)
Don't canonicalize crate paths #139834 (Don't canonicalize crate paths)
Add citool command for generating a test dashboard #139978 (Add citool command for generating a test dashboard)
skip llvm-config in autodiff check builds, when its unavailable #140000 (skip llvm-config in autodiff check builds, when its unavailable)
Disable has_thread_local on i686-win7-windows-msvc #140007 (Disable has_thread_local on i686-win7-windows-msvc)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Signed-off-by: onur-ozkan <work@onurozkan.dev>

And clean it up a little.

`assembly/asm` contained a test named `asm/aarch64-el2vmsa.rs`, while it should have been only `arch64-el2vmsa.rs`.

On Windows 7 32-bit, the alignment characteristic of the TLS Directory don't appear to be respected by the PE Loader, leading to crashes. As a result, let's disable has_thread_local to make sure TLS goes through the emulation layer.

Signed-off-by: onur-ozkan <work@onurozkan.dev>

…leywiser not lint break with label and unsafe block fixes rust-lang#137414 we can't label unsafe blocks, so that we can do not lint them

…s, r=Kobzol support config extensions _Copied from the `rustc-dev-guide` addition:_ >When working on different tasks, you might need to switch between different bootstrap >configurations. >Sometimes you may want to keep an old configuration for future use. But saving raw config >values in >random files and manually copying and pasting them can quickly become messy, especially if >you have a >long history of different configurations. > >To simplify managing multiple configurations, you can create config extensions. > >For example, you can create a simple config file named `cross.toml`: > >```toml >[build] >build = "x86_64-unknown-linux-gnu" >host = ["i686-unknown-linux-gnu"] >target = ["i686-unknown-linux-gnu"] > > >[llvm] >download-ci-llvm = false > >[target.x86_64-unknown-linux-gnu] >llvm-config = "/path/to/llvm-19/bin/llvm-config" >``` > >Then, include this in your `bootstrap.toml`: > >```toml >include = ["cross.toml"] >``` > >You can also include extensions within extensions recursively. > >**Note:** In the `include` field, the overriding logic follows a right-to-left order. For example, in `include = ["a.toml", "b.toml"]`, extension `b.toml` overrides `a.toml`. Also, parent extensions always overrides the inner ones. try-job: x86_64-mingw-2

matthiaskrgr · 2025-04-18T20:36:53Z

@bors r+ rollup=never p=5

bors · 2025-04-18T20:36:56Z

📌 Commit b7b3dde has been approved by matthiaskrgr

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#137454 (not lint break with label and unsafe block) - rust-lang#138934 (support config extensions) - rust-lang#139297 (Deduplicate & clean up Nix shell) - rust-lang#139834 (Don't canonicalize crate paths) - rust-lang#139978 (Add citool command for generating a test dashboard) - rust-lang#140000 (skip llvm-config in autodiff check builds, when its unavailable) - rust-lang#140007 (Disable has_thread_local on i686-win7-windows-msvc) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-04-18T23:28:25Z

⌛ Testing commit b7b3dde with merge c9e9521...

rust-log-analyzer · 2025-04-19T01:10:55Z

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

Click to see the possible cause of the failure (guessed by this bot)

test result: FAILED. 331 passed; 1 failed; 3 ignored; 0 measured; 0 filtered out; finished in 15.34s

Some tests failed in compiletest suite=mir-opt mode=mir-opt host=x86_64-pc-windows-msvc target=x86_64-pc-windows-msvc
Build completed unsuccessfully in 1:34:46
make: *** [Makefile:113: ci-msvc-py] Error 1
  local time: Sat Apr 19 01:10:39 CUT 2025
  network time: Sat, 19 Apr 2025 01:10:39 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

bors · 2025-04-19T01:11:32Z

💔 Test failed - checks-actions

matthiaskrgr · 2025-04-19T05:42:50Z

@bors retry

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#137454 (not lint break with label and unsafe block) - rust-lang#138934 (support config extensions) - rust-lang#139297 (Deduplicate & clean up Nix shell) - rust-lang#139834 (Don't canonicalize crate paths) - rust-lang#139978 (Add citool command for generating a test dashboard) - rust-lang#140000 (skip llvm-config in autodiff check builds, when its unavailable) - rust-lang#140007 (Disable has_thread_local on i686-win7-windows-msvc) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-04-19T05:46:55Z

⌛ Testing commit b7b3dde with merge a4584ba...

rust-log-analyzer · 2025-04-19T07:59:53Z

The job dist-x86_64-msvc failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[2025-04-19T06:36:23Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-04-19T06:36:23Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Debug, scenario=Some(Full), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-19T06:36:23Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpfmrvWs#ctfe-stress-5@0.1.0" "--" "--wrap-rustc-with" "Eprintln"
[2025-04-19T06:36:29Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Debug, scenario=Some(IncrFull), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-19T06:36:29Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpfmrvWs#ctfe-stress-5@0.1.0" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpfmrvWs\\incremental-state"
[2025-04-19T06:36:35Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Debug, scenario=Some(IncrUnchanged), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-19T06:36:35Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpfmrvWs#ctfe-stress-5@0.1.0" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpfmrvWs\\incremental-state"
Running ctfe-stress-5: Opt + [Full, IncrFull, IncrUnchanged, IncrPatched] + Llvm + X86_64UnknownLinuxGnu
[2025-04-19T06:36:35Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-04-19T06:36:35Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Opt, scenario=Some(Full), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-19T06:36:35Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpsrLm3A#ctfe-stress-5@0.1.0" "--release" "--" "--wrap-rustc-with" "Eprintln"
[2025-04-19T06:36:41Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Opt, scenario=Some(IncrFull), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
---
[2025-04-19T06:38:56Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-04-19T06:38:56Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Opt, scenario=Some(Full), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-19T06:38:56Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpQLIdaS#tuple-stress@0.1.0" "--release" "--" "--wrap-rustc-with" "Eprintln"
[2025-04-19T06:39:00Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Opt, scenario=Some(IncrFull), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-19T06:39:00Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpQLIdaS#tuple-stress@0.1.0" "--release" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpQLIdaS\\incremental-state"
[2025-04-19T06:39:03Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Opt, scenario=Some(IncrUnchanged), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-19T06:39:03Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpQLIdaS#tuple-stress@0.1.0" "--release" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpQLIdaS\\incremental-state"
[2025-04-19T06:39:05Z DEBUG collector::compile::benchmark] applying patch new row
[2025-04-19T06:39:05Z DEBUG collector::compile::benchmark::patch] applying new row to "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpQLIdaS"
[2025-04-19T06:39:05Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Opt, scenario=Some(IncrPatched), patch=Some(Patch { index: 0, name: PatchName("new row"), path: "0-new-row.patch" }), backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-19T06:39:05Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpQLIdaS#tuple-stress@0.1.0" "--release" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpQLIdaS\\incremental-state"
Finished benchmark tuple-stress (8/8)
##[endgroup]
[2025-04-19T06:39:09.141Z INFO  opt_dist::training] Merging Rustc PGO profiles to C:\a\rust\rust\opt-artifacts\rustc-pgo.profdata
[2025-04-19T06:39:09.141Z INFO  opt_dist::exec] Executing `C:\a\rust\rust\build\x86_64-pc-windows-msvc\llvm\build\bin/llvm-profdata.exe merge -o C:\a\rust\rust\opt-artifacts\rustc-pgo.profdata C:\a\rust\rust\opt-artifacts\rustc-pgo [at C:\a\rust\rust]`
[2025-04-19T06:39:31.148Z INFO  opt_dist::training] Rustc PGO statistics

bors · 2025-04-19T08:00:47Z

💔 Test failed - checks-actions

matthiaskrgr · 2025-04-19T08:11:26Z

@bors retry
failed to remove and recreate output directoryC:\a\rust\rust\build\x86_64-pc-windows-msvc\test\mir-opt\strip_debuginfo`: Access is denied. (os error 5)

bors · 2025-04-19T11:11:32Z

⌛ Testing commit b7b3dde with merge 2c5ee41...

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#137454 (not lint break with label and unsafe block) - rust-lang#138934 (support config extensions) - rust-lang#139297 (Deduplicate & clean up Nix shell) - rust-lang#139834 (Don't canonicalize crate paths) - rust-lang#139978 (Add citool command for generating a test dashboard) - rust-lang#140000 (skip llvm-config in autodiff check builds, when its unavailable) - rust-lang#140007 (Disable has_thread_local on i686-win7-windows-msvc) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-04-19T12:52:53Z

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

Click to see the possible cause of the failure (guessed by this bot)

failures:

---- [mir-opt] tests\mir-opt\strip_debuginfo.rs#TINY stdout ----

thread '[mir-opt] tests\mir-opt\strip_debuginfo.rs#TINY' panicked at src\tools\compiletest\src\runtest.rs:1516:17:
failed to remove and recreate output directory `D:\a\rust\rust\build\x86_64-pc-windows-msvc\test\mir-opt\strip_debuginfo`: The directory is not empty. (os error 145)
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


failures:
    [mir-opt] tests\mir-opt\strip_debuginfo.rs#TINY

test result: FAILED. 331 passed; 1 failed; 3 ignored; 0 measured; 0 filtered out; finished in 15.13s

Some tests failed in compiletest suite=mir-opt mode=mir-opt host=x86_64-pc-windows-msvc target=x86_64-pc-windows-msvc
Build completed unsuccessfully in 1:32:06
make: *** [Makefile:113: ci-msvc-py] Error 1
  local time: Sat Apr 19 12:52:39 CUT 2025
  network time: Sat, 19 Apr 2025 12:52:39 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

bors · 2025-04-19T12:53:32Z

💔 Test failed - checks-actions

mu001999 and others added 30 commits February 23, 2025 11:29

not lint break with label and unsafe block

3fe0b3d

add new config option: include

1c1febc

Signed-off-by: onur-ozkan <work@onurozkan.dev>

document config extensions

89e3bef

Signed-off-by: onur-ozkan <work@onurozkan.dev>

implement cyclic inclusion handling

4e80659

Signed-off-by: onur-ozkan <work@onurozkan.dev>

document include in bootstrap.example.toml

78cb453

Signed-off-by: onur-ozkan <work@onurozkan.dev>

apply nit notes

3f70f19

Signed-off-by: onur-ozkan <work@onurozkan.dev>

fix path and the ordering logic

8e6f50b

Signed-off-by: onur-ozkan <work@onurozkan.dev>

add FIXME note in TomlConfig::merge

7dfb457

Signed-off-by: onur-ozkan <work@onurozkan.dev>

add comment in TomlConfig::merge about the merge order

6d52b51

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Don't canonicalize crate paths

2024e26

Test for relative paths in crate path diagnostics

52f35d0

resolve config include FIXME

8270478

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Deduplicate nix code

5a38550

And clean it up a little.

Make parent in download_auto_job_metrics optional

d14df26

Extract function for normalizing path delimiters to utils

111c15c

Add command to citool for generating a test dashboard

c8a882b

Add buttons for expanding and collapsing all test suites

a326afd

Add a note about how to find tests that haven't been executed anywhere.

4b31033

Render test revisions separately

1a6e0d5

Create a macro for rendering test results

d2c1763

Print number of root tests and subdirectories

aa9cb70

Turn test_dashboard into a file

08cb187

Add a note about the test dashboard to the post-merge report

cecf167

skip llvm-config in autodiff check builds, when its unavailable

136171c

Add a note that explains the counts

65ce38a

Reduce duplicated test prefixes in nested subdirectories

b18e373

`assembly/asm` contained a test named `asm/aarch64-el2vmsa.rs`, while it should have been only `arch64-el2vmsa.rs`.

Disable has_thread_local on i686-win7-windows-msvc

1b39302

On Windows 7 32-bit, the alignment characteristic of the TLS Directory don't appear to be respected by the PE Loader, leading to crashes. As a result, let's disable has_thread_local to make sure TLS goes through the emulation layer.

add coverage on config include logic

ac7d1be

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Rollup merge of rust-lang#137454 - mu001999-contrib:fix-137414, r=wes…

b31aff5

…leywiser not lint break with label and unsafe block fixes rust-lang#137414 we can't label unsafe blocks, so that we can do not lint them

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 Apr 18, 2025

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 Apr 19, 2025

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 Apr 19, 2025

matthiaskrgr added the CI-spurious-fail-msvc CI spurious failure: target env msvc label Apr 19, 2025

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 Apr 19, 2025

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 Apr 19, 2025

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 Apr 19, 2025

matthiaskrgr closed this Apr 20, 2025

Uh oh!

Conversation

matthiaskrgr commented Apr 18, 2025

Uh oh!

matthiaskrgr commented Apr 18, 2025

Uh oh!

bors commented Apr 18, 2025

Uh oh!

bors commented Apr 18, 2025

Uh oh!

rust-log-analyzer commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

matthiaskrgr commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

rust-log-analyzer commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

matthiaskrgr commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

rust-log-analyzer commented Apr 19, 2025

Uh oh!

bors commented Apr 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants