Skip to content

Rollup of 11 pull requests #142099

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 25 commits into from
Jun 6, 2025
Merged

Rollup of 11 pull requests #142099

merged 25 commits into from
Jun 6, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jun 5, 2025

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cuviper and others added 25 commits June 4, 2025 15:21
This solve a stack overflow found on Fedora s390x when building
`tests/ui/parser/survive-peano-lesson-queue.rs`. Note that the singular
`mirror_expr` method already has this stack check, but in this case the
plural method was the one recursing too deeply.
This solve a stack overflow found on Fedora s390x when building
`tests/ui/associated-consts/issue-93775.rs`.
It uses the file metadata on Unix with a fallback for files incorrectly
reported as zero-sized. It uses `GetFileSizeEx` on Windows.

This reduces the number of syscalls needed for determining the file size
of an open file from 3 to 1.
It can only describe the inner workings of the default implementation,
other implementations might not be implemented using seeks at all.
…nton

Optimize `Seek::stream_len` impl for `File`

It uses the file metadata on Unix with a fallback for files incorrectly reported as zero-sized. It uses `GetFileSizeEx` on Windows.

This reduces the number of syscalls needed for determining the file size of an open file from 3 to 1.
`tests/ui`: A New Order [5/N]

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

r? ``@jieyouxu``
…dead

Replace some `Option<Span>` with `Span` and use DUMMY_SP instead of None

Turns out many locations actually have a span available that we could use, so I used it
…ue-pair, r=scottmcm

compiler: Document the offset invariant of `OperandValue::Pair`

A subtle invariant of `OperandValue::Pair` that came up during review and was found to be undocumented.

Visible in code like this:
https://github.com/rust-lang/rust/blob/4b27a04cc8ed4da10a546a871e23e665d03f7a79/compiler/rustc_codegen_ssa/src/mir/operand.rs#L376-L392
Ensure stack in two places that affect s390x

In our Fedora s390x test results, we found two tests that started hitting stack
overflows in the 1.87.0 update. It seems to be related in some part to our use
of PGO as well, probably inlining more into stack frames that were already
recursive. The main points of recursion that I identified were:

- `ui/parser/survive-peano-lesson-queue.rs` in `ThirBuildCx::mirror_exprs`
- `ui/associated-consts/issue-93775.rs` in `Parser::parse_ty`

A couple new `ensure_sufficient_stack` calls will solve these tests.
…nszelmann

Clean `rustc_attr_parsing/src/lib.rs` documentation

Improves the documentation clarity in `rustc_attr_parsing` by restructuring content with clearer section headers, simplifying explanations of attribute types, making technical descriptions more precise.

r? ``@oli-obk``
…jubilee

canon_abi: make to_erased_extern_abi just a detail in formatting

I think ideally we'd avoid ever printing `CanonAbi` to users, but that needs further changes. Personally I think it's fine for Miri to use the debug printing of `CanonAbi` until we figure that out, but I think others disagree. ;)

r? ``@workingjubilee``
doc: Fix inverted meaning in E0783.md

`...` (three dots) was the old way of saying `..=`, which both denote the *inclusive* range, not the *exclusive* one.
…r=BoxyUwU

add myself to rotation

r? ``@BoxyUwU``
…ubilee

Fix AIX build

Fix rust-lang#141543.

`getenv` was moved out of this file to `sys::env::getenv` in rust-lang#140143. Replace its usage with `std::env::var_os`, the publicly exposed version. This matches the other usages of the same function in this file.
…laumeGomez

rustdoc: Support middle::ty associated const equality predicates again

Fix intentional regression from PR rust-lang#125076.

Fixes rust-lang#125092.
Fixes rust-lang#134775.

CC rust-lang#141368 (`EqPredicates` and rustdoc).
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustdoc-json Area: Rustdoc JSON backend O-unix Operating system: Unix-like O-windows Operating system: Windows labels Jun 5, 2025
@rust-log-analyzer
Copy link
Collaborator

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)
---- [run-make] tests\run-make\rustdoc-dep-info stdout ----

error: rmake recipe failed to complete
status: exit code: 1
command: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make\\rustdoc-dep-info\\rmake.exe"
stdout: none
--- stderr -------------------------------
command failed at line 19
Command { cmd: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "lib.rs" "-Zunstable-options" "--emit=dep-info=bla.d", stdin_buf: None, stdin: None, stdout: None, stderr: None, drop_bomb: DropBomb { command: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2\\bin\\rustdoc.exe", defused: true, armed_location: Location { file: "D:\\a\\rust\\rust\\tests\\run-make\\rustdoc-dep-info\\rmake.rs", line: 19, col: 5 } }, already_executed: true }
output status: `exit code: 0xc00000fd`
=== STDOUT ===



=== STDERR ===

---
test result: FAILED. 285 passed; 1 failed; 110 ignored; 0 measured; 6 filtered out; finished in 228.60s

Some tests failed in compiletest suite=run-make mode=run-make host=x86_64-pc-windows-gnu target=x86_64-pc-windows-gnu
Build completed unsuccessfully in 2:26:56
make: *** [Makefile:123: ci-mingw-x] Error 1
  local time: Fri Jun  6 04:30:54 CUT 2025
  network time: Fri, 06 Jun 2025 04:30:54 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

@bors
Copy link
Collaborator

bors commented Jun 6, 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 Jun 6, 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 Jun 6, 2025
bors added a commit that referenced this pull request Jun 6, 2025
Rollup of 11 pull requests

Successful merges:

 - #125087 (Optimize `Seek::stream_len` impl for `File`)
 - #141982 (`tests/ui`: A New Order [5/N])
 - #142012 (Replace some `Option<Span>` with `Span` and use DUMMY_SP instead of None)
 - #142044 (compiler: Document the offset invariant of `OperandValue::Pair`)
 - #142047 (Ensure stack in two places that affect s390x)
 - #142058 (Clean `rustc_attr_parsing/src/lib.rs` documentation)
 - #142067 (canon_abi: make to_erased_extern_abi just a detail in formatting)
 - #142072 (doc: Fix inverted meaning in E0783.md)
 - #142084 (add myself to rotation)
 - #142091 (Fix AIX build)
 - #142092 (rustdoc: Support middle::ty associated const equality predicates again)

Failed merges:

 - #142042 (Make E0621 missing lifetime suggestion verbose)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Jun 6, 2025

⌛ Testing commit e12572f with merge 16ca0cb...

@alex
Copy link
Member

alex commented Jun 6, 2025

auto - dist-x86_64-linux has been queued for 4 hours, I don't think it's going to start

@matthiaskrgr
Copy link
Member Author

@bors retry r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 6, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 6, 2025

📌 Commit e12572f 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 6, 2025
@matthiaskrgr
Copy link
Member Author

@bors
Copy link
Collaborator

bors commented Jun 6, 2025

⌛ Testing commit e12572f with merge f315e61...

@bors
Copy link
Collaborator

bors commented Jun 6, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 6, 2025
@bors bors merged commit f315e61 into rust-lang:master Jun 6, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 6, 2025
Copy link
Contributor

github-actions bot commented Jun 6, 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 d00435f (parent) -> f315e61 (this PR)

Test differences

Show 218 test diffs

Stage 1

  • [rustdoc] tests/rustdoc/inline_cross/assoc-const-equality.rs: ignore (ignored always ((FIXME: Assoc const equality doesn't work well with rustdoc #125092))) -> pass (J0)
  • [ui] tests/ui/borrowck/rvalue-borrow-scope-error.rs: [missing] -> pass (J0)
  • [ui] tests/ui/cleanup-rvalue-scopes-cf.rs: pass -> [missing] (J0)
  • [ui] tests/ui/cleanup-rvalue-scopes.rs: pass -> [missing] (J0)
  • [ui] tests/ui/cleanup-rvalue-temp-during-incomplete-alloc.rs: pass -> [missing] (J0)
  • [ui] tests/ui/cleanup-shortcircuit.rs: pass -> [missing] (J0)
  • [ui] tests/ui/close-over-big-then-small-data.rs: pass -> [missing] (J0)
  • [ui] tests/ui/command-line-diagnostics.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic-width/command-line-error-format-human.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lifetimes/rvalue-cleanup-shortcircuit.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lifetimes/rvalue-lifetime-drop-timing.rs: [missing] -> pass (J0)
  • [ui] tests/ui/panics/rvalue-cleanup-during-box-panic.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/borrowck/rvalue-borrow-scope-error.rs: [missing] -> pass (J1)
  • [ui] tests/ui/cleanup-rvalue-scopes-cf.rs: pass -> [missing] (J1)
  • [ui] tests/ui/cleanup-rvalue-scopes.rs: pass -> [missing] (J1)
  • [ui] tests/ui/cleanup-rvalue-temp-during-incomplete-alloc.rs: pass -> [missing] (J1)
  • [ui] tests/ui/cleanup-shortcircuit.rs: pass -> [missing] (J1)
  • [ui] tests/ui/close-over-big-then-small-data.rs: pass -> [missing] (J1)
  • [ui] tests/ui/command-line-diagnostics.rs: pass -> [missing] (J1)
  • [ui] tests/ui/diagnostic-width/command-line-error-format-human.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lifetimes/rvalue-cleanup-shortcircuit.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lifetimes/rvalue-lifetime-drop-timing.rs: [missing] -> pass (J1)
  • [ui] tests/ui/panics/rvalue-cleanup-during-box-panic.rs: [missing] -> pass (J1)
  • [rustdoc] tests/rustdoc/inline_cross/assoc-const-equality.rs: ignore (ignored always ((FIXME: Assoc const equality doesn't work well with rustdoc #125092))) -> pass (J2)

Additionally, 194 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 f315e6145802e091ff9fceab6db627a4b4ec2b86 --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: 7623.9s -> 9670.2s (26.8%)
  2. dist-aarch64-apple: 5054.5s -> 6156.9s (21.8%)
  3. aarch64-apple: 4026.0s -> 4839.9s (20.2%)
  4. armhf-gnu: 5028.1s -> 4403.7s (-12.4%)
  5. dist-x86_64-apple: 9429.3s -> 8356.1s (-11.4%)
  6. mingw-check-1: 1796.6s -> 1603.6s (-10.7%)
  7. x86_64-apple-2: 5201.3s -> 4653.4s (-10.5%)
  8. x86_64-rust-for-linux: 2859.1s -> 2585.4s (-9.6%)
  9. i686-gnu-nopt-1: 7919.2s -> 7161.2s (-9.6%)
  10. x86_64-gnu-llvm-20-1: 3587.3s -> 3244.1s (-9.6%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#125087 Optimize Seek::stream_len impl for File 5ccb4aba5b413541102ddcef4a30cc8221b3dfd5 (link)
#141982 tests/ui: A New Order [5/N] 53ff7cf81a9a77ad6aaf41668300a75685d78295 (link)
#142012 Replace some Option<Span> with Span and use DUMMY_SP in… 81b55ca06323bfe24a7b03c43ea55de1ac9a5874 (link)
#142044 compiler: Document the offset invariant of `OperandValue::P… 818a59bc7a461cf837dd4af37ed32e725e5a6913 (link)
#142047 Ensure stack in two places that affect s390x 88a86d2667a3ea59052970ecc3e9d33f7bbe4f50 (link)
#142058 Clean rustc_attr_parsing/src/lib.rs documentation 52fdd7d1733d474d89b0211c181e54dd8394c5dc (link)
#142067 canon_abi: make to_erased_extern_abi just a detail in forma… 0a7a2942a6b98b7887b6b10faffd7895bdd97b87 (link)
#142072 doc: Fix inverted meaning in E0783.md 430c7df522d590f3887ed76137c3b179af55cb09 (link)
#142084 add myself to rotation dcae199b32ac19f7ef9da63d45db23d76118d962 (link)
#142091 Fix AIX build 990dc198c56b49d86968c6c215a0a331da3ace8d (link)
#142092 rustdoc: Support middle::ty associated const equality predi… db81709f89170abc320b8f2fd90fe4545f186b80 (link)

previous master: d00435f223

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f315e61): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (secondary -5.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-5.3% [-6.1%, -4.7%] 3
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 751.329s -> 751.682s (0.05%)
Artifact size: 371.84 MiB -> 371.84 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustdoc-json Area: Rustdoc JSON backend merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like O-windows Operating system: Windows PG-exploit-mitigations Project group: Exploit mitigations 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-compiler Relevant to the compiler 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.