Skip to content

Implement Generator and Future in the new solver#107285

Merged
bors merged 2 commits intorust-lang:masterfrom
compiler-errors:new-solver-future-and-generator
Jan 26, 2023
Merged

Implement Generator and Future in the new solver#107285
bors merged 2 commits intorust-lang:masterfrom
compiler-errors:new-solver-future-and-generator

Conversation

@compiler-errors
Copy link
Contributor

@compiler-errors compiler-errors commented Jan 25, 2023

r? @lcnr

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

rustbot commented Jan 25, 2023

Some changes occurred to the core trait solver

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

@lcnr
Copy link
Contributor

lcnr commented Jan 25, 2023

I think longterm we don't want to have that match for the fulfillment error code in fulfill itself as we can also simply recompute that info when reporting errors, but I guess it's fine for now.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 25, 2023

📌 Commit db79b1698b877cea956f8dc634deb8640db9b044 has been approved by lcnr

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 Jan 25, 2023
@compiler-errors
Copy link
Contributor Author

compiler-errors commented Jan 25, 2023

@lcnr for the record, we ICE in report_selection_error for all of the special cases in that match, so right now it's actually just necessary 😂

@matthiaskrgr matthiaskrgr mentioned this pull request Jan 25, 2023
Closed
@bors
Copy link
Collaborator

bors commented Jan 25, 2023

☔ The latest upstream changes (presumably #107290) 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 Jan 25, 2023
@compiler-errors compiler-errors force-pushed the new-solver-future-and-generator branch from db79b16 to b5f893b Compare January 25, 2023 22:50
@compiler-errors
Copy link
Contributor Author

compiler-errors commented Jan 25, 2023

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented Jan 25, 2023

📌 Commit b5f893b has been approved by lcnr

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 25, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 25, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 25, 2023
@matthiaskrgr
Rollup merge of rust-lang#107285 - compiler-errors:new-solver-future-…
efca03b 
…and-generator, r=lcnr

Implement `Generator` and `Future` in the new solver

r? `@lcnr`
@compiler-errors compiler-errors force-pushed the new-solver-future-and-generator branch from b5f893b to d600b94 Compare January 26, 2023 03:15
@compiler-errors
Copy link
Contributor Author

compiler-errors commented Jan 26, 2023

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented Jan 26, 2023

📌 Commit d600b94 has been approved by lcnr

It is now in the queue for this repository.

@matthiaskrgr matthiaskrgr mentioned this pull request Jan 26, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2023
@bors
Auto merge of rust-lang#107314 - matthiaskrgr:rollup-j40lnlj, r=matth…
e187f88 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#106407 (Improve proc macro attribute diagnostics)
 - rust-lang#106960 (Teach parser to understand fake anonymous enum syntax)
 - rust-lang#107085 (Custom MIR: Support binary and unary operations)
 - rust-lang#107086 (Print PID holding bootstrap build lock on Linux)
 - rust-lang#107175 (Fix escaping inference var ICE in `point_at_expr_source_of_inferred_type`)
 - rust-lang#107204 (suggest qualifying bare associated constants)
 - rust-lang#107248 (abi: add AddressSpace field to Primitive::Pointer )
 - rust-lang#107272 (Implement ObjectSafe and WF in the new solver)
 - rust-lang#107285 (Implement `Generator` and `Future` in the new solver)
 - rust-lang#107286 (ICE in new solver if we see an inference variable)
 - rust-lang#107313 (Add Style Team Triagebot config)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5be2f51 into rust-lang:master Jan 26, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 26, 2023
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Feb 9, 2023
@bors
Auto merge of rust-lang#107314 - matthiaskrgr:rollup-j40lnlj, r=matth…
3ac370b 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#106407 (Improve proc macro attribute diagnostics)
 - rust-lang#106960 (Teach parser to understand fake anonymous enum syntax)
 - rust-lang#107085 (Custom MIR: Support binary and unary operations)
 - rust-lang#107086 (Print PID holding bootstrap build lock on Linux)
 - rust-lang#107175 (Fix escaping inference var ICE in `point_at_expr_source_of_inferred_type`)
 - rust-lang#107204 (suggest qualifying bare associated constants)
 - rust-lang#107248 (abi: add AddressSpace field to Primitive::Pointer )
 - rust-lang#107272 (Implement ObjectSafe and WF in the new solver)
 - rust-lang#107285 (Implement `Generator` and `Future` in the new solver)
 - rust-lang#107286 (ICE in new solver if we see an inference variable)
 - rust-lang#107313 (Add Style Team Triagebot config)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@compiler-errors compiler-errors deleted the new-solver-future-and-generator branch August 11, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@lcnr lcnr

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

Milestone

1.69.0

Development

Successfully merging this pull request may close these issues.

4 participants

@compiler-errors @rustbot @lcnr @bors