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

Rollup of 7 pull requests #80806

Merged
merged 18 commits into from
Jan 8, 2021
Merged

Rollup of 7 pull requests #80806

merged 18 commits into from
Jan 8, 2021

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

CraftSpider and others added 18 commits December 3, 2020 15:49
This isn't actually a bug, it can occur when rustdoc tries to resolve a
crate that isn't used in the main code.
make the generic function pattern more specific
and use rustc_hir_pretty directly instead
Make sure rust-call errors occur correctly for traits

Fixes rust-lang#79669

Adds trait method resolution to the error, and adds UI tests to ensure it doesn't happen again. Opening as draft because I'm getting weird link errors from unrelated code on my machine, and want to see what CI thinks.
Don't panic when an external crate can't be resolved

This isn't actually a bug, it can occur when rustdoc tries to resolve a
crate that isn't used in the main code.

Fixes rust-lang#72381.

r? `@kinnison` if you have time, otherwise `@Manishearth`
…rino

handle generic trait methods in coverage-report tests

also make the generic function pattern more specific and remove the extra $ that fails the matching.

r? `@wesleywiser`
as this was failing the test of rust-lang#76896
rustc_ast_pretty: Remove `PrintState::insert_extra_parens`

It's no longer necessary after rust-lang#79472.

r? `@Aaron1011`
Fix type name in doc example for Iter and IterMut
Use Option::map_or instead of `.map(..).unwrap_or(..)`

r? `@jyn514`
`@rustbot` modify labels +C-cleanup +T-rustdoc
Get rid of custom pretty-printing in rustdoc

and use rustc_hir_pretty directly instead.

Closes rust-lang#79497.

r? `@CraftSpider`
@rustbot rustbot added the rollup A PR which is a rollup label Jan 8, 2021
@JohnTitor
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jan 8, 2021

📌 Commit dec3dbd has been approved by JohnTitor

@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 8, 2021
@bors
Copy link
Contributor

bors commented Jan 8, 2021

⌛ Testing commit dec3dbd with merge 9155a9d...

@bors
Copy link
Contributor

bors commented Jan 8, 2021

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 9155a9d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 8, 2021
@bors bors merged commit 9155a9d into rust-lang:master Jan 8, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 8, 2021
@JohnTitor JohnTitor deleted the rollup-y64z7ph branch January 8, 2021 06:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

9 participants