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

Remove ProjectionElem::Subtype #118477

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove ProjectionElem::Subtype #118477

wants to merge 1 commit into from
+26 −249

Conversation

ouz-a
Copy link
Contributor

@ouz-a ouz-a commented Nov 30, 2023

This PR reverts ProjectionElem::Subtype which was introduced in #115025 which attempetd to fix #107205 but couldn't completely solve the issue due to #112651 (comment), so leaving this as half-solution is more dangerous than completely removing it.

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

rustbot commented Nov 30, 2023

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino, @ouz-a

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@ouz-a ouz-a mentioned this pull request Nov 30, 2023
Open
lcnr
lcnr reviewed Dec 1, 2023
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

there are still some places where we reference Subtype projections:

  • comment on CPlace::place_transmute_type
  • some inline comments

I stopped halfway through #115025. Please compare the changes in #115025 with the changes in this PR to make sure we're not missing anything

compiler/rustc_borrowck/src/lib.rs Outdated Show resolved Hide resolved
compiler/rustc_middle/src/mir/tcx.rs Outdated Show resolved Hide resolved
@rustbot
Copy link
Collaborator

rustbot commented Dec 1, 2023

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr, @compiler-errors

@ouz-a
Copy link
Contributor Author

ouz-a commented Dec 1, 2023 •
edited

I think this should be it, removed everything, please let me know if there is anything else that catches your eye

matthiaskrgr
matthiaskrgr reviewed Dec 1, 2023
View reviewed changes
tests/ui/type-alias-impl-trait/normalize-alias-type.rs
Comment on lines +1 to 7
// check-fail
// failure-status: 101
// dont-check-compiler-stderr
// known-bug: unknown
// compile-flags: -Z mir-opt-level=3
#![feature(type_alias_impl_trait)]
#![crate_type = "lib"]
Copy link
Member

Choose a reason for hiding this comment

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

shouldn't this link to #118478 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah the issue didn't existed when I created this (chicken egg problem 😄 ) will fix it.

@lcnr
Copy link
Contributor

lcnr commented Dec 4, 2023

there's an ongoing convo in #112651 as explicit subtyping may work out after all 😅 going to wait before merging this for now. sorry @ouz-a xx

@bors
Copy link
Contributor

bors commented Dec 10, 2023

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

@apiraino
Copy link
Contributor

apiraino commented Feb 1, 2024

based on latest comments, I think I can flip the review flag

@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 Feb 1, 2024
@lcnr lcnr added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthiaskrgr matthiaskrgr matthiaskrgr left review comments

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels
S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

codegen generates vtables for a variable's supertype when unsizing sometimes
6 participants
@ouz-a @rustbot @lcnr @bors @apiraino @matthiaskrgr