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

rustdoc: Correct order of async and unsafe in async unsafe fns #68397

Merged
merged 1 commit into from
Jan 21, 2020

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Jan 20, 2020

The order was swapped in #61319 but rustdoc was never updated to match.

r? @GuillaumeGomez

@Centril
Copy link
Contributor

Centril commented Jan 20, 2020

r? @Centril @bors r+

@bors
Copy link
Contributor

bors commented Jan 20, 2020

📌 Commit 3e0bfe1 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 20, 2020
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
bors added a commit that referenced this pull request Jan 20, 2020
Rollup of 8 pull requests

Successful merges:

 - #67734 (Remove appendix from Apache license)
 - #67795 (Cleanup formatting code)
 - #68290 (Fix some tests failing in `--pass check` mode)
 - #68297 ( Filter and test predicates using `normalize_and_test_predicates` for const-prop)
 - #68302 (Fix #[track_caller] and function pointers)
 - #68339 (Add `riscv64gc-unknown-linux-gnu` into target list in build-manifest)
 - #68381 (Added minor clarification to specification of GlobalAlloc::realloc.)
 - #68397 (rustdoc: Correct order of `async` and `unsafe` in `async unsafe fn`s)

Failed merges:

r? @ghost
@bors bors merged commit 3e0bfe1 into rust-lang:master Jan 21, 2020
@ollie27 ollie27 deleted the rustdoc_async_unsafe branch January 21, 2020 14:39
@jyn514 jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Oct 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants