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

estebank · 2019-08-13T06:56:56Z

Fix #63398.

rust-highfive · 2019-08-13T06:56:59Z

r? @varkor

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

emilyalbini · 2019-08-13T07:06:20Z

This is beta-nominated for 1.38 right?

estebank · 2019-08-13T07:51:37Z

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

emilyalbini · 2019-08-13T07:56:37Z

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

src/test/ui/issues/issue-63398.rs

Centril · 2019-08-13T09:13:20Z

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

estebank · 2019-08-13T20:40:35Z

@bors r=Centril

r? @Centril

bors · 2019-08-13T20:40:36Z

📌 Commit 25d507f has been approved by Centril

Point at the right enclosing scope when using `await` in non-async fn Fix rust-lang#63398.

@ghost

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 · 2019-08-14T18:41:38Z

@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 · 2019-08-14T20:34:29Z

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

Centril · 2019-08-14T20:50:10Z

Yeah no; this PR is not at fault.

Point at the right enclosing scope when using `await` in non-async fn Fix rust-lang#63398.

@ghost

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

nikomatsakis · 2019-08-15T14:28:13Z

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

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 assigned varkor Aug 13, 2019

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

This comment has been minimized.

Sign in to view

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

13fd466

estebank force-pushed the async-span branch from a9c7081 to 13fd466 Compare August 13, 2019 07:52

Centril reviewed Aug 13, 2019

View reviewed changes

src/test/ui/issues/issue-63398.rs Show resolved Hide resolved

estebank force-pushed the async-span branch from 7a591e6 to 6e7fe1c Compare August 13, 2019 18:28

review comment: move test

25d507f

estebank force-pushed the async-span branch from 6e7fe1c to 25d507f Compare August 13, 2019 18:29

rust-highfive assigned Centril and unassigned varkor Aug 13, 2019

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

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 mentioned this pull request Aug 14, 2019

Rollup of 8 pull requests #63554

Closed

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019

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 mentioned this pull request Aug 14, 2019

Rollup of 10 pull requests #63557

Closed

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019

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 mentioned this pull request Aug 14, 2019

Rollup of 10 pull requests #63563

Closed

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019

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 mentioned this pull request Aug 14, 2019

Rollup of 11 pull requests #63575

Merged

bors merged commit 25d507f into rust-lang:master Aug 15, 2019

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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