adjust desugaring for async fn to correct drop order#64525
Merged
bors merged 7 commits intoSep 17, 2019
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
6b2fa9e to
edb1a6f
Compare
Contributor
|
r? @cramertj (I guess) |
Old desugaring, given a user function body { $stmts; $expr }
```
{
let $param_pattern0 = $raw_param0;
...
let $param_patternN = $raw_paramN;
$stmts;
$expr
}
```
New desugaring:
```
{
let $param_pattern0 = $raw_param0;
...
let $param_patternN = $raw_paramN;
drop-temps {
$stmts;
$expr
}
}
```
The drop-temps is an internal bit of HIR that drops temporaries from
the resulting expression, but it should be equivalent to `return {
$stmts; $expr }`.
edb1a6f to
00d1590
Compare
Contributor
Author
|
@cramertj is on vacation -- maybe @davidtwco feels up to reviewing this? r? @davidtwco If you don't, though, let me know and we'll find somebody else. =) |
Contributor
|
This looks correct to me. If no reviewer gets a chance to see it in a timely manner, r=me. |
Centril
reviewed
Sep 16, 2019
Contributor
Author
|
@bors p=1 |
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
bbf0439 to
291fb31
Compare
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
davidtwco
approved these changes
Sep 17, 2019
Member
davidtwco
left a comment
There was a problem hiding this comment.
LGTM! r=me when CI is passing.
DropTemps(...) looks like a function, this looks like wacko special stuff
291fb31 to
2d8b10f
Compare
davidtwco
reviewed
Sep 17, 2019
Member
davidtwco
left a comment
There was a problem hiding this comment.
Oh, just remembered, will the reference need updated with this change? rust-lang/reference#674 is still open from the initial change.
Contributor
Author
|
@bors r=davidtwco |
Collaborator
|
📌 Commit 2d8b10f has been approved by |
Contributor
Author
I was planning to take a look at the reference and decide what needed to be updated. |
Collaborator
bors
added a commit
that referenced
this pull request
Sep 17, 2019
… r=davidtwco
adjust desugaring for async fn to correct drop order
Old desugaring, given a user function body `{ $stmts; $expr }`
```
{
let $param_pattern0 = $raw_param0;
...
let $param_patternN = $raw_paramN;
$stmts;
$expr
}
```
New desugaring:
```
{
let $param_pattern0 = $raw_param0;
...
let $param_patternN = $raw_paramN;
drop-temps {
$stmts;
$expr
}
}
```
The drop-temps is an internal bit of HIR that drops temporaries from the resulting expression, but it should be equivalent to `return { $stmts; $expr }`.
Fixes #64512
Fixes #64391
Collaborator
|
☀️ Test successful - checks-azure |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Old desugaring, given a user function body
{ $stmts; $expr }New desugaring:
The drop-temps is an internal bit of HIR that drops temporaries from the resulting expression, but it should be equivalent to
return { $stmts; $expr }.Fixes #64512
Fixes #64391