Skip to content

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jul 31, 2023

implements https://hackmd.io/QY0dfEOgSNWwU4oiGnVRLw?view. I want to clean up this doc and add it to the rustc-dev-guide, but I think this PR is ready for merge as is, even without the dev-guide entry.

r? @compiler-errors

@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 31, 2023
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Jul 31, 2023

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

@lcnr lcnr force-pushed the overflow branch 2 times, most recently from 130923f to 35ea173 Compare August 1, 2023 12:32
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

// FIXME(-Ztrait-solver=next): THis currently results in unstable query results:
// `normalizes-to(opaque, opaque)` changes from `Maybe(Ambiguous)` to `Maybe(Overflow)`
// once the hidden type of the opaque is already defined to be itself.

Copy link
Contributor Author

@lcnr lcnr Aug 3, 2023

Choose a reason for hiding this comment

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

I looked at this for a bit and I think that we should look into preventing opaques in their defining scope to opaques in their defining scope. Not exactly sure how this should work though. Feels like a complex issue so I've avoided it for now.

Opened rust-lang/trait-system-refactor-initiative#54

Copy link
Member

Choose a reason for hiding this comment

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

Oh, yeah, yikes lol.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

we previously had incorrect universes in the query response.
@lcnr lcnr force-pushed the overflow branch 3 times, most recently from 57f0ce2 to 897ab17 Compare August 3, 2023 12:47
@rust-log-analyzer

This comment has been minimized.

@lcnr lcnr marked this pull request as ready for review August 3, 2023 13:16
@rustbot
Copy link
Collaborator

rustbot commented Aug 3, 2023

Some changes occurred to the core trait solver

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

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 4, 2023

📌 Commit baf0768 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 4, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 5, 2023
…mpiler-errors

Rollup of 5 pull requests

Successful merges:

 - rust-lang#114287 (update overflow handling in the new trait solver)
 - rust-lang#114475 (Migrate GUI colors test to original CSS color format)
 - rust-lang#114482 (Fix ui-fulldeps missing the `internal_features` lint on stage 0)
 - rust-lang#114490 (Fix a typo in the error reporting for sealed traits.)
 - rust-lang#114491 (Rename issue rust-lang#114423 test files to include context)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 097a498 into rust-lang:master Aug 5, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 5, 2023
@lcnr lcnr deleted the overflow branch August 5, 2023 06:56
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