Skip to content

Some destructor/drop related tweaks #134491

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 2 commits into from
Dec 19, 2024
Merged

Conversation

compiler-errors
Copy link
Member

Two random tweaks I got from investigating some stuff around drops in edition 2024:

  1. Use the TypingEnv of the mir builder, rather than making it over again.
  2. Rename the id field from Scope to local_id, to reflect that it's a local id, and remove the item_local_id() accessor which just returned the id field.

@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 2024

r? @Nadrieril

rustbot has assigned @Nadrieril.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 19, 2024
@lqd
Copy link
Member

lqd commented Dec 19, 2024

r? lqd @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 19, 2024

📌 Commit e5e0387 has been approved by lqd

It is now in the queue for this repository.

@rustbot rustbot assigned lqd and unassigned Nadrieril Dec 19, 2024
@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 19, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 19, 2024
Rollup of 7 pull requests

Successful merges:

 - rust-lang#133702 (Variants::Single: do not use invalid VariantIdx for uninhabited enums)
 - rust-lang#134427 (ci: remove duplicate task definition)
 - rust-lang#134432 (Fix intra doc links not generated inside footnote definitions)
 - rust-lang#134437 (reduce compiler `Assemble` complexity)
 - rust-lang#134474 (Forbid overwriting types in typeck)
 - rust-lang#134477 (move lint_unused_mut into sub-fn)
 - rust-lang#134491 (Some destructor/drop related tweaks)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e2bc718 into rust-lang:master Dec 19, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 19, 2024
Rollup merge of rust-lang#134491 - compiler-errors:dtor-tweaks, r=lqd

Some destructor/drop related tweaks

Two random tweaks I got from investigating some stuff around drops in edition 2024:
1. Use the `TypingEnv` of the mir builder, rather than making it over again.
2. Rename the `id` field from `Scope` to `local_id`, to reflect that it's a local id, and remove the `item_local_id()` accessor which just returned the id field.
@rustbot rustbot added this to the 1.85.0 milestone Dec 19, 2024
# 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.

5 participants