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.

Sign up for GitHub

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

Jump to bottom

Move relationships from FulfillmentContext to Inherited #104926

Merged
merged 5 commits into from
Jan 23, 2023
Merged

Move relationships from FulfillmentContext to Inherited #104926

merged 5 commits into from
Jan 23, 2023

Conversation

spastorino
Copy link
Member

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. labels Nov 26, 2022
@spastorino spastorino force-pushed the calculate_diverging_fallback-cleanups branch from 32c4d9a to 3313e06 Compare November 26, 2022 02:59
lcnr
lcnr reviewed Nov 29, 2022
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment •
edited
Loading

Choose a reason for hiding this comment

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

looked a bit more into this:

About relationships, can you try to instead add the info which is stored there to TypeVariableValue::Unknown?

Considering that FoundRelationships doesn't really talk about relationships but is info about inference vars that name should make more sense.

@spastorino spastorino force-pushed the calculate_diverging_fallback-cleanups branch from 8adb397 to 3e588b4 Compare December 1, 2022 21:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the calculate_diverging_fallback-cleanups branch 2 times, most recently from fcabc95 to 8be8720 Compare December 3, 2022 19:36
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@pnkfelix pnkfelix added the T-types Relevant to the types team, which will review and decide on the PR/issue. label Jan 12, 2023
@lcnr
Copy link
Contributor

lcnr commented Jan 13, 2023

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 13, 2023
@spastorino spastorino force-pushed the calculate_diverging_fallback-cleanups branch 2 times, most recently from fda4839 to 8655082 Compare January 20, 2023 17:36
@rustbot rustbot added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Jan 20, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 20, 2023

Some changes occurred to the core trait solver

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

@spastorino spastorino force-pushed the calculate_diverging_fallback-cleanups branch from 443be80 to 5cb3b26 Compare January 20, 2023 18:05
@spastorino spastorino force-pushed the calculate_diverging_fallback-cleanups branch 4 times, most recently from d9c82c7 to 3733844 Compare January 20, 2023 20:00
@spastorino spastorino changed the title Calculate diverging fallback cleanups Move relationships from FulfillmentContext to Inherited Jan 20, 2023
@lcnr
Copy link
Contributor

lcnr commented Jan 21, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 21, 2023

📌 Commit 3733844 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 21, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 22, 2023
@compiler-errors
Rollup merge of rust-lang#104926 - spastorino:calculate_diverging_fal…
3c10728 
…lback-cleanups, r=lcnr

Move relationships from FulfillmentContext to Inherited

r? `@lcnr`
@compiler-errors compiler-errors mentioned this pull request Jan 22, 2023
Closed
@compiler-errors
Copy link
Member

compiler-errors commented Jan 22, 2023 •
edited
Loading

@bors r- needs tests bless (#107182 (comment))

@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 22, 2023
@spastorino spastorino force-pushed the calculate_diverging_fallback-cleanups branch from 3733844 to b905f80 Compare January 22, 2023 15:37
@spastorino
Copy link
Member Author

Just added the last commit but rebased just in case.

@compiler-errors
Copy link
Member

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented Jan 22, 2023

📌 Commit b905f80 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 22, 2023
@Dylan-DPC Dylan-DPC mentioned this pull request Jan 23, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 23, 2023
@bors
Auto merge of rust-lang#107215 - Dylan-DPC:rollup-zqtiufk, r=Dylan-DPC
6b3cd03 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#104926 (Move relationships from FulfillmentContext to Inherited)
 - rust-lang#106854 (Add `Arc::into_inner` for safely discarding `Arc`s without calling the destructor on the inner type.)
 - rust-lang#107108 (Consider doc(alias) when providing typo suggestions)
 - rust-lang#107186 (rustdoc: Use correct pseudo-element selector)
 - rust-lang#107192 (Add myself to the mailmap)
 - rust-lang#107195 (Fix typo in universal_regions.rs comment)
 - rust-lang#107203 (Suggest remove deref for type mismatch)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3d4c312 into rust-lang:master Jan 23, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjgillot cjgillot cjgillot left review comments

@compiler-errors compiler-errors compiler-errors left review comments

@lcnr lcnr lcnr left review comments

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. T-types Relevant to the types 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.
8 participants
@spastorino @rust-log-analyzer @lcnr @rustbot @bors @compiler-errors @cjgillot @pnkfelix