Skip to content

Rollup of 3 pull requests - #162625

Merged
rust-bors[bot] merged 7 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-n0V8kc1
Sep 11, 2026
Merged

Rollup of 3 pull requests#162625
rust-bors[bot] merged 7 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-n0V8kc1

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

adwinwhite and others added 7 commits September 3, 2026 14:45
…tylistic conventions

Namely:

> Error, Warning, Note, and Help messages start with a lowercase letter and do not end with punctuation.

From: <https://rustc-dev-guide.rust-lang.org/diagnostics.html#diagnostic-output-style-guide>
…erflow, r=lcnr

`-Znext-solver` : Abort on the first overflowed obligation in fulfillment

Fixes rust-lang/trait-system-refactor-initiative#294 cc https://rust-lang.zulipchat.com/#narrow/channel/618216-t-types.2Fcall-for-participation/topic/handling.20overflow.20in.20fulfill/with/621040305

We used to drop all subsequent obligations when one obligation overflows in fulfillment. It means that we don't really prove all obligations even if fulfillment has no pending obligations and returns no error. We now eagerly abort on the first overflowed obligation.

r? @ShoyuVanilla
cc @lcnr
Eagerly report overflow errors in normalization query

Fixes rust-lang#161542

We still have rigid opaques in `TypingMode::PostAnalysis` after `PostAnalysisNormalize` pass because we ignore normalization errors in the [`PostAnalysisNormalize` pass](https://github.com/rust-lang/rust/blob/04a3cad16c522be4fd15ca76d3c119c14be68954/compiler/rustc_mir_transform/src/post_analysis_normalize.rs#L66). We can't handle errors there as we don't have enough information to detect whether they're overflows.

This doesn't cause problems for the old solver because it eagerly emits overflow error in evaluation.
We try to do the same in the next solver.

I don't really know who to assign. Maybe r? @jdonszelmann
cc @lcnr
…its, r=adwinwhite

Clean up some small things related to lint `ambiguous_glob_imported_traits`

Cleaning up things I noticed in the vicinity while reviewing PR rust-lang#157968 (which concerns lint `ambiguous_glob_imported_traits` and feature `supertrait_item_shadowing`).

Namely,

1. turning two tuple struct variants into named ones to avoid "anonymous `bool`s"
2. fixing an inaccurate `supertrait_item_shadowing`-specific doc comment
3. applying the rules listed in our [Diagnostic output style guide](https://rustc-dev-guide.rust-lang.org/diagnostics.html#diagnostic-output-style-guide) to the diagnostic of lint `ambiguous_glob_imported_traits`

<sub>(No LLM was or will be used by me during the entire creation process of this PR)</sub>
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Sep 11, 2026
@rustbot rustbot added 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Sep 11, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

@rust-bors

rust-bors Bot commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 65182f1 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Sep 11, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 11, 2026
@rust-bors

rust-bors Bot commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 9m 50s
Pushing ca0a647 to main...

@rust-bors
rust-bors Bot merged commit ca0a647 into rust-lang:main Sep 11, 2026
14 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 11, 2026
@github-actions

Copy link
Copy Markdown
Contributor
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 a59b87a (parent) -> ca0a647 (this PR)

Test differences

Show 38 test diffs

Stage 1

  • [ui] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs: pass -> [missing] (J0)
  • [ui] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs#old: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/overflow/dont-drop-obligations-on-overflow-1.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/overflow/dont-drop-obligations-on-overflow-2.rs: [missing] -> pass (J0)
  • [ui] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs: pass -> [missing] (J0)
  • [ui] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs#old: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs#next: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs#old: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/traits/next-solver/overflow/dont-drop-obligations-on-overflow-1.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/traits/next-solver/overflow/dont-drop-obligations-on-overflow-2.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs#next: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs#old: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs: pass -> [missing] (J2)
  • [ui] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs#next: [missing] -> pass (J2)
  • [ui] tests/ui/impl-trait/failed-to-resolve-instance-ice-105488.rs#old: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/overflow/dont-drop-obligations-on-overflow-1.rs: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/overflow/dont-drop-obligations-on-overflow-2.rs: [missing] -> pass (J2)
  • [ui] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs: pass -> [missing] (J2)
  • [ui] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs#next: [missing] -> pass (J2)
  • [ui] tests/ui/type-alias-impl-trait/mututally-recursive-overflow.rs#old: [missing] -> pass (J2)

Additionally, 14 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 ca0a6473ffde01deb7fce24cc04864cf723e14a0 --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. test-x86_64-msvc-1: 1h 49m -> 2h 49m (+55.6%)
  2. test-x86_64-gnu-llvm-21: 36m 2s -> 53m 39s (+48.9%)
  3. test-i686-msvc: 1h 46m -> 2h 35m (+46.3%)
  4. dist-x86_64-freebsd: 1h 6m -> 1h 31m (+38.2%)
  5. test-x86_64-gnu: 1h 58m -> 2h 37m (+33.1%)
  6. test-x86_64-gnu-nopt: 1h 53m -> 2h 30m (+32.8%)
  7. test-i686-gnu-nopt-1: 2h 17m -> 1h 33m (-31.7%)
  8. test-x86_64-gnu-aux: 2h 1m -> 2h 39m (+31.4%)
  9. optional-test-x86_64-gnu-autodiff: 56m 58s -> 39m 9s (-31.3%)
  10. test-x86_64-gnu-stable: 2h 1m -> 2h 38m (+30.3%)
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-bors

rust-bors Bot commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#162223 -Znext-solver : Abort on the first overflowed obligation … 15e8f5eb4d127d2bd64b85fdd8914c57975ffe82
(link)
#161654 Eagerly report overflow errors in normalization query aff02ac65aa1084af4d9e9675634e6ef261df70c
(link)
#162176 Clean up some small things related to lint `ambiguous_glob_… a32f96126924f3781b705d760c74f3849a5506df
(link)

parent commit: a59b87ab99

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
Copy Markdown
Collaborator

Finished benchmarking commit (ca0a647): 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.3% [-0.3%, -0.3%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 0.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)
0.7% [0.4%, 1.3%] 7
Regressions ❌
(secondary)
3.2% [2.1%, 4.3%] 2
Improvements ✅
(primary)
-0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)
-3.4% [-3.4%, -3.4%] 1
All ❌✅ (primary) 0.6% [-0.6%, 1.3%] 8

Cycles

Results (primary -0.2%, secondary 4.4%)

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

mean range count
Regressions ❌
(primary)
0.9% [0.5%, 1.8%] 7
Regressions ❌
(secondary)
5.5% [2.2%, 9.4%] 10
Improvements ✅
(primary)
-0.8% [-1.4%, -0.4%] 11
Improvements ✅
(secondary)
-6.4% [-6.4%, -6.4%] 1
All ❌✅ (primary) -0.2% [-1.4%, 1.8%] 18

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 479.056s -> 494.036s (3.13%)
Artifact size: 403.79 MiB -> 407.63 MiB (0.95%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler 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.

5 participants