2229: Don't move out of drop type #88477

arora-aman · 2021-08-30T07:00:33Z

nikomatsakis · 2021-09-03T14:21:39Z

As discussed in our [last triage meeting], this is an interesting semantic question and a tweak to the closure rules. I've written up the my conclusion in this hackmd, which also includes a number of other details. I wanted to do an FCP to get ✅ from the @rust-lang/lang team that they've seen this change. There is some urgency here owing to the Rust 2021 edition timeline.

rfcbot · 2021-09-03T14:21:40Z

Team member @nikomatsakis has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

nbdd0121 · 2021-09-03T20:40:19Z

compiler/rustc_typeck/src/check/upvar.rs

@@ -626,7 +633,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
            self.tcx.struct_span_lint_hir(
                lint::builtin::RUST_2021_INCOMPATIBLE_CLOSURE_CAPTURES,
                closure_hir_id,
-                closure_head_span,
+                 closure_head_span,


I am a bit surprised that rustfmt isn't complaining about this extra space.

I'm surprised ./x.py fmt made this change 😂

camelid · 2021-09-05T23:40:28Z

@arora-aman Not a big deal at all, but was it intentional that you renamed this PR from 2229: Handle drop_defined_for_type during migration to 2229: Don't move out of drop type 3d7c237?

arora-aman · 2021-09-05T23:41:44Z

@arora-aman Not a big deal at all, but was it intentional that you renamed this PR from 2229: Handle drop_defined_for_type during migration to 2229: Don't move out of drop type 3d7c237?

wwops, the commit didn't need to be there. But yes we changed how we handle the issue -- so I updated the title

camelid · 2021-09-05T23:43:39Z

(Also just noting that I think this will need to be backported to beta now that the branch has happened.)

scottmcm · 2021-09-06T00:01:51Z

I was convinced in the triage meeting that there are already enough consequences of Drop and Copy that it's not weird for things to be trait-dependent here. And since it only comes up in move closures, being more aggressive about moving larger things there seems reasonable to me.

@rfcbot reviewed

rfcbot · 2021-09-06T00:01:54Z

🔔 This is now entering its final comment period, as per the review above. 🔔

nikomatsakis · 2021-09-07T20:57:47Z

@bors r+ p=1

Rust 2021 related

bors · 2021-09-07T20:57:48Z

📌 Commit 153aa71 has been approved by nikomatsakis

bors · 2021-09-08T00:58:35Z

⌛ Testing commit 153aa71 with merge 0d0d2fe...

bors · 2021-09-08T04:00:53Z

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

rust-timer · 2021-09-08T05:40:18Z

Finished benchmarking commit (0d0d2fe): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

nikomatsakis · 2021-09-08T15:46:29Z

I moved the document to this design doc on the rfc-2229 repo: https://github.com/rust-lang/project-rfc-2229/blob/master/design-doc-closure-capture-drop-copy-structs.md

apiraino · 2021-09-09T15:13:07Z

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

…ulacrum [beta] bootstrap bump and backports This bumps the beta bootstrap compiler to the released 1.55.0, and backports the following PRs: * Drop 1.56 stabilizations from 1.55 release notes rust-lang#88694 * 2229: Don't move out of drop type rust-lang#88477 * Work around CI issue with windows sdk 10.0.20348.0. rust-lang#88797 Cargo update: 1 commits in 18751dd3f238d94d384a7fe967abfac06cbfe0b9..d199d817e4bb70facc710716e73b5dddf80bc055 2021-09-01 14:26:00 +0000 to 2021-09-09 14:08:56 +0000 - [beta] Fix `cargo fix --edition` on stable. (rust-lang/cargo#9891) r? `@Mark-Simulacrum`

rust-highfive assigned nikomatsakis Aug 30, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 30, 2021

arora-aman force-pushed the issue-88476 branch 2 times, most recently from a677558 to 3d7c237 Compare September 3, 2021 08:24

arora-aman changed the title ~~2229: Handle drop_defined_for_type during migration~~ 2229: Don't move out of drop type 3d7c237 Sep 3, 2021

arora-aman force-pushed the issue-88476 branch from 3d7c237 to 33c6b94 Compare September 3, 2021 08:28

2229: Don't move out of drop type

153aa71

arora-aman force-pushed the issue-88476 branch from 33c6b94 to 153aa71 Compare September 3, 2021 08:38

nikomatsakis added the T-lang Relevant to the language team label Sep 3, 2021

rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Sep 3, 2021

nbdd0121 reviewed Sep 3, 2021

View reviewed changes

arora-aman changed the title ~~2229: Don't move out of drop type 3d7c237~~ 2229: Don't move out of drop type Sep 5, 2021

rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Sep 6, 2021

Mark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 6, 2021

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 Sep 7, 2021

bors mentioned this pull request Sep 8, 2021

Remove hir::GenericBound::Unsized #88061

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2021

bors merged commit 0d0d2fe into rust-lang:master Sep 8, 2021

rustbot added this to the 1.57.0 milestone Sep 8, 2021

rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 9, 2021

Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 9, 2021

Mark-Simulacrum modified the milestones: 1.57.0, 1.56.0 Sep 9, 2021

Mark-Simulacrum mentioned this pull request Sep 9, 2021

[beta] bootstrap bump and backports #88783

Merged

apiraino removed the to-announce Announce this issue on triage meeting label Sep 16, 2021

arora-aman mentioned this pull request Oct 5, 2021

Performance pitfall and regression around closures in Rust 2021 #89470

Open

2229: Don't move out of drop type #88477

2229: Don't move out of drop type #88477

Uh oh!

Conversation

arora-aman commented Aug 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nikomatsakis commented Sep 3, 2021

Uh oh!

rfcbot commented Sep 3, 2021 • edited by pnkfelix Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nbdd0121 Sep 3, 2021

Choose a reason for hiding this comment

Uh oh!

arora-aman Sep 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

camelid commented Sep 5, 2021

Uh oh!

arora-aman commented Sep 5, 2021

Uh oh!

camelid commented Sep 5, 2021

Uh oh!

scottmcm commented Sep 6, 2021

Uh oh!

rfcbot commented Sep 6, 2021

Uh oh!

nikomatsakis commented Sep 7, 2021

Uh oh!

bors commented Sep 7, 2021

Uh oh!

bors commented Sep 8, 2021

Uh oh!

bors commented Sep 8, 2021

Uh oh!

rust-timer commented Sep 8, 2021

Uh oh!

nikomatsakis commented Sep 8, 2021

Uh oh!

apiraino commented Sep 9, 2021

Uh oh!

Uh oh!

arora-aman commented Aug 30, 2021 •

edited

Loading

rfcbot commented Sep 3, 2021 •

edited by pnkfelix

Loading

arora-aman Sep 3, 2021 •

edited

Loading