Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from Aug 15, 2019

Conversation

@estebank
Copy link
Contributor

commented Aug 13, 2019

Fix #63398.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 13, 2019

r? @varkor

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

@pietroalbini

This comment has been minimized.

Copy link
Member

commented Aug 13, 2019

This is beta-nominated for 1.38 right?

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented Aug 13, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-08-13T06:57:28.5965569Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-13T06:57:28.6175673Z ##[command]git config gc.auto 0
2019-08-13T06:57:28.6245462Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-13T06:57:28.6306801Z ##[command]git config --get-all http.proxy
2019-08-13T06:57:28.6445442Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63509/merge:refs/remotes/pull/63509/merge
---
2019-08-13T06:58:04.1622956Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-13T06:58:04.1623289Z 
2019-08-13T06:58:04.1623827Z   git checkout -b <new-branch-name>
2019-08-13T06:58:04.1624117Z 
2019-08-13T06:58:04.1624409Z HEAD is now at 9a7ec9d73 Merge a9c7081fe93ada5478e6725b991e81f16e614ca1 into 60960a260f7b5c695fd0717311d72ce62dd4eb43
2019-08-13T06:58:04.1789962Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-13T06:58:04.1793556Z ==============================================================================
2019-08-13T06:58:04.1793642Z Task         : Bash
2019-08-13T06:58:04.1793694Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-13T07:03:57.3420662Z    Compiling serde_json v1.0.40
2019-08-13T07:04:01.8135858Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-08-13T07:04:10.6612073Z     Finished release [optimized] target(s) in 1m 31s
2019-08-13T07:04:10.6693373Z tidy check
2019-08-13T07:04:11.3960790Z tidy error: /checkout/src/test/ui/issues/issue-63398.rs:10: line longer than 100 chars
2019-08-13T07:04:12.7285351Z some tidy checks failed
2019-08-13T07:04:12.7290901Z 
2019-08-13T07:04:12.7290901Z 
2019-08-13T07:04:12.7295814Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-08-13T07:04:12.7295993Z 
2019-08-13T07:04:12.7296024Z 
2019-08-13T07:04:12.7320106Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-08-13T07:04:12.7320306Z Build completed unsuccessfully in 0:01:34
2019-08-13T07:04:12.7320306Z Build completed unsuccessfully in 0:01:34
2019-08-13T07:04:14.1101052Z ##[error]Bash exited with code '1'.
2019-08-13T07:04:14.1137010Z ##[section]Starting: Checkout
2019-08-13T07:04:14.1138837Z ==============================================================================
2019-08-13T07:04:14.1138917Z Task         : Get sources
2019-08-13T07:04:14.1138972Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

@estebank

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

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

@estebank estebank force-pushed the estebank:async-span branch from a9c7081 to 13fd466 Aug 13, 2019

@pietroalbini

This comment has been minimized.

Copy link
Member

commented Aug 13, 2019

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

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 13, 2019

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

@estebank estebank force-pushed the estebank:async-span branch from 7a591e6 to 6e7fe1c Aug 13, 2019

@estebank estebank force-pushed the estebank:async-span branch from 6e7fe1c to 25d507f Aug 13, 2019

@estebank

This comment has been minimized.

Copy link
Contributor Author

commented Aug 13, 2019

@bors r=Centril

r? @Centril

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 13, 2019

📌 Commit 25d507f has been approved by Centril

@rust-highfive rust-highfive assigned Centril and unassigned varkor 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
Point at the right enclosing scope when using `await` in non-async fn

Fix rust-lang#63398.

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
Point at the right enclosing scope when using `await` in non-async fn

Fix rust-lang#63398.

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63557 - Centril:rollup-r1c65e7, r=Centril
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 `*`)
 - #63175 (rustc: implement argsfiles for command line)
 - #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)

Failed merges:

r? @ghost

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
Point at the right enclosing scope when using `await` in non-async fn

Fix rust-lang#63398.

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63563 - Centril:rollup-j9nld0c, r=Centril
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

This comment has been minimized.

Copy link
Member

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

This comment has been minimized.

Copy link
Contributor Author

commented Aug 14, 2019

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

@Centril

This comment has been minimized.

Copy link
Member

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

Rollup merge of rust-lang#63509 - estebank:async-span, r=Centril
Point at the right enclosing scope when using `await` in non-async fn

Fix rust-lang#63398.

bors added a commit that referenced this pull request Aug 15, 2019

Auto merge of #63575 - Centril:rollup-anlv9g5, r=Centril
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

3 checks passed

pr Build #20190813.45 succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@nikomatsakis

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.