Skip to content

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jan 7, 2021

and use rustc_hir_pretty directly instead.

Closes #79497.

r? @CraftSpider

@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 7, 2021
and use rustc_hir_pretty directly instead
@jyn514 jyn514 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2021
@CraftSpider
Copy link
Contributor

This looks good to me. I don't think I actually have r+ rights, but this is what I imagined the best solution would be.

@jyn514
Copy link
Member Author

jyn514 commented Jan 8, 2021

Thanks :)

@bors r=CraftSpider

@bors
Copy link
Collaborator

bors commented Jan 8, 2021

📌 Commit 31375d2 has been approved by CraftSpider

@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 Jan 8, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 8, 2021
Rollup of 7 pull requests

Successful merges:

 - rust-lang#79675 (Make sure rust-call errors occur correctly for traits)
 - rust-lang#80372 (Don't panic when an external crate can't be resolved)
 - rust-lang#80761 (handle generic trait methods in coverage-report tests)
 - rust-lang#80785 (rustc_ast_pretty: Remove `PrintState::insert_extra_parens`)
 - rust-lang#80791 (Fix type name in doc example for Iter and IterMut)
 - rust-lang#80794 (Use Option::map_or instead of `.map(..).unwrap_or(..)`)
 - rust-lang#80799 (Get rid of custom pretty-printing in rustdoc)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dec3dbd into rust-lang:master Jan 8, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 8, 2021
@jyn514 jyn514 deleted the pretty-print branch January 8, 2021 13:06
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 12, 2021
…melid

Don't display `mut` in arguments for functions documentation

Fixes rust-lang#81289 by reverting rust-lang#80799, as requested in rust-lang#81328 (comment).
Supersedes rust-lang#81328.
r? `@camelid` cc `@jyn514`
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 12, 2021
…melid

Don't display `mut` in arguments for functions documentation

Fixes rust-lang#81289 by reverting rust-lang#80799, as requested in rust-lang#81328 (comment).
Supersedes rust-lang#81328.
r? ``@camelid`` cc ``@jyn514``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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.

ICE: rustdoc on refutable-pattern-errors.rs: tried to get argument name from PatKind::Range, which is not allowed in function arguments
4 participants