Skip to content

Rollup of 9 pull requests #140781

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 22 commits into from
May 8, 2025
Merged

Rollup of 9 pull requests #140781

merged 22 commits into from
May 8, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jieyouxu and others added 22 commits May 2, 2025 18:36
…orm, r=lcnr

Only prefer param-env candidates if they remain non-global after norm

Introduce `CandidateSource::GlobalParamEnv`, and dynamically compute the `CandidateSource` based on whether the predicate contains params *post-normalization*.

This code needs some cleanup and documentation. I'm just putting this up for review.

cc rust-lang/trait-system-refactor-initiative#179

r? lcnr
…h, r=jackh726

Better error message for late/early lifetime param mismatch

Rework the way we report early-/late-bound lifetime param mismatches to equate the trait and impl signatures using region variables, so that we can detect when a late-bound param is present in the signature in place of an early-bound param, or vice versa.

The diagnostic is a bit more technical, but it's more obviously clear to see what the problem is, even if it's not great at explaining how to fix it. I think this could be improved further, but I still think it's much better than what exists today.

Note to reviewer(s): I'd appreciate if we didn't bikeshed *too* much about this verbiage, b/c I hope it's clear that the old message sucked a lot. I'm happy to file bugs for interested new contributors to improve the messaging further.

Edit(fmease): Fixes rust-lang#33624.
Remove estebank from automated review assignment

First of all, Esteban thanks for all the reviews 💙

I think you've been quite busy IRL recently, so I'm proposing to remove you from the *automated* review assignment to prevent randomly rolling compiler PRs to you until you have more availability. If this is just temporary, please close this PR!

This is [just a way to improve our fairness when assigning reviews, trying to find a balance between leaving time to Rust contributors review on their terms and availability and avoid having PRs waiting for too long](rust-lang/compiler-team#856).

> [!NOTE]
>
> This only prevents randomly-rolled compiler PRs from being auto assigned to you, it does not prevent explicit `r?` assignments.

**Please feel free to re-add yourself back to the active review rotation once you have more availability (if you feel like it).**

- If you want, it's also possible to only opt-out of the *general* compiler review rotation (`r? compiler`) but keep e.g. `r? diagnostics` rolls.

r? compiler_leads
…r=compiler-errors

detect additional uses of opaques after writeback

Based on rust-lang#140607. It's a lot harder to encounter in practice than I though 😅 😁 I've still added it with the expectation that somebody will encounter it at some point.

Also modifies the `EvalCtxt` to use the same impl to detect newly added opaque types.

r? ``@compiler-errors``
…lcnr

Do not discard constraints on overflow if there was candidate ambiguity

Fixes rust-lang/trait-system-refactor-initiative#201.

There's a pretty chunky justification in the test.

r? lcnr
rustdoc-json: Remove newlines from attributes

Fixes rust-lang#140689

Not sure if this needs to bump `FORMAT_VERSION` or not.

r? ``@GuillaumeGomez``

cc ``@obi1kenobi``
…ns, r=traviscross

style: Never break within a nullary function call `func()` or a unit literal `()`

Implements rust-lang/style-team#210
Add `DefPathData::OpaqueLifetime` to avoid conflicts for remapped opaque lifetimes

This adds `DefPathData::OpaqueLifetime` to ensure the def paths for remapped opaque lifetimes remain unique.

Fixes rust-lang#140731.

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

triagebot: Better message for changes to `tests/rustdoc-json`

Followup to rust-lang#140689 / rust-lang#140606

Adds a message to changes to `tests/rustdoc-json`, instead of just pinging me. Hopefully this makes the significance of these tests clearer to people who otherwise wouldn't have context, so hopefully we can avoid that happening again. It's annoyingly hard to know how well this works, because the real test is seeing if it doesn't get ignored.

Predrag has [kindly offered](rust-lang#140689 (comment)) to also get pinged here.

cc ``@jyn514`` ``@obi1kenobi``

r? ``@GuillaumeGomez``
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustdoc-json Area: Rustdoc JSON backend PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler 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-style Relevant to the style team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 8, 2025
@rustbot rustbot added the rollup A PR which is a rollup label May 8, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 8, 2025

📌 Commit 526923a 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 May 8, 2025
@bors
Copy link
Collaborator

bors commented May 8, 2025

⌛ Testing commit 526923a with merge 1973872...

@bors
Copy link
Collaborator

bors commented May 8, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 8, 2025
@bors bors merged commit 1973872 into rust-lang:master May 8, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 8, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#140260 Only prefer param-env candidates if they remain non-global … aaee18f67a688d45fd9047a49e7b1efa2b8a24c8 (link)
#140523 Better error message for late/early lifetime param mismatch 13eb3c89871a4f08007e51468cf54235e9132b47 (link)
#140579 Remove estebank from automated review assignment 4dfe76fc90eb1315e397a3263917208f008faba5 (link)
#140641 detect additional uses of opaques after writeback fa2fbd564088cbfaa3b3e1d308e68d0ef621e82a (link)
#140711 Do not discard constraints on overflow if there was candida… 3a07d40ab05986395f112cbd617b405cf139dede (link)
#140762 rustdoc-json: Remove newlines from attributes 8b1edfce9650e1a1eea6a30bbd51e8ce0e58da2d (link)
#140764 style: Never break within a nullary function call func() 95d425344d2791cf7d76ea91c927a0cf53ebd68e (link)
#140769 Add DefPathData::OpaqueLifetime to avoid conflicts for re… ac51662ddff7b7ed58199c290403860ab4cef3d8 (link)
#140773 triagebot: Better message for changes to `tests/rustdoc-jso… 462bc8f07877ae92304d17ed9ff42f048cfdbfab (link)

previous master: 7e552b46af

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

github-actions bot commented May 8, 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 7e552b4 (parent) -> 1973872 (this PR)

Test differences

Show 39 test diffs

Stage 1

  • [ui] tests/ui/traits/next-solver/global-param-env-after-norm.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/overflow-plus-ambiguity-normalizes-to-response.rs: [missing] -> pass (J0)
  • [ui] tests/ui/type-alias-impl-trait/lifetime-def-path-conflict-40731.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/traits/next-solver/global-param-env-after-norm.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/overflow-plus-ambiguity-normalizes-to-response.rs: [missing] -> pass (J1)
  • [ui] tests/ui/type-alias-impl-trait/lifetime-def-path-conflict-40731.rs: [missing] -> pass (J1)

Additionally, 33 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 19738720130a82959acd4fc45259166262f3ffbe --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: 6348.4s -> 9454.5s (48.9%)
  2. dist-x86_64-apple: 10178.2s -> 7162.9s (-29.6%)
  3. dist-apple-various: 5733.1s -> 6861.8s (19.7%)
  4. dist-arm-linux: 5328.5s -> 4916.1s (-7.7%)
  5. dist-powerpc-linux: 5224.7s -> 5600.7s (7.2%)
  6. dist-x86_64-msvc-alt: 7941.2s -> 7414.0s (-6.6%)
  7. x86_64-gnu-aux: 6046.4s -> 6420.5s (6.2%)
  8. dist-various-2: 3240.4s -> 3414.5s (5.4%)
  9. x86_64-rust-for-linux: 2607.2s -> 2740.9s (5.1%)
  10. i686-msvc-2: 7076.9s -> 7349.2s (3.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

Finished benchmarking commit (1973872): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary 0.6%, secondary 1.7%)

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.6% [0.4%, 1.2%] 24
Regressions ❌
(secondary)
1.7% [1.0%, 2.3%] 2
Improvements ✅
(primary)
-1.1% [-1.1%, -1.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.6% [-1.1%, 1.2%] 25

Cycles

Results (primary -0.6%, secondary -2.5%)

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.6% [-0.8%, -0.4%] 27
Improvements ✅
(secondary)
-2.5% [-2.5%, -2.5%] 1
All ❌✅ (primary) -0.6% [-0.8%, -0.4%] 27

Binary size

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

Bootstrap: 769.201s -> 771.841s (0.34%)
Artifact size: 365.25 MiB -> 365.34 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-style Relevant to the style team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants