Rollup of 7 pull requests #136174

Zalathar · 2025-01-28T06:52:57Z

Successful merges:

Trim extra whitespace in fn ptr suggestion span #133151 (Trim extra whitespace in fn ptr suggestion span)
Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ #133929 (Remove -Zinline-in-all-cgus and clean up tests/codegen-units/)
Document purpose of closure in from_fn.rs more clearly #135886 (Document purpose of closure in from_fn.rs more clearly)
Fix 2/4 tests skipped by opt-dist #135961 (Fix 2/4 tests skipped by opt-dist)
Add mermaid graphs of NLL regions and SCCs to polonius MIR dump #136104 (Add mermaid graphs of NLL regions and SCCs to polonius MIR dump)
Arbitrary self types v2: explain test. #136124 (Arbitrary self types v2: explain test.)
Locate asan-odr-win with other sanitizer tests #136153 (Locate asan-odr-win with other sanitizer tests)

r? @ghost
@rustbot modify labels: rollup

- invert pre/code which was an invalid combination, that works fine in practice - remove unneeded code wrapper for graphs

The purpose of this test wasn't obvious. Add a comment.

Trim extra whitespace when suggesting removal of invalid qualifiers when parsing function pointer type. Fixes: rust-lang#133083 Signed-off-by: Tyrone Wu <[email protected]>

…r=compiler-errors Trim extra whitespace in fn ptr suggestion span Trim extra whitespace when suggesting removal of invalid qualifiers when parsing function pointer type. Fixes: rust-lang#133083 --- I made a comment about the format of the diagnostic error message in rust-lang#133083 (comment). I think the `.label` may be a little redundant if the diagnostic only highlights the bad qualifier instead of the entire `TyKind::BareFn` span. If it makes sense, I can include it in this PR.

…, r=nnethercote Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ Implementation of rust-lang/compiler-team#814 I've taken some liberties with cleaning up the CGU partitioning tests, because that's the only place this flag was used and also mattered. I've often fought a lot with the contents of `tests/codegen-units` and it has never been clear to me when a test failure indicates a problem with my changes as opposed to a test just needing to be manually blessed. Hopefully the combination of the new README, new comments, and using `-Zprint-mono-items=lazy` in the partitioning tests improves that. I've also deleted some of the `tests/run-make/sepcomp` tests. I think all the "sepcomp" tests have been obviated for years by better-designed (less flaky, clearer failures) test suites, but here I'm just deleting the ones I'm confident in.

Document purpose of closure in from_fn.rs more clearly partial fix for rust-lang#135087 together with rust-lang#135895

…jieyouxu Fix 2/4 tests skipped by opt-dist The linker errors were because this one test, strangely, wants itself compiled with `-Ctarget-features=+crt-static`, and yet it looks like the runner image is simply missing static libraries for libc and libm. Eyeballing the output of ``` rustc +nightly --target=x86_64-pc-windows-msvc -O tests/codegen/vec-shrink-panik.rs --emit=llvm-ir ``` suggests that vec-shrink-panik should pass on Windows. And it's quite disturbing that such a test would have failed only on Windows to start with. Exactly why that was would require some advanced digging, but it looks clean now.

…=matthewjasper Add mermaid graphs of NLL regions and SCCs to polonius MIR dump This PR expands the polonius MIR dump again with a couple of mermaid charts ported from the graphviz version: - the NLL region graph - and the NLL SCCs I still have done zero visual design on this until now, but [here's](https://gistpreview.github.io/?fbbf900fed2ad21108c7ca0353456398) how it looks (i.e. still bad) just to give an idea of the result. r? ```@matthewjasper``` (feel free to reassign) or anyone

…-errors Arbitrary self types v2: explain test. The purpose of this test wasn't obvious, as `@traviscross` noted. Add a comment. Confession: although this test was added to demonstrate this particular corner-case, I can no longer reproduce the original problem, even if I adjust `rustc` to do the "wrong" thing. I have spent several hours trying to adjust the case to trigger the "faulty" behavior with no success. This test may therefore not be as useful as it originally was. But it still seems worthwhile retaining as a regression test that we don't break things in these quirky circumstances. Ideally we'd find a new test which tests this behavior but I've failed to come up with one. r? `@traviscross`

Locate asan-odr-win with other sanitizer tests

Zalathar · 2025-01-28T06:53:12Z

@bors r+ rollup=never p=5

bors · 2025-01-28T06:53:14Z

📌 Commit 4716296 has been approved by Zalathar

It is now in the queue for this repository.

Rollup of 7 pull requests Successful merges: - rust-lang#133151 (Trim extra whitespace in fn ptr suggestion span) - rust-lang#133929 (Remove -Zinline-in-all-cgus and clean up tests/codegen-units/) - rust-lang#135886 (Document purpose of closure in from_fn.rs more clearly) - rust-lang#135961 (Fix 2/4 tests skipped by opt-dist) - rust-lang#136104 (Add mermaid graphs of NLL regions and SCCs to polonius MIR dump) - rust-lang#136124 (Arbitrary self types v2: explain test.) - rust-lang#136153 (Locate asan-odr-win with other sanitizer tests) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-01-28T08:53:08Z

⌛ Testing commit 4716296 with merge 0bcd6d7...

rust-log-analyzer · 2025-01-28T09:41:19Z

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

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

[RUSTC-TIMING] rustc_std_workspace_core test:false 0.171
error: could not compile `rustc-std-workspace-core` (lib)

Caused by:
  process didn't exit successfully: `D:\a\rust\rust\build\bootstrap\debug\rustc 'D:\a\rust\rust\build\bootstrap\debug\rustc' --crate-name rustc_std_workspace_core --edition=2021 'library\rustc-std-workspace-core\lib.rs' --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C opt-level=3 -C embed-bitcode=no -C codegen-units=1 -C debug-assertions=on --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values())' -C metadata=9582fd8c2723cb5a -C extra-filename=-6ff60ea8d941e302 --out-dir 'D:\a\rust\rust\build\x86_64-pc-windows-gnu\stage1-std\x86_64-pc-windows-gnu\release\deps' --target x86_64-pc-windows-gnu -L 'dependency=D:\a\rust\rust\build\x86_64-pc-windows-gnu\stage1-std\x86_64-pc-windows-gnu\release\deps' -L 'dependency=D:\a\rust\rust\build\x86_64-pc-windows-gnu\stage1-std\release\deps' --extern 'core=D:\a\rust\rust\build\x86_64-pc-windows-gnu\stage1-std\x86_64-pc-windows-gnu\release\deps\libcore-d39d7221210743d5.rmeta' -Csymbol-mangling-version=legacy '--check-cfg=cfg(feature,values(any()))' -Zunstable-options '--check-cfg=cfg(bootstrap)' -Zmacro-backtrace -Csplit-debuginfo=packed -Cprefer-dynamic -Zinline-mir -Zinline-mir-preserve-debug -Zmir_strip_debuginfo=locals-in-tiny-functions -Alinker-messages -Cembed-bitcode=yes -Cforce-frame-pointers=yes '-Zcrate-attr=doc(html_root_url="https://doc.rust-lang.org/nightly/")' -Z binary-dep-depinfo` (exit code: 0xc00000fd, STATUS_STACK_OVERFLOW)
[RUSTC-TIMING] libc test:false 0.172
[RUSTC-TIMING] compiler_builtins test:false 4.808
[RUSTC-TIMING] core test:false 36.587
Build completed unsuccessfully in 0:41:36
Build completed unsuccessfully in 0:41:36
make: *** [Makefile:120: ci-mingw-x] Error 1
  network time: Tue, 28 Jan 2025 09:41:02 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

bors · 2025-01-28T09:41:55Z

💔 Test failed - checks-actions

hkBst and others added 16 commits January 26, 2025 13:43

Document purpose of closure in from_fn.rs more clearly

d3cd832

add NLL region graph to the polonius MIR dump

1ee7582

add NLL SCCs to polonius MIR dump

052e9b4

tidy up html structure

6bdc2dc

- invert pre/code which was an invalid combination, that works fine in practice - remove unneeded code wrapper for graphs

Arbitrary self types v2: explain test.

d898aa3

The purpose of this test wasn't obvious. Add a comment.

Trim extra whitespace in fn ptr suggestion span

5082fd8

Trim extra whitespace when suggesting removal of invalid qualifiers when parsing function pointer type. Fixes: rust-lang#133083 Signed-off-by: Tyrone Wu <[email protected]>

Locate asan-odr-win with other sanitizer tests

fa4589b

Fix 2/4 tests skipped by opt-dist

1f4309c

Remove -Zinline-in-all-cgus and clean up CGU partitioning tests

bf9df97

Rollup merge of rust-lang#135886 - hkBst:patch-14, r=workingjubilee

9e96c80

Document purpose of closure in from_fn.rs more clearly partial fix for rust-lang#135087 together with rust-lang#135895

Rollup merge of rust-lang#136153 - tmiasko:mv-asan-test, r=lqd

4716296

Locate asan-odr-win with other sanitizer tests

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 Jan 28, 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 Jan 28, 2025

Zalathar closed this Jan 28, 2025

Zalathar deleted the rollup-bgdzjlo branch January 28, 2025 09:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #136174

Rollup of 7 pull requests #136174

Zalathar commented Jan 28, 2025

Zalathar commented Jan 28, 2025

bors commented Jan 28, 2025

bors commented Jan 28, 2025

rust-log-analyzer commented Jan 28, 2025

bors commented Jan 28, 2025

Rollup of 7 pull requests #136174

Rollup of 7 pull requests #136174

Conversation

Zalathar commented Jan 28, 2025

Zalathar commented Jan 28, 2025

bors commented Jan 28, 2025

bors commented Jan 28, 2025

rust-log-analyzer commented Jan 28, 2025

bors commented Jan 28, 2025