Skip to content

also trigger overflow FCW when going from overflow -> error - #161552

Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
lcnr:overflow-fcw-chain
Aug 24, 2026
Merged

also trigger overflow FCW when going from overflow -> error#161552
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
lcnr:overflow-fcw-chain

Conversation

@lcnr

@lcnr lcnr commented Aug 22, 2026

Copy link
Copy Markdown
Contributor

based on #161341. This changes the FCW to also trigger if doubling the recursion limit changes things to an error.

Fixes bevyengine/bevy#25511

I am also changing fn root_goal_may_hold_opaque_types_jank to just use evaluate_root_goal. That isn't necessary for the example itself but we previously didn't do the FCW in there, which feels subtle and brittle. THis should just generally be more consistent

r? adwinwhite (or anyone else really)

@rustbot

rustbot commented Aug 22, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@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 Aug 22, 2026
@lcnr

lcnr commented Aug 22, 2026

Copy link
Copy Markdown
Contributor Author

am also adding "and so on..." to the error as it makes it clearer that these are not all involved goals

@rust-log-analyzer

This comment has been minimized.

@lcnr
lcnr force-pushed the overflow-fcw-chain branch from 25872b9 to 0debf6e Compare August 22, 2026 19:49
@rust-bors

This comment has been minimized.

@lcnr
lcnr force-pushed the overflow-fcw-chain branch from 0debf6e to 50f711c Compare August 23, 2026 07:53
@rustbot

rustbot commented Aug 23, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@lcnr
lcnr force-pushed the overflow-fcw-chain branch from 50f711c to 47b9a4a Compare August 23, 2026 08:09
This is not strictly necessary night now, but feels like it'd be a lot better for consistency
@adwinwhite

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@rust-bors

rust-bors Bot commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

📌 Commit b087455 has been approved by adwinwhite

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 Aug 24, 2026
Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 24, 2026
also trigger overflow FCW when going from overflow -> error

based on rust-lang#161341. This changes the FCW to also trigger if doubling the recursion limit changes things to an error.

Fixes bevyengine/bevy#25511

I am also changing `fn root_goal_may_hold_opaque_types_jank` to just use `evaluate_root_goal`. That isn't necessary for the example itself but we previously didn't do the FCW in there, which feels subtle and brittle. THis should just generally be more consistent

r? adwinwhite (or anyone else really)
rust-bors Bot pushed a commit that referenced this pull request Aug 24, 2026
Rollup of 24 pull requests

Successful merges:

 - #161586 (miri subtree update)
 - #161187 (add `Complex<T>` layout tests for straightforward targets)
 - #161524 (Put back `tests/rustdoc-gui/search-result-display.goml`)
 - #161592 (core: refactor tests/pattern.rs tests)
 - #161602 (Fix flakyness issue for `tests/rustdoc-gui/headers-color.goml`)
 - #152433 (Use `symlink_dir` to create junctions on Windows instead of trying to use symbolic links in `copy_link_internal`)
 - #155254 (Recover on attribute in use tree)
 - #158695 (Replace `CrateDump` with the Debug impl from `CStore`)
 - #159456 (Fix the reporting of layout normalization failures in transmute checks)
 - #159940 (Eliminate some buggy `unreachable!()`s in `expand_[option_]env()`)
 - #160452 (-Ctarget-feature is not unsafe (any more))
 - #161007 (tests/ui/union/union-nodrop.rs: fix typo "expressios")
 - #161166 (add crashtests [5/N], remove unused aux files )
 - #161294 (add crashtests [6/N])
 - #161552 (also trigger overflow FCW when going from overflow -> error)
 - #161569 (Bump cfg_aliases to 0.2.2)
 - #161573 (re-bless `pretty-std` on windows)
 - #161580 (Add codegen test for redundant bit mask after a range check)
 - #161588 (update eyre)
 - #161589 (std: reduce visibility of some internal OsStr related types)
 - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
 - #161601 (Path: use optimized is_empty() method)
 - #161604 (coretests: Add a few tests for backward multibyte predicate)
 - #161615 (interpret: make validate_c_variadic_compatible_ty public)
rust-bors Bot pushed a commit that referenced this pull request Aug 24, 2026
Rollup of 22 pull requests

Successful merges:

 - #161586 (miri subtree update)
 - #161187 (add `Complex<T>` layout tests for straightforward targets)
 - #161524 (Put back `tests/rustdoc-gui/search-result-display.goml`)
 - #161592 (core: refactor tests/pattern.rs tests)
 - #161602 (Fix flakyness issue for `tests/rustdoc-gui/headers-color.goml`)
 - #152433 (Use `symlink_dir` to create junctions on Windows instead of trying to use symbolic links in `copy_link_internal`)
 - #155254 (Recover on attribute in use tree)
 - #158695 (Replace `CrateDump` with the Debug impl from `CStore`)
 - #159456 (Fix the reporting of layout normalization failures in transmute checks)
 - #159940 (Eliminate some buggy `unreachable!()`s in `expand_[option_]env()`)
 - #160452 (-Ctarget-feature is not unsafe (any more))
 - #161007 (tests/ui/union/union-nodrop.rs: fix typo "expressios")
 - #161552 (also trigger overflow FCW when going from overflow -> error)
 - #161569 (Bump cfg_aliases to 0.2.2)
 - #161573 (re-bless `pretty-std` on windows)
 - #161580 (Add codegen test for redundant bit mask after a range check)
 - #161588 (update eyre)
 - #161589 (std: reduce visibility of some internal OsStr related types)
 - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
 - #161601 (Path: use optimized is_empty() method)
 - #161604 (coretests: Add a few tests for backward multibyte predicate)
 - #161615 (interpret: make validate_c_variadic_compatible_ty public)
@rust-bors
rust-bors Bot merged commit 4450076 into rust-lang:main Aug 24, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Aug 24, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 24, 2026
Rollup merge of #161552 - lcnr:overflow-fcw-chain, r=adwinwhite

also trigger overflow FCW when going from overflow -> error

based on #161341. This changes the FCW to also trigger if doubling the recursion limit changes things to an error.

Fixes bevyengine/bevy#25511

I am also changing `fn root_goal_may_hold_opaque_types_jank` to just use `evaluate_root_goal`. That isn't necessary for the example itself but we previously didn't do the FCW in there, which feels subtle and brittle. THis should just generally be more consistent

r? adwinwhite (or anyone else really)
@lcnr
lcnr deleted the overflow-fcw-chain branch August 24, 2026 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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. 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.

bevy_render 0.19.1 doesn't compile on current Rust nightly due to -Znext-solver enabled by default

4 participants