Skip to content

Conversation

euclio
Copy link
Contributor

@euclio euclio commented Feb 5, 2019

Fixes #58027.

@euclio euclio changed the title display sugared return types for async functions rustdoc: display sugared return types for async functions Feb 5, 2019
@rust-highfive
Copy link
Contributor

r? @GuillaumeGomez

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

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

#![feature(async_await, futures_api)]

// @has async_fn/fn.foo.html '//pre[@class="rust fn"]' 'pub async fn foo() -> Option<S>'
pub async fn foo() -> Option<S> {
Copy link
Member

Choose a reason for hiding this comment

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

I thought that S was a type parameter because the name was only one letter. Can you make it at least two letters so people won't struggle on it in the future (haha) please?

@GuillaumeGomez
Copy link
Member

Please fix my comment and then we're good to go!

@euclio
Copy link
Contributor Author

euclio commented Feb 6, 2019

@GuillaumeGomez Fixed, also added a test case that uses impl Trait.

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 8, 2019

📌 Commit 4deb595 has been approved by GuillaumeGomez

@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 8, 2019
kennytm added a commit to kennytm/rust that referenced this pull request Feb 8, 2019
rustdoc: display sugared return types for async functions

Fixes rust-lang#58027.
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Feb 10, 2019
rustdoc: display sugared return types for async functions

Fixes rust-lang#58027.
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Feb 10, 2019
rustdoc: display sugared return types for async functions

Fixes rust-lang#58027.
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 10, 2019
rustdoc: display sugared return types for async functions

Fixes rust-lang#58027.
bors added a commit that referenced this pull request Feb 10, 2019
Rollup of 16 pull requests

Successful merges:

 - #57259 (Update reference of rlibc crate to compiler-builtins crate)
 - #57740 (Use `to_ne_bytes` for converting IPv4Addr to octets)
 - #57926 (Tiny expansion to docs for `core::convert`.)
 - #58157 (Add Cargo.lock automatically adding message)
 - #58203 (rustdoc: display sugared return types for async functions)
 - #58243 (Add trait alias support in rustdoc)
 - #58262 (Add #[must_use] message to Fn* traits)
 - #58295 (std::sys::unix::stdio: explain why we do into_raw)
 - #58297 (Cleanup JS a bit)
 - #58317 (Some writing improvement, conciseness of intro)
 - #58324 (miri: give non-generic functions a stable address)
 - #58332 (operand-to-place copies should never be overlapping)
 - #58345 (When there are multiple filenames, print what got interpreted as filenames)
 - #58346 (rpath computation: explain why we pop())
 - #58350 (Fix failing tidy (line endings on Windows))
 - #58352 (miri value visitor: use `?` in macro)

Failed merges:

r? @ghost
@bors bors merged commit 4deb595 into rust-lang:master Feb 11, 2019
@euclio euclio deleted the rustdoc-async branch February 12, 2019 17:39
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants