Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

generalize hr alias: avoid unconstrainable infer vars #124827

Merged
merged 1 commit into from
May 7, 2024

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented May 6, 2024

fixes rust-lang/trait-system-refactor-initiative#108

see inline comments for more details

r? @compiler-errors cc @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. labels May 6, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 6, 2024

changes to the core type system

cc @compiler-errors, @lcnr

@rust-log-analyzer

This comment has been minimized.

&& !self.infcx.intercrate
&& self.in_alias
{
variable_table.union(vid, new_var_id)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
variable_table.union(vid, new_var_id)
variable_table.union(vid, new_var_id);

@rustbot
Copy link
Collaborator

rustbot commented May 7, 2024

Some changes occurred to the core trait solver

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

@rustbot rustbot added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label May 7, 2024
@lcnr lcnr changed the title generalize hr aliases: constrain new infer vars generalize hr alias: avoid unconstrainable infer vars May 7, 2024
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 7, 2024

📌 Commit 690d5aa 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 May 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 7, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#124738 (rustdoc: dedup search form HTML)
 - rust-lang#124827 (generalize hr alias: avoid unconstrainable infer vars)
 - rust-lang#124832 (narrow down visibilities in `rustc_parse::lexer`)
 - rust-lang#124842 (replace another Option<Span> by DUMMY_SP)
 - rust-lang#124846 (Don't ICE when we cannot eval a const to a valtree in the new solver)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4a5bf7b into rust-lang:master May 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 7, 2024
Rollup merge of rust-lang#124827 - lcnr:generalize-incomplete, r=compiler-errors

generalize hr alias: avoid unconstrainable infer vars

fixes rust-lang/trait-system-refactor-initiative#108

see inline comments for more details

r? `@compiler-errors` cc `@BoxyUwU`
@lcnr lcnr deleted the generalize-incomplete branch May 8, 2024 02:47
@workingjubilee
Copy link
Member

homu still thinks this is in queue for some reason, so trying to talk some reason into it:

@bors r-

@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 May 8, 2024
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.

generalization ambiguity
6 participants