Skip to content

Rollup of 9 pull requests #143337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 2, 2025
Merged

Rollup of 9 pull requests #143337

merged 23 commits into from
Jul 2, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jul 2, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

xizheyin and others added 23 commits June 2, 2025 17:45
The skipped test passes since nightly-2024-11-29. Let's stop skipping
it to increase the chance of detecing a regression.
compiletest has confusingly two terminology to refer to the same concept
-- "headers" and "directives". To make this more self-consistent and
less confusing, stick with "directives" only.

This commit **intentionally** tries to be limited to move-only (modulo
some key usage reference renames) to help git history.
Explain `TOCTOU` on the top of `std::fs`, and reference it in functions

Fixes rust-lang#141837

r? ``````@workingjubilee``````
…ilee

Expose elf abi on ppc64 targets

Fixes rust-lang#60617 (after MCP rust-lang/compiler-team#885 is accepted) by exposing the abi information on ppc64 targets.
Conditional compilation can now use `cfg(target_abi = "elfv1")` or `cfg(target_abi = "elfv2")` to determine the abi in use.

Technical details are included in the other PR rust-lang#142598
ci: aarch64-gnu: Stop skipping `panic_abort_doc_tests`

The skipped test passes since `nightly-2024-11-29`. See rust-lang#123733 (comment) and rust-lang#123733 (comment) for more info.

Let's stop skipping it to increase the chance of detecting a regression.

r? ``````@cuviper`````` who added the skip in rust-lang#123828

Also see rust-lang#142304 for an alternative regression test that I am hoping to also land in the near future to complement the test we now stop skipping, but I need to investigate that setup more.
…-bitcast, r=workingjubilee

fix bitcast of single-element SIMD vectors

in effect this reverts rust-lang#142768 and adds additional tests. That PR relaxed the conditions on an early return in an incorrect way that would create broken LLVM IR.

https://godbolt.org/z/PaaGWTv5a

```rust
#![feature(repr_simd)]

#[repr(simd)]
#[derive(Clone, Copy)]
struct S([i64; 1]);

#[no_mangle]
pub extern "C" fn single_element_simd(b: S) -> i64 {
    unsafe { std::mem::transmute(b) }
}
```
at the time of writing generates this LLVM IR, where the type of the return is different from the function's return type.

```llvm
define noundef i64 ``````@single_element_simd(<1`````` x i64> %b) unnamed_addr {
start:
  ret <1 x i64> %b
}
```

The test output is actually the same for the existing tests, showing that the change didn't actually matter for any tested behavior. It is probably a bit faster to do the early return, but, well, it's incorrect in general.

zullip thread: [#t-compiler > Is transmuting a &rust-lang#96;T&rust-lang#96; to &rust-lang#96;Tx1&rust-lang#96; (one-element SIMD vector) UB?](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Is.20transmuting.20a.20.60T.60.20to.20.60Tx1.60.20.28one-element.20SIMD.20vector.29.20UB.3F/with/526262799)
cc ``````@sayantn``````
r? ``````@scottmcm``````
Suggest use another lifetime specifier instead of underscore lifetime

cc rust-lang#143152

r? compiler
…, r=Kobzol

[COMPILETEST-UNTANGLE 3/N] Use "directives" consistently within compiletest

Instead of using *both* "headers" and "directives" within compiletest to refer to the same thing. This of course induces some churn, but it's been bugging me for a while, and I rather do the self-consistency changes now than later.

The first commit tries to be mostly move-only to help per-file git history.

I intend to revisit rustc-dev-guide's testing docs, but I don't want to do it on rust-lang/rust side because it would need syncing and might conflict.
…e, r=oli-obk

Don't recompute `DisambiguatorState` for every RPITIT in trait definition

The `associated_type_for_impl_trait_in_trait` currently needs to rerun the `RPITVisitor` for every RPITIT to compute its disambiguator.

Instead of synthesizing all of the RPITITs def ids one at a time in different queries, just synthesize them inside of the `associated_types_for_impl_traits_in_associated_fn` query. There we can just share the same `DisambiguatorState` for all the RPITITs in one function signature.

r? ``````@Zoxc`````` or ``````@oli-obk`````` cc rust-lang#140453
ci: support optional jobs

try-job: optional-mingw-check-1
@rustbot rustbot added A-compiletest Area: The compiletest test runner 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-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. labels Jul 2, 2025
@rustbot rustbot added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 2, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 2, 2025

📌 Commit c572231 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 Jul 2, 2025
@bors
Copy link
Collaborator

bors commented Jul 2, 2025

⌛ Testing commit c572231 with merge 6677875...

@bors
Copy link
Collaborator

bors commented Jul 2, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 6677875 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 2, 2025
@bors bors merged commit 6677875 into rust-lang:master Jul 2, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 2, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#141847 Explain TOCTOU on the top of std::fs, and reference it … 4533d57e9af4856c0e298fd5e7f1c32df763eb0d (link)
#142138 Add Vec::into_chunks 45734e3420cd62873be645e81ca8f4a1139a1d53 (link)
#142321 Expose elf abi on ppc64 targets d910a3b360516701e00357bd67b92d4e72e3400c (link)
#142886 ci: aarch64-gnu: Stop skipping panic_abort_doc_tests 35585f465d0bf9d6288c6c7b48a5658350bafeeb (link)
#143194 fix bitcast of single-element SIMD vectors 5d4c792ac35a06a0c48010fdf3087d5cb3e085df (link)
#143231 Suggest use another lifetime specifier instead of underscor… 0ff751858daa88e39c8f8b288758bdb7c07d7c3b (link)
#143232 [COMPILETEST-UNTANGLE 3/N] Use "directives" consistently wi… 73f70ac9269eddf218175942cf6d3ff3b1d6f6c8 (link)
#143258 Don't recompute DisambiguatorState for every RPITIT in tr… 97d7eb2a877555cd396eb8d641dd85e97921310d (link)
#143274 ci: support optional jobs 840d5f3eb8d3a129c6cccdb0a768015d8bd8d135 (link)

previous master: 1ce9c977ff

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

Copy link
Contributor

github-actions bot commented Jul 2, 2025

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 1ce9c97 (parent) -> 6677875 (this PR)

Test differences

Show 354 test diffs

Stage 0

  • directives::tests::asm_support: [missing] -> pass (J0)
  • directives::tests::aux_build: [missing] -> pass (J0)
  • directives::tests::channel: [missing] -> pass (J0)
  • directives::tests::cross_compile: [missing] -> pass (J0)
  • directives::tests::debugger: [missing] -> pass (J0)
  • directives::tests::families: [missing] -> pass (J0)
  • directives::tests::git_hash: [missing] -> pass (J0)
  • directives::tests::ignore_arch: [missing] -> pass (J0)
  • directives::tests::ignore_coverage: [missing] -> pass (J0)
  • directives::tests::ignore_target: [missing] -> pass (J0)
  • directives::tests::is_big_endian: [missing] -> pass (J0)
  • directives::tests::llvm_version: [missing] -> pass (J0)
  • directives::tests::matches_abi: [missing] -> pass (J0)
  • directives::tests::matches_env: [missing] -> pass (J0)
  • directives::tests::matches_os: [missing] -> pass (J0)
  • directives::tests::only_target: [missing] -> pass (J0)
  • directives::tests::pointer_width: [missing] -> pass (J0)
  • directives::tests::profiler_runtime: [missing] -> pass (J0)
  • directives::tests::revisions: [missing] -> pass (J0)
  • directives::tests::rustc_debug_assertions: [missing] -> pass (J0)
  • directives::tests::sanitizers: [missing] -> pass (J0)
  • directives::tests::should_fail: [missing] -> pass (J0)
  • directives::tests::stage: [missing] -> pass (J0)
  • directives::tests::std_debug_assertions: [missing] -> pass (J0)
  • directives::tests::system_llvm_version: [missing] -> pass (J0)
  • directives::tests::test_assembly_mode_forbidden_revisions: [missing] -> pass (J0)
  • directives::tests::test_codegen_mode_forbidden_revisions: [missing] -> pass (J0)
  • directives::tests::test_duplicate_revisions: [missing] -> pass (J0)
  • directives::tests::test_error_annotation_no_error: [missing] -> pass (J0)
  • directives::tests::test_extract_version_range: [missing] -> pass (J0)
  • directives::tests::test_forbidden_revisions: [missing] -> pass (J0)
  • directives::tests::test_forbidden_revisions_allowed_in_non_filecheck_dir: [missing] -> pass (J0)
  • directives::tests::test_ignore_auxiliary: [missing] -> pass (J0)
  • directives::tests::test_known_directive_check_no_error: [missing] -> pass (J0)
  • directives::tests::test_llvm_version_invalid_components: [missing] -> pass (J0)
  • directives::tests::test_llvm_version_invalid_prefix: [missing] -> pass (J0)
  • directives::tests::test_llvm_version_too_many_components: [missing] -> pass (J0)
  • directives::tests::test_miropt_mode_forbidden_revisions: [missing] -> pass (J0)
  • directives::tests::test_needs_target_has_atomic: [missing] -> pass (J0)
  • directives::tests::test_needs_target_std: [missing] -> pass (J0)
  • directives::tests::test_non_rs_unknown_directive_not_checked: [missing] -> pass (J0)
  • directives::tests::test_not_trailing_directive: [missing] -> pass (J0)
  • directives::tests::test_parse_normalize_rule: [missing] -> pass (J0)
  • directives::tests::test_rustc_abi: [missing] -> pass (J0)
  • directives::tests::test_supported_crate_types: [missing] -> pass (J0)
  • directives::tests::test_trailing_directive: [missing] -> pass (J0)
  • directives::tests::test_trailing_directive_with_comment: [missing] -> pass (J0)
  • directives::tests::test_unknown_directive_check: [missing] -> pass (J0)
  • directives::tests::threads_support: [missing] -> pass (J0)
  • directives::tests::wasm_special: [missing] -> pass (J0)
  • header::tests::asm_support: pass -> [missing] (J0)
  • header::tests::aux_build: pass -> [missing] (J0)
  • header::tests::channel: pass -> [missing] (J0)
  • header::tests::cross_compile: pass -> [missing] (J0)
  • header::tests::debugger: pass -> [missing] (J0)
  • header::tests::families: pass -> [missing] (J0)
  • header::tests::git_hash: pass -> [missing] (J0)
  • header::tests::ignore_arch: pass -> [missing] (J0)
  • header::tests::ignore_coverage: pass -> [missing] (J0)
  • header::tests::ignore_target: pass -> [missing] (J0)
  • header::tests::is_big_endian: pass -> [missing] (J0)
  • header::tests::llvm_version: pass -> [missing] (J0)
  • header::tests::matches_abi: pass -> [missing] (J0)
  • header::tests::matches_env: pass -> [missing] (J0)
  • header::tests::matches_os: pass -> [missing] (J0)
  • header::tests::only_target: pass -> [missing] (J0)
  • header::tests::pointer_width: pass -> [missing] (J0)
  • header::tests::profiler_runtime: pass -> [missing] (J0)
  • header::tests::revisions: pass -> [missing] (J0)
  • header::tests::rustc_debug_assertions: pass -> [missing] (J0)
  • header::tests::sanitizers: pass -> [missing] (J0)
  • header::tests::should_fail: pass -> [missing] (J0)
  • header::tests::stage: pass -> [missing] (J0)
  • header::tests::std_debug_assertions: pass -> [missing] (J0)
  • header::tests::system_llvm_version: pass -> [missing] (J0)
  • header::tests::test_assembly_mode_forbidden_revisions: pass -> [missing] (J0)
  • header::tests::test_codegen_mode_forbidden_revisions: pass -> [missing] (J0)
  • header::tests::test_duplicate_revisions: pass -> [missing] (J0)
  • header::tests::test_error_annotation_no_error: pass -> [missing] (J0)
  • header::tests::test_extract_llvm_version: pass -> [missing] (J0)
  • header::tests::test_forbidden_revisions: pass -> [missing] (J0)
  • header::tests::test_forbidden_revisions_allowed_in_non_filecheck_dir: pass -> [missing] (J0)
  • header::tests::test_ignore_auxiliary: pass -> [missing] (J0)
  • header::tests::test_llvm_version_invalid_components: pass -> [missing] (J0)
  • header::tests::test_llvm_version_invalid_prefix: pass -> [missing] (J0)
  • header::tests::test_llvm_version_too_many_components: pass -> [missing] (J0)
  • header::tests::test_miropt_mode_forbidden_revisions: pass -> [missing] (J0)
  • header::tests::test_needs_target_has_atomic: pass -> [missing] (J0)
  • header::tests::test_needs_target_std: pass -> [missing] (J0)
  • header::tests::test_non_rs_unknown_directive_not_checked: pass -> [missing] (J0)
  • header::tests::test_not_trailing_directive: pass -> [missing] (J0)
  • header::tests::test_parse_normalize_rule: pass -> [missing] (J0)
  • header::tests::test_rustc_abi: pass -> [missing] (J0)
  • header::tests::test_supported_crate_types: pass -> [missing] (J0)
  • header::tests::test_trailing_directive: pass -> [missing] (J0)
  • header::tests::test_trailing_directive_with_comment: pass -> [missing] (J0)
  • header::tests::test_unknown_directive_check: pass -> [missing] (J0)
  • header::tests::threads_support: pass -> [missing] (J0)
  • header::tests::wasm_special: pass -> [missing] (J0)

Stage 2

  • test::panic_abort_doc_tests: [missing] -> pass (J1)

(and 3 additional test diffs)

Additionally, 251 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 6677875279b560442a07a08d5119b4cd6b3c5593 --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. x86_64-apple-1: 10223.2s -> 7825.7s (-23.5%)
  2. dist-x86_64-apple: 8339.1s -> 7344.9s (-11.9%)
  3. mingw-check-1: 1904.6s -> 1709.4s (-10.2%)
  4. x86_64-apple-2: 5449.5s -> 5945.1s (9.1%)
  5. x86_64-gnu-llvm-19-2: 6252.1s -> 5845.3s (-6.5%)
  6. armhf-gnu: 5581.0s -> 5219.8s (-6.5%)
  7. x86_64-gnu-llvm-20-1: 3652.1s -> 3428.9s (-6.1%)
  8. dist-apple-various: 6976.1s -> 6565.5s (-5.9%)
  9. dist-x86_64-freebsd: 5043.9s -> 4752.4s (-5.8%)
  10. dist-aarch64-apple: 5607.5s -> 5298.0s (-5.5%)
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 (6677875): 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.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -1.6%, secondary -1.0%)

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

mean range count
Regressions ❌
(primary)
1.3% [1.3%, 1.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.1% [-3.3%, -3.0%] 2
Improvements ✅
(secondary)
-1.0% [-1.6%, -0.4%] 2
All ❌✅ (primary) -1.6% [-3.3%, 1.3%] 3

Cycles

Results (primary -0.8%, secondary 1.1%)

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

mean range count
Regressions ❌
(primary)
1.9% [1.7%, 2.1%] 2
Regressions ❌
(secondary)
1.1% [0.5%, 2.3%] 5
Improvements ✅
(primary)
-2.7% [-4.0%, -1.8%] 3
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.8% [-4.0%, 2.1%] 5

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 460.331s -> 461.735s (0.30%)
Artifact size: 372.27 MiB -> 372.23 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.