Skip to content

Assemble Unpin candidates specially for generators in new solver - #110207

Merged
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:new-solver-unpin
Apr 14, 2023
Merged

Assemble Unpin candidates specially for generators in new solver#110207
bors merged 2 commits into
rust-lang:masterfrom
compiler-errors:new-solver-unpin

Conversation

@compiler-errors

Copy link
Copy Markdown
Contributor

@rustbotrustbot 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 Apr 11, 2023
@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred to the core trait solver

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

Comment threadcompiler/rustc_trait_selection/src/solve/trait_goals.rs Outdated
Comment on lines 615 to 647

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ty::Error and opaque types feel weird here. Error shouldn't matter, but I am worried that this is wrong for opaques 🤔 Also unhappy that we treat opaques as PlaceholderSimplifiedType in simplify_type. Want to think more about this, can you add a fixme here?

apart from that r=me

@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

Added a FIXME for opaques and moved ty::Error to its own branch.

@bors r=lcnr rollup (only affects new solver)

@bors

bors commented Apr 13, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit a1d14de220b2a570ef673fb6c39ea68a76225e6f has been approved by lcnr

It is now in the queue for this repository.

@borsbors 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 Apr 13, 2023
@bors

bors commented Apr 13, 2023

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Apr 13, 2023
@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

Unpin note got changed slightly

@bors r=lcnr

@bors

bors commented Apr 14, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 319c790 has been approved by lcnr

It is now in the queue for this repository.

@borsbors 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 Apr 14, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 14, 2023
…r=lcnr
Assemble `Unpin` candidates specially for generators in new solver
Fixescompiler-errors/next-solver-hir-issues#16
r? `@lcnr`
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 14, 2023
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#109225 (Clarify that RUST_MIN_STACK may be internally cached)
- rust-lang#109800 (Improve safe transmute error reporting)
- rust-lang#110158 (Remove obsolete test case)
- rust-lang#110180 (don't uniquify regions when canonicalizing)
- rust-lang#110207 (Assemble `Unpin` candidates specially for generators in new solver)
- rust-lang#110276 (Remove all but one of the spans in `BoundRegionKind::BrAnon`)
- rust-lang#110279 (rustdoc: Correctly handle built-in compiler proc-macros as proc-macro and not macro)
- rust-lang#110298 (Cover edge cases for {f32, f64}.hypot() docs)
- rust-lang#110299 (Switch to `EarlyBinder` for `impl_subject` query)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 69d7172 into rust-lang:masterApr 14, 2023
@rustbotrustbot added this to the 1.70.0 milestone Apr 14, 2023
@compiler-errors
compiler-errors deleted the new-solver-unpin branch August 11, 2023 20:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Non-static generators should always be unpin

4 participants

@compiler-errors@rustbot@bors@lcnr