Skip to content

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Jul 4, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

LimpSquid and others added 25 commits June 19, 2025 23:20
`x clean` was failing when it encountered a special file like a fifo
because it thought it was a directory.
Signed-off-by: Emmanuel Ferdman <[email protected]>
Many small indirections with 1-2 items actively hinders understanding.
Inlines various tiny submodule provides into
- hir_analysis::provide
- hir_analysis::check::provide
- hir_typeck::provide
Add methods for converting bool to `Result<(), E>`

## Tracking Issue

rust-lang#142748

## ACP

rust-lang/libs-team#606
Fix `x clean` with a fifo

`x clean` was failing when it encountered a special file like a fifo because it thought it was a directory.
…, r=lcnr

Fast path nitpicks

Miscellaneous commits that I didn't really want to fold into anything else.

Fixes one theoretical bug with the fast path not considering polarity for `T: !Sized` bounds.
update coherence example

## PR Summary
Small PR - Commit 0533ff7 moved the `coherence_different_hidden_ty.rs` file. This PR adjusts sources to changes.
use unsigned_abs instead of `abs` on signed int to silence clippy

Use `unsigned_abs` instead of `abs` on signed int to silence clippy. Alternatively we could allow the lint, but if codegen is not affected, then this seems preferable.
remove redundant #[must_use]

Fixes these clippy warnings:
```
warning: this function has a `#[must_use]` attribute with no message, but returns a type already marked as `#[must_use]`
    --> library/core/src/cmp.rs:1456:5
     |
1456 |     fn __chaining_lt(&self, other: &Rhs) -> ControlFlow<bool> {
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = help: either add some descriptive message or remove the attribute
     = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#double_must_use
     = note: `-D clippy::double-must-use` implied by `-D warnings`
     = help: to override `-D warnings` add `#[allow(clippy::double_must_use)]`

warning: this function has a `#[must_use]` attribute with no message, but returns a type already marked as `#[must_use]`
    --> library/core/src/cmp.rs:1465:5
     |
1465 |     fn __chaining_le(&self, other: &Rhs) -> ControlFlow<bool> {
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = help: either add some descriptive message or remove the attribute
     = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#double_must_use

warning: this function has a `#[must_use]` attribute with no message, but returns a type already marked as `#[must_use]`
    --> library/core/src/cmp.rs:1474:5
     |
1474 |     fn __chaining_gt(&self, other: &Rhs) -> ControlFlow<bool> {
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = help: either add some descriptive message or remove the attribute
     = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#double_must_use

warning: this function has a `#[must_use]` attribute with no message, but returns a type already marked as `#[must_use]`
    --> library/core/src/cmp.rs:1483:5
     |
1483 |     fn __chaining_ge(&self, other: &Rhs) -> ControlFlow<bool> {
     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |
     = help: either add some descriptive message or remove the attribute
     = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#double_must_use
```
simplify receivers for some array method calls
Replace kw_span by full span for generic const parameters.

Small simplification extracted from rust-lang#127241
…u, r=GuillaumeGomez

rustdoc: don't treat methods under const impls or traits as const

Fixes rust-lang#143071
…ysis-provide-fn, r=compiler-errors

compiler: Document and reduce `fn provide`s in hir crates

I found it hard to follow all these tiny micro-indirections. Much like you shouldn't pass around `&u32` if you can help it, you probably shouldn't use an indirection if the indirection overhead itself is literally bigger than the amount of data you are organizing. Generally a new `fn provide` amounts to around 3 LOC:
- the signature with opening brace
- the `rustc_middle::query::Providers` import
- an end brace

I am not even counting the cost in time and thought to go find the other `provide`, read it, understand, "Ah, yes, these functions", and then go to those. Thus I say we should collapse indirections of `provide` for modules that only export 1~2 queries. For higher-count indirections, I left them as-is, as I don't understand the crate well enough to judge their worth.

Then I dropped a pointer to the actual module of interest for all these instances of the same function. I think documenting them is important because the comment that it relates to the query system makes it obvious that they have **nothing** to do with the rest of the module's logic and I can carry on ignoring them. Actively doing so is another cognitive cost, but much more minimal.

There is also a small correctness issue in that all of these functions are technically mutating state. It's not a huge deal, but it's still easier to check all these mutations do not overlap if we have less instances of `fn provide` to check.
…m, r=tgross35

Always use the pure Rust fallback instead of `llvm.{maximum,minimum}`

While llvm/llvm-project#142170 was merged, it was reverted and next attempt (llvm/llvm-project#140193) at fixing the LLVM implementation seems to have stall, so let's reverted back to pure Rust with the LLVM codegen.

cc [#t-compiler/llvm > &rust-lang#96;llvm.minimum&rust-lang#96;/&rust-lang#96;llvm.maximum&rust-lang#96; issues @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/187780-t-compiler.2Fllvm/topic/.60llvm.2Eminimum.60.2F.60llvm.2Emaximum.60.20issues/near/527044712)

Fixes rust-lang#141087
r? `@tgross35`
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide 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. labels Jul 4, 2025
@rustbot rustbot added 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. rollup A PR which is a rollup labels Jul 4, 2025
@jhpratt
Copy link
Member Author

jhpratt commented Jul 4, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 4, 2025

📌 Commit e4e26d2 has been approved by jhpratt

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

bors commented Jul 4, 2025

⌛ Testing commit e4e26d2 with merge c96a690...

@bors
Copy link
Collaborator

bors commented Jul 4, 2025

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing c96a690 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 4, 2025
@bors bors merged commit c96a690 into rust-lang:master Jul 4, 2025
12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 4, 2025
Copy link
Contributor

github-actions bot commented Jul 4, 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 837c5dd (parent) -> c96a690 (this PR)

Test differences

Show 57 test diffs

Stage 1

  • bool::test_bool_to_result: [missing] -> pass (J1)
  • [rustdoc] tests/rustdoc/constant/const-trait-and-impl-methods.rs: [missing] -> pass (J3)
  • [ui] tests/ui/traits/negative-bounds/negative-sized.rs: [missing] -> pass (J3)

Stage 2

  • [rustdoc] tests/rustdoc/constant/const-trait-and-impl-methods.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/negative-bounds/negative-sized.rs: [missing] -> pass (J2)

Additionally, 52 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 c96a69059ecc618b519da385a6ccd03155aa0237 --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: 6968.0s -> 9582.2s (37.5%)
  2. dist-x86_64-apple: 8429.7s -> 9854.4s (16.9%)
  3. x86_64-gnu-tools: 3305.3s -> 3797.0s (14.9%)
  4. pr-check-1: 1535.0s -> 1744.4s (13.6%)
  5. x86_64-gnu-llvm-19-1: 3268.4s -> 3707.9s (13.4%)
  6. dist-x86_64-netbsd: 4442.1s -> 4955.6s (11.6%)
  7. x86_64-rust-for-linux: 2552.9s -> 2845.5s (11.5%)
  8. aarch64-gnu-debug: 3643.7s -> 4029.4s (10.6%)
  9. x86_64-gnu-debug: 5497.5s -> 6042.0s (9.9%)
  10. i686-gnu-2: 5523.7s -> 6009.4s (8.8%)
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
#142749 Add methods for converting bool to Result<(), E> a4777543c247f68ab5aee66ef49540b432cf384f (link)
#143288 Fix x clean with a fifo dc6758a2abf2b18baad3e37c1ae81a9bd982c336 (link)
#143307 Fast path nitpicks 3b96f07cd7c3ae482f5a8f868d83b638eb2d0953 (link)
#143346 update coherence example 0c154fb397a5e35f0dc40dbd77bc5a2e52dc5710 (link)
#143356 use unsigned_abs instead of abs on signed int to silence … 6614e88f8c4cc5dc22749b873da74f5b3bf7815a (link)
#143370 remove redundant #[must_use] 4a9caeae979bb261b53f07b119a0d7c6f119f241 (link)
#143378 simplify receivers for some array method calls a66cf355c99eea8cb73c85d674670cc13271565c (link)
#143380 Replace kw_span by full span for generic const parameters. 770d9f65eff9f46985c798b5c7ea964c216e68a2 (link)
#143381 rustdoc: don't treat methods under const impls or traits as… 8932b94153ea971a9284bda4073b4f43777890a1 (link)
#143394 compiler: Document and reduce fn provides in hir crates 8938551c209e7d6a8fceccd044023f17ee478c9b (link)
#143395 Always use the pure Rust fallback instead of `llvm.{maximum… c96ec94bfc663f824236233fa9816a358588fae2 (link)

previous master: 837c5dd7de

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 (c96a690): comparison URL.

Overall result: ❌✅ regressions and 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.4% [0.4%, 0.4%] 1
Improvements ✅
(primary)
-0.2% [-0.2%, -0.2%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.2% [-0.2%, -0.2%] 2

Max RSS (memory usage)

Results (primary -1.8%, secondary 4.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)
4.7% [2.7%, 8.1%] 3
Improvements ✅
(primary)
-1.8% [-2.2%, -1.6%] 3
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.8% [-2.2%, -1.6%] 3

Cycles

Results (primary 2.3%, secondary 4.8%)

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

mean range count
Regressions ❌
(primary)
2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)
7.9% [2.1%, 11.6%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.4% [-3.1%, -0.5%] 3
All ❌✅ (primary) 2.3% [2.3%, 2.3%] 1

Binary size

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

Bootstrap: 462.019s -> 461.827s (-0.04%)
Artifact size: 372.15 MiB -> 372.20 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide 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-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.