Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
estebank:async-span
Aug 15, 2019
Merged

Point at the right enclosing scope when using await in non-async fn#63509
bors merged 2 commits into
rust-lang:masterfrom
estebank:async-span

Conversation

@estebank

Copy link
Copy Markdown
Contributor

Fix#63398.

@estebankestebank 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
Copy Markdown
Contributor

r? @varkor

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

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

Copy link
Copy Markdown
Member

This is beta-nominated for 1.38 right?

@rust-highfive

This comment has been minimized.

@estebank

Copy link
Copy Markdown
ContributorAuthor

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

@emilyalbini

Copy link
Copy Markdown
Member

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

Comment threadsrc/test/ui/issues/issue-63398.rs
@Centril

Copy link
Copy Markdown
Contributor

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

@estebank

Copy link
Copy Markdown
ContributorAuthor

@bors r=Centril

r? @Centril

@bors

bors commented Aug 13, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 25d507f has been approved by Centril

@rust-highfiverust-highfive assigned Centril and unassigned varkorAug 13, 2019
@borsbors 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
Point at the right enclosing scope when using `await` in non-async fn
Fixrust-lang#63398.
@CentrilCentril mentioned this pull request Aug 14, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
Point at the right enclosing scope when using `await` in non-async fn
Fixrust-lang#63398.
@CentrilCentril mentioned this pull request Aug 14, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
Point at the right enclosing scope when using `await` in non-async fn
Fixrust-lang#63398.
@CentrilCentril mentioned this pull request Aug 14, 2019
bors added a commit that referenced this pull request Aug 14, 2019
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
Copy Markdown
Contributor

@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
Copy Markdown
ContributorAuthor

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

@Centril

Copy link
Copy Markdown
Contributor

Yeah no; this PR is not at fault.

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
Point at the right enclosing scope when using `await` in non-async fn
Fixrust-lang#63398.
@CentrilCentril mentioned this pull request Aug 14, 2019
bors added a commit that referenced this pull request Aug 15, 2019
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:masterAug 15, 2019
@nikomatsakisnikomatsakis 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

nikomatsakis commented Aug 15, 2019

Copy link
Copy Markdown
Contributor

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

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

Wrong block referenced when emitting E0728

7 participants

@estebank@rust-highfive@emilyalbini@Centril@bors@nikomatsakis@varkor