Skip to content

Trait upcasting coercion (part 3) #88135

New issue

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

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

Already on GitHub? # to your account

Merged
merged 4 commits into from
Aug 21, 2021

Conversation

crlf0710
Copy link
Member

By using separate candidates for each possible choice, this fixes type-checking issues in previous commits.

r? @nikomatsakis

@rust-highfive
Copy link
Contributor

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 18, 2021
@crlf0710 crlf0710 added the F-trait_upcasting `#![feature(trait_upcasting)]` label Aug 18, 2021
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

r=me with assertion

@nikomatsakis
Copy link
Contributor

@bors delegate+

@bors
Copy link
Collaborator

bors commented Aug 19, 2021

✌️ @crlf0710 can now approve this pull request

@crlf0710
Copy link
Member Author

Assertions has been added and CI is green.

@bors r=nikomatsakis

@bors
Copy link
Collaborator

bors commented Aug 19, 2021

📌 Commit c22dfab has been approved by nikomatsakis

@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 19, 2021
@@ -759,48 +760,38 @@ fn vtable_trait_first_method_offset<'tcx>(
pub fn vtable_trait_upcasting_coercion_new_vptr_slot(
tcx: TyCtxt<'tcx>,
key: (
ty::PolyTraitRef<'tcx>, // trait owning vtable
ty::PolyTraitRef<'tcx>, // super trait ref
Ty<'tcx>, // trait object type whose trait owning vtable
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't quite work out grammatically.

@bors
Copy link
Collaborator

bors commented Aug 21, 2021

⌛ Testing commit c22dfab with merge d3e2578...

@bors
Copy link
Collaborator

bors commented Aug 21, 2021

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing d3e2578 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 21, 2021
@bors bors merged commit d3e2578 into rust-lang:master Aug 21, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 21, 2021
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Sep 19, 2021
…komatsakis

Trait upcasting coercion (part 3)

By using separate candidates for each possible choice, this fixes type-checking issues in previous commits.

r? `@nikomatsakis`
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
F-trait_upcasting `#![feature(trait_upcasting)]` merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants