Skip to content

Conversation

lqd
Copy link
Member

@lqd lqd commented Aug 29, 2023

Apparently a recursion limit of 0 is possible/valid/useful/used/cute, the more you know 🌟 .

(It's somewhat interesting to me that the old solver seemingly handles this, and that the new solver currently requires a recursion limit of 2 here)

r? @compiler-errors.

Fixes #115351.

@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 29, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 29, 2023

Some changes occurred to the core trait solver

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

@compiler-errors
Copy link
Member

@bors r+ rollup

1 similar comment
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 30, 2023

📌 Commit 325b585 has been approved by compiler-errors

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 Aug 30, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 30, 2023
new solver: handle edge case of a recursion limit of 0

Apparently a recursion limit of 0 is possible/valid/useful/used/cute, the more you know 🌟 .

(It's somewhat interesting to me that the old solver seemingly handles this, and that the new solver currently requires a recursion limit of 2 here)

r? `@compiler-errors.`

Fixes rust-lang#115351.
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 30, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#113565 (Make SIGSEGV handler emit nicer backtraces)
 - rust-lang#114704 (parser: not insert dummy field in struct)
 - rust-lang#115272 (miri/diagnostics: don't forget to print_backtrace when ICEing on unexpected errors)
 - rust-lang#115313 (Make `get_return_block()` return `Some` only for HIR nodes in body)
 - rust-lang#115347 (suggest removing `impl` in generic trait bound position)
 - rust-lang#115355 (new solver: handle edge case of a recursion limit of 0)
 - rust-lang#115363 (Don't suggest adding parentheses to call an inaccessible method.)

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

bors commented Aug 30, 2023

☔ The latest upstream changes (presumably #115370) made this pull request unmergeable. Please resolve the merge conflicts.

@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 Aug 30, 2023
@lqd
Copy link
Member Author

lqd commented Aug 30, 2023

wtf

bors didn't approve/merge the latest revision but the one before the force-push

@lqd
Copy link
Member Author

lqd commented Aug 30, 2023

I'll close this PR and open a new one with the commit bors missed, to avoid having multiple merge commits of the same PR in the git history. (edit: done in #115373)

@lqd lqd closed this Aug 30, 2023
@lqd lqd deleted the issue-115351 branch August 30, 2023 10:00
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 30, 2023
Fix bors missing a commit when merging rust-lang#115355

bors incorrectly merged an outdated version of PR rust-lang#115355 (via rollup rust-lang#115370):
- it [recorded r+](rust-lang#115355 (comment)) as approving commit rust-lang@325b585, and thus merged the original revision rust-lang@7762ac7
- but the branch at the time was at commit rust-lang@eefa07d, so bors missed the `compiler/rustc_trait_selection/src/solve/search_graph/mod.rs` cleanup in commit rust-lang@0e1e964 😓

Thankfully the change that bors missed was small, and this new PR corrects the situation (as I'd rather avoid having confusing multiple merge commits of PR rust-lang#115355 in the git history)

r? `@compiler-errors`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 31, 2023
Fix bors missing a commit when merging rust-lang#115355

bors incorrectly merged an outdated version of PR rust-lang#115355 (via rollup rust-lang#115370):
- it [recorded r+](rust-lang#115355 (comment)) as approving commit rust-lang@325b585, and thus merged the original revision rust-lang@7762ac7
- but the branch at the time was at commit rust-lang@eefa07d, so bors missed the `compiler/rustc_trait_selection/src/solve/search_graph/mod.rs` cleanup in commit rust-lang@0e1e964 😓

Thankfully the change that bors missed was small, and this new PR corrects the situation (as I'd rather avoid having confusing multiple merge commits of PR rust-lang#115355 in the git history)

r? ``@compiler-errors``
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2023
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#115373 (Fix bors missing a commit when merging rust-lang#115355)
 - rust-lang#115378 (`ignore-cross-compile` remaining tests that run binaries)
 - rust-lang#115393 (Make `termcolor` types public in `rustc_errors`)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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.

ICE: argument of integer logarithm must be positive
5 participants