Uh oh!
There was an error while loading. Please reload this page.
Swap order of unsafe async fn to async unsafe fn - #61319
Merged
Merged
Conversation
Centril
commented
May 29, 2019
Uh oh!
There was an error while loading. Please reload this page.
cramertj
commented
May 29, 2019
Member
cc @rust-lang/lang I don't particularly care about this either way. |
Uh oh!
There was an error while loading. Please reload this page.
petrochenkov
commented
May 29, 2019
Contributor
Or looking from the other side, this keeps the entire function type together on the right (and non-type modifiers on the left). |
withoutboats
commented
May 30, 2019
Contributor
Seems fine |
This comment has been minimized.
This comment has been minimized.
cramertj
commented
May 30, 2019
Member
r=me with rebase and any |
ContributorAuthor
We discussed this on the language team meeting and didn't find any problems with it. @nikomatsakis noted, I believe, that |
Centrilforce-pushed
the
async-unsafe-fn-order
branch
from
May 30, 2019 22:53
86dd88f to
2ebfbb4CompareCentril
commented
May 30, 2019
ContributorAuthor
@bors r=cramertj rollup |
bors
commented
May 30, 2019
Collaborator
📌 Commit 2ebfbb4 has been approved by |
emilyalbini added a commit
to emilyalbini/rust
that referenced
this pull request
May 31, 2019
…amertj Swap order of `unsafe async fn` to `async unsafe fn` Change the order of `unsafe async fn` to `async unsafe fn`. I had intended to do this a while back but didn't get around to it... This should be done because: - It is the order used by `const unsafe fn` so therefore it is consistent. - This keeps all the "effect/restriction" modifiers to the left of `unsafe` (which according to some is not an effect) instead of mixing them such that we are more forward compatible with some sort of effect system. r? @cramertj
bors added a commit
that referenced
this pull request
Jun 1, 2019
Rollup of 11 pull requests Successful merges: - #60897 (error: remove StringError from Debug output) - #61304 (Speed up Azure CI installing Windows dependencies) - #61319 (Swap order of `unsafe async fn` to `async unsafe fn`) - #61342 (Set ellipsis_inclusive_range_patterns lint to warn) - #61344 (Add regression test for const generics ICE) - #61359 (Fix links in Deref documentation) - #61363 (Stabilize iter_nth_back feature) - #61369 (Fixed lifetime misspelling) - #61372 (Migrate some books to mdbook version 0.2) - #61374 (Explicitly suggest 'type_ascription' feature) - #61382 (Fixed a typo in core::convert::AsMut) Failed merges: r? @ghost
This was referenced Jun 29, 2019
Centril added a commit
to Centril/rust
that referenced
this pull request
Jun 30, 2019
…etrochenkov Always parse 'async unsafe fn' + properly ban in 2015 Parse `async unsafe fn` not `unsafe async fn` in implementations. We also take the opportunity to properly ban `async fn` in Rust 2015 when they are inside implementations. Closesrust-lang#62232. cc rust-lang#61319, rust-lang#62121, and rust-lang#62149. r? @petrochenkov
JohnTitor added a commit
to JohnTitor/rust
that referenced
this pull request
Jan 20, 2020
…tril rustdoc: Correct order of `async` and `unsafe` in `async unsafe fn`s The order was swapped in rust-lang#61319 but rustdoc was never updated to match. r? @GuillaumeGomez
This was referenced Feb 6, 2020
borsBot
added a commit
to rust-lang/rust-analyzer
that referenced
this pull request
Feb 7, 2020
3047: Update async unsafe fn ordering in parser r=matklad a=kiljacken As of rust-lang/rust#61319 the correct order for functions that are both unsafe and async is: `async unsafe fn` and not `unsafe async fn`. This commit updates the parser tests to reflect this, and corrects parsing behavior to accept the correct ordering. Fixes#3025 Co-authored-by: Emil Lauridsen <mine809@gmail.com>
cjhopman pushed a commit
to cjhopman/rust-analyzer
that referenced
this pull request
Apr 10, 2020
As of rust-lang/rust#61319 the correct order for functions that are both unsafe and async is: `async unsafe fn` and not `unsafe async fn`. This commit updates the parser tests to reflect this, and corrects parsing behavior to accept the correct ordering. Fixesrust-lang#3025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change the order of
unsafe async fntoasync unsafe fn.I had intended to do this a while back but didn't get around to it...
This should be done because:
const unsafe fnso therefore it is consistent.unsafe(which according to some is not an effect) instead of mixing them such that we are more forward compatible with some sort of effect system.r? @cramertj