Skip to content

Various cleanups to dest prop #105683

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 1 commit into from
Dec 15, 2022
Merged

Conversation

JakobDegen
Copy link
Contributor

This makes fixing the issues identified in #105577 easier. A couple changes

  • Use an enum with names instead of a bool
  • Only call remove_candidates_if from one place instead of two. Doing it from two places is far too fragile, since any divergence in the behavior between those callsites is likely to be unsound.
  • Remove is_constant. Right now we only merge locals, so this doesn't do anything, and the logic would be wrong if it did.

r? @tmiasko

@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 Dec 14, 2022
@rustbot
Copy link
Collaborator

rustbot commented Dec 14, 2022

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@tmiasko
Copy link
Contributor

tmiasko commented Dec 15, 2022

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 15, 2022

📌 Commit a5beb7a has been approved by tmiasko

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 Dec 15, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 15, 2022
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#104592 (Ensure async trait impls are async (or otherwise return an opaque type))
 - rust-lang#105623 (Fix `-Z print-type-sizes` for generators with discriminant field ordered first)
 - rust-lang#105627 (Auto traits in `dyn Trait + Auto` are suggestable)
 - rust-lang#105633 (Make `report_projection_error` more `Term` agnostic)
 - rust-lang#105683 (Various cleanups to dest prop)
 - rust-lang#105692 (Add regression test for rust-lang#104678)
 - rust-lang#105707 (rustdoc: remove unnecessary CSS `kbd { cursor: default }`)
 - rust-lang#105715 (Do not mention long types in E0599 label)
 - rust-lang#105722 (more clippy::complexity fixes)
 - rust-lang#105724 (rustdoc: remove no-op CSS `.scrape-example .src-line-numbers { margin: 0 }`)
 - rust-lang#105730 (rustdoc: remove no-op CSS `.item-info:before { color }`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6cdc83b into rust-lang:master Dec 15, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 15, 2022
@JakobDegen JakobDegen deleted the dest-prop-storage branch December 16, 2022 13:44
# for free to join this conversation on GitHub. Already have an account? # 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants