Skip to content

Point at the right enclosing scope when using await in non-async fn #63509

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

Jump to bottom
Merged
merged 2 commits into from
Aug 15, 2019
Merged

Point at the right enclosing scope when using await in non-async fn #63509

merged 2 commits into from
Aug 15, 2019

Conversation

estebank
Copy link
Contributor

Fix #63398.

@estebank estebank 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 Aug 13, 2019
@rust-highfive
Copy link
Contributor

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 13, 2019
@pietroalbini
Copy link
Member

This is beta-nominated for 1.38 right?

@rust-highfive

This comment has been minimized.

# to view
@estebank
Copy link
Contributor Author

@pietroalbini correct, I'm aware of the current release and it'd be against procedure to include it in 1.37.

@pietroalbini
Copy link
Member

Great! I was a bit confused since 1.38 didn't branch out to beta yet 😅

@Centril
Copy link
Contributor

Centril commented Aug 13, 2019

r=me if you like with nit ^-- addressed

@estebank
Copy link
Contributor Author

@bors r=Centril

r? @Centril

@bors
Copy link
Collaborator

bors commented Aug 13, 2019

📌 Commit 25d507f has been approved by Centril

@rust-highfive rust-highfive assigned Centril and unassigned varkor Aug 13, 2019
@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 13, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge of rust-lang#63509 - estebank:async-span, r=Centril
3c08dfc 
Point at the right enclosing scope when using `await` in non-async fn

Fix rust-lang#63398.
@Centril Centril mentioned this pull request Aug 14, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge of rust-lang#63509 - estebank:async-span, r=Centril
b9460be 
Point at the right enclosing scope when using `await` in non-async fn

Fix rust-lang#63398.
@Centril Centril mentioned this pull request Aug 14, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge of rust-lang#63509 - estebank:async-span, r=Centril
a93e9ff 
Point at the right enclosing scope when using `await` in non-async fn

Fix rust-lang#63398.
@Centril Centril mentioned this pull request Aug 14, 2019
Closed
bors added a commit that referenced this pull request Aug 14, 2019
@bors
Auto merge of #63563 - Centril:rollup-j9nld0c, r=Centril
6edcad1 
Rollup of 10 pull requests

Successful merges:

 - #62984 (Add lint for excess trailing semicolons)
 - #63075 (Miri: Check that a ptr is aligned and inbounds already when evaluating `*`)
 - #63490 (libsyntax: cleanup and refactor `pat.rs`)
 - #63495 ( Remove redundant `ty` fields from `mir::Constant` and `hair::pattern::PatternRange`.)
 - #63509 (Point at the right enclosing scope when using `await` in non-async fn)
 - #63528 (syntax: Remove `DummyResult::expr_only`)
 - #63534 (Bump to 1.39)
 - #63537 (expand: Unimplement `MutVisitor` on `MacroExpander`)
 - #63542 (Add NodeId for Arm, Field and FieldPat)
 - #63560 (move test that shouldn't be in test/run-pass/)

Failed merges:

r? @ghost
@Centril
Copy link
Contributor

Centril commented Aug 14, 2019

@estebank could you try to see if --bless --compare-mode=nll makes any git diff? #63563 (comment) may have failed due to this PR but I'm not sure.

@estebank
Copy link
Contributor Author

Can't see how it could have, but I'll do so soon.

@Centril
Copy link
Contributor

Centril commented Aug 14, 2019

Yeah no; this PR is not at fault.

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Rollup merge of rust-lang#63509 - estebank:async-span, r=Centril
02e2a57 
Point at the right enclosing scope when using `await` in non-async fn

Fix rust-lang#63398.
@Centril Centril mentioned this pull request Aug 14, 2019
Merged
bors added a commit that referenced this pull request Aug 15, 2019
@bors
Auto merge of #63575 - Centril:rollup-anlv9g5, r=Centril
9e9a136 
Rollup of 11 pull requests

Successful merges:

 - #62984 (Add lint for excess trailing semicolons)
 - #63075 (Miri: Check that a ptr is aligned and inbounds already when evaluating `*`)
 - #63490 (libsyntax: cleanup and refactor `pat.rs`)
 - #63507 (When needing type annotations in local bindings, account for impl Trait and closures)
 - #63509 (Point at the right enclosing scope when using `await` in non-async fn)
 - #63528 (syntax: Remove `DummyResult::expr_only`)
 - #63537 (expand: Unimplement `MutVisitor` on `MacroExpander`)
 - #63542 (Add NodeId for Arm, Field and FieldPat)
 - #63543 (Merge Variant and Variant_)
 - #63560 (move test that shouldn't be in test/run-pass/)
 - #63570 (Adjust tracking issues for `MaybeUninit<T>` gates)

Failed merges:

r? @ghost
@bors bors merged commit 25d507f into rust-lang:master Aug 15, 2019
@nikomatsakis nikomatsakis added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Aug 15, 2019
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Aug 15, 2019 •
edited
Loading

We decided not to accept this for beta since async-await didn't make the beta cut.

# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@Centril Centril

Assignees

@Centril Centril

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Wrong block referenced when emitting E0728
7 participants
@estebank @rust-highfive @pietroalbini @Centril @bors @nikomatsakis @varkor