Skip to content

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jul 10, 2023

otherwise we ICE because select isn't currently set up to print proof trees.

r? @BoxyUwU

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

rustbot commented Jul 10, 2023

Some changes occurred to the core trait solver

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

@BoxyUwU
Copy link
Member

BoxyUwU commented Jul 13, 2023

@bors r+ rollup (new solver)

@bors
Copy link
Collaborator

bors commented Jul 13, 2023

📌 Commit 4965caf has been approved by BoxyUwU

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 13, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
avoid building proof trees in select

otherwise we ICE because select isn't currently set up to print proof trees.

r? `@BoxyUwU`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
refactor proof tree formatting

mostly:
- handle indentation via a separate formatter
- change nested to use a closure

tested it after rebasing on top of rust-lang#113536 and everything looks good.

r? `@BoxyUwU`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
avoid building proof trees in select

otherwise we ICE because select isn't currently set up to print proof trees.

r? ``@BoxyUwU``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
refactor proof tree formatting

mostly:
- handle indentation via a separate formatter
- change nested to use a closure

tested it after rebasing on top of rust-lang#113536 and everything looks good.

r? ``@BoxyUwU``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
avoid building proof trees in select

otherwise we ICE because select isn't currently set up to print proof trees.

r? ```@BoxyUwU```
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
refactor proof tree formatting

mostly:
- handle indentation via a separate formatter
- change nested to use a closure

tested it after rebasing on top of rust-lang#113536 and everything looks good.

r? ```@BoxyUwU```
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
avoid building proof trees in select

otherwise we ICE because select isn't currently set up to print proof trees.

r? ````@BoxyUwU````
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
refactor proof tree formatting

mostly:
- handle indentation via a separate formatter
- change nested to use a closure

tested it after rebasing on top of rust-lang#113536 and everything looks good.

r? ````@BoxyUwU````
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
refactor proof tree formatting

mostly:
- handle indentation via a separate formatter
- change nested to use a closure

tested it after rebasing on top of rust-lang#113536 and everything looks good.

r? `````@BoxyUwU`````
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 13, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#113536 (avoid building proof trees in select)
 - rust-lang#113558 (Only use max_line_length = 100 for *.rs)
 - rust-lang#113570 (refactor proof tree formatting)
 - rust-lang#113623 (Add jump to doc)
 - rust-lang#113629 (Add Adt to SMIR)
 - rust-lang#113631 (make MCP510 behavior opt-in to avoid conflicts between the CLI and target flavors)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dec104c into rust-lang:master Jul 13, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 13, 2023
@lcnr lcnr deleted the proof-tree-select branch July 14, 2023 07:48
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.

5 participants