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.

Sign up for GitHub

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

Jump to bottom

Deny async fn in 2015 edition #58678

Merged
merged 1 commit into from
Feb 27, 2019
Merged

Deny async fn in 2015 edition #58678

merged 1 commit into from
Feb 27, 2019

Conversation

doctorn
Copy link
Contributor

@doctorn doctorn commented Feb 23, 2019 •
edited
Loading

This commit prevents code using async fn from being compiled in Rust 2015 edition.

Compiling code of the form:

async fn foo() {}

Will now result in the error:

error[E0670]: `async fn` is not permitted in the 2015 edition
 --> async.rs:1:1
  |
1 | async fn foo() {}
  | ^^^^^

error: aborting due to error

For more information about an error, try `rustc --explain E0670`.

This resolves #58652 and also resolves #53714.

r? @varkor

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @varkor (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

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

varkor commented Feb 23, 2019

This resolves #58652 and also #53714.

Note that you need to prefix both issues with "resolves" for GitHub to recognise the pull request as closing those issues when merged.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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. 
travis_time:end:0073247a:start=1550947718577478137,finish=1550947794302070082,duration=75724591945
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:03:59] tidy error: /checkout/src/libsyntax/parse/parser.rs:8310: trailing whitespace
[00:04:00] some tidy checks failed
[00:04:00] 
[00:04:00] 
[00:04:00] 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" "--quiet"
[00:04:00] 
[00:04:00] 
[00:04:00] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:00] Build completed unsuccessfully in 0:00:46
[00:04:00] Build completed unsuccessfully in 0:00:46
[00:04:00] make: *** [tidy] Error 1
[00:04:00] Makefile:68: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0c9f3474
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Feb 23 18:54:04 UTC 2019
---
travis_time:end:02297160:start=1550948045154431333,finish=1550948045159060687,duration=4629354
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:014fed76
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:08f90271
travis_time:start:08f90271
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:00439b80
$ dmesg | grep -i kill

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)

@varkor
Copy link
Member

varkor commented Feb 23, 2019

Overall, this looks good! Just a couple of minor comments. Also, merge commits are avoided, so if you could rebase your changes instead, that would be great!

varkor
varkor approved these changes Feb 23, 2019
View reviewed changes
Copy link
Member

@varkor varkor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last stylistic comment, then everything looks good!

If you could squash your changes into a single commit to keep the history cleaner, I'll approve as soon as Travis is happy!

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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. 
travis_time:end:002da92e:start=1550957233901543875,finish=1550957234886969035,duration=985425160
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:13:03] 
[01:13:03] running 119 tests
[01:13:31] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:13:36] i......iii.i.....ii
[01:13:36] 
[01:13:36]  finished in 32.613
[01:13:36] travis_fold:end:test_debuginfo

---
[01:40:43] 
[01:40:43] failures:
[01:40:43] 
[01:40:43] ---- /checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md - Rust_Compiler_Error_Index::E0670 (line 11002) stdout ----
[01:40:43] error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `fn`
[01:40:43]   |
[01:40:43]   |
[01:40:43] 3 | async fn foo() {}
[01:40:43]   |       ^^ expected one of 8 possible tokens here
[01:40:43] 
[01:40:43] error[E0425]: cannot find value `async` in this scope
[01:40:43]   |
[01:40:43]   |
[01:40:43] 3 | async fn foo() {}
[01:40:43] 
[01:40:43] 
[01:40:43] thread '/checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md - Rust_Compiler_Error_Index::E0670 (line 11002)' panicked at 'Some expected error codes were not found: ["E0670"]', src/librustdoc/test.rs:356:9
[01:40:43] 
[01:40:43] 
[01:40:43] failures:
[01:40:43]     /checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md - Rust_Compiler_Error_Index::E0670 (line 11002)
---
[01:40:43] 
[01:40:43] 
[01:40:43] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:40:43] Build completed unsuccessfully in 0:39:50
[01:40:43] Makefile:48: recipe for target 'check' failed
[01:40:43] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:327d5d8e
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Feb 23 23:08:10 UTC 2019

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)

@doctorn
Copy link
Contributor Author

doctorn commented Feb 24, 2019 •
edited
Loading

I've added the extra tests, so this definitely also solves the cases specifically mentioned in #51933.

@doctorn
Deny async fn in 2015 edition
8300f51 
Fix style issues and update diagnostic messages

Update src/librustc_passes/diagnostics.rs

Co-Authored-By: doctorn <me@nathancorbyn.com>

Deny nested `async fn` in Rust 2015 edition

Deny nested `async fn` in Rust 2015 edition

Deny nested `async fn` in Rust 2015 edition
@varkor
Copy link
Member

varkor commented Feb 25, 2019

Thanks, this looks great!

@bors r+

@bors
Copy link
Contributor

bors commented Feb 25, 2019

📌 Commit 8300f51 has been approved by varkor

@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 Feb 25, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
@Centril
Rollup merge of rust-lang#58678 - doctorn:refuse-async-fn-2015-editio…
9c44efd 
…n, r=varkor

Deny `async fn` in 2015 edition

This commit prevents code using `async fn` from being compiled in Rust 2015 edition.

Compiling code of the form:

```rust
async fn foo() {}
```

Will now result in the error:

```
error[E0670]: `async fn` is not permitted in the 2015 edition
 --> async.rs:1:1
  |
1 | async fn foo() {}
  | ^^^^^

error: aborting due to error

For more information about an error, try `rustc --explain E0670`.
```

This resolves rust-lang#58652 and also resolves rust-lang#53714.

r? @varkor
@Centril Centril mentioned this pull request Feb 27, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
@Centril
Rollup merge of rust-lang#58678 - doctorn:refuse-async-fn-2015-editio…
c734e24 
…n, r=varkor

Deny `async fn` in 2015 edition

This commit prevents code using `async fn` from being compiled in Rust 2015 edition.

Compiling code of the form:

```rust
async fn foo() {}
```

Will now result in the error:

```
error[E0670]: `async fn` is not permitted in the 2015 edition
 --> async.rs:1:1
  |
1 | async fn foo() {}
  | ^^^^^

error: aborting due to error

For more information about an error, try `rustc --explain E0670`.
```

This resolves rust-lang#58652 and also resolves rust-lang#53714.

r? @varkor
@Centril Centril mentioned this pull request Feb 27, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
@Centril
Rollup merge of rust-lang#58678 - doctorn:refuse-async-fn-2015-editio…
275dc6c 
…n, r=varkor

Deny `async fn` in 2015 edition

This commit prevents code using `async fn` from being compiled in Rust 2015 edition.

Compiling code of the form:

```rust
async fn foo() {}
```

Will now result in the error:

```
error[E0670]: `async fn` is not permitted in the 2015 edition
 --> async.rs:1:1
  |
1 | async fn foo() {}
  | ^^^^^

error: aborting due to error

For more information about an error, try `rustc --explain E0670`.
```

This resolves rust-lang#58652 and also resolves rust-lang#53714.

r? @varkor
@Centril Centril mentioned this pull request Feb 27, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
@Centril
Rollup merge of rust-lang#58678 - doctorn:refuse-async-fn-2015-editio…
1179a5f 
…n, r=varkor

Deny `async fn` in 2015 edition

This commit prevents code using `async fn` from being compiled in Rust 2015 edition.

Compiling code of the form:

```rust
async fn foo() {}
```

Will now result in the error:

```
error[E0670]: `async fn` is not permitted in the 2015 edition
 --> async.rs:1:1
  |
1 | async fn foo() {}
  | ^^^^^

error: aborting due to error

For more information about an error, try `rustc --explain E0670`.
```

This resolves rust-lang#58652 and also resolves rust-lang#53714.

r? @varkor
@Centril Centril mentioned this pull request Feb 27, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Feb 27, 2019
@Centril
Rollup merge of rust-lang#58678 - doctorn:refuse-async-fn-2015-editio…
f84a8cf 
…n, r=varkor

Deny `async fn` in 2015 edition

This commit prevents code using `async fn` from being compiled in Rust 2015 edition.

Compiling code of the form:

```rust
async fn foo() {}
```

Will now result in the error:

```
error[E0670]: `async fn` is not permitted in the 2015 edition
 --> async.rs:1:1
  |
1 | async fn foo() {}
  | ^^^^^

error: aborting due to error

For more information about an error, try `rustc --explain E0670`.
```

This resolves rust-lang#58652 and also resolves rust-lang#53714.

r? @varkor
@Centril Centril mentioned this pull request Feb 27, 2019
Merged
bors added a commit that referenced this pull request Feb 27, 2019
@bors
Auto merge of #58777 - Centril:rollup, r=Centril
7e001e5 
Rollup of 14 pull requests

Successful merges:

 - #58075 (Fix for issue  #58050)
 - #58627 (rustdoc: move collapse and unindent docs passes earlier)
 - #58630 (Make `visit_clobber` panic-safe.)
 - #58678 (Deny `async fn` in 2015 edition)
 - #58680 (Fix an indexing error when using `x.py help`)
 - #58703 (Fix copy-pasted typo for read_string return value)
 - #58744 (Update dlmalloc to 0.1.3)
 - #58746 (std: docs: Disable running several Stdio doctests)
 - #58748 (update scoped_tls to 1.0)
 - #58749 (Reduce Repetitions of (n << amt) >> amt)
 - #58752 (Update string_cache_codegen to 0.4.2)
 - #58755 (Clarify `rotate_{left,right}` docs)
 - #58757 (Normalize the type Self resolves to in an impl)
 - #58761 (Add tracking issue for the unwind attribute)

Failed merges:

r? @ghost
@bors bors merged commit 8300f51 into rust-lang:master Feb 27, 2019
@doctorn doctorn deleted the refuse-async-fn-2015-edition branch February 27, 2019 19:04
@taiki-e taiki-e mentioned this pull request Feb 28, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonas-schievink jonas-schievink jonas-schievink left review comments

@Centril Centril Centril left review comments

@varkor varkor varkor approved these changes

Assignees

@varkor varkor

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
6 participants
@doctorn @rust-highfive @varkor @bors @Centril @jonas-schievink