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 6 pull requests #71424

Merged
merged 15 commits into from
Apr 22, 2020
Merged

Rollup of 6 pull requests #71424

merged 15 commits into from
Apr 22, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

csmoe and others added 15 commits April 17, 2020 09:44
These were all build-pass before and don't seem to need it.

Helps with rust-lang#62277
This adds a couple of more diagnostic items to be used in Clippy.
I chose these particular ones because they were the types which we seem
to check for the most in Clippy. I'm not sure if the
`cfg_attr(not(test))` is needed, but it was also used for `Vec` and a
few other types.
…-obk

Detect mistyped associated consts in `Instance::resolve`.

*Based on rust-lang#71049 to prevent redundant/misleading downstream errors.*

Fixes rust-lang#70942 by refusing to resolve an associated `const` if it doesn't have the same type in the `impl` that it does in the `trait` (which we assume had errored, and `delay_span_bug` guards against bugs).
Correct await span for async-await error reporting

Closes rust-lang#71137
r? @tmandry
…-doc-error, r=Dylan-DPC

Add error code for inner doc error

r? @Dylan-DPC

cc @oli-obk
…laumeGomez

Moving all rustdoc-ui tests to check-pass

These were all build-pass before and don't seem to need it.

Helps with rust-lang#62277

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/rust-lang/rust/71337)
<!-- Reviewable:end -->
Clarify unused_doc_comments note on macro invocations

The previous error message used to say:

<pre>
/// doc
^^^^^^^ rustdoc does not generate documentation for <b>macros</b>
</pre>

Obviously we do generate documentation for macros, such as https://docs.rs/bitflags/1.2.1/bitflags/macro.bitflags.html. It's only macro invocations that don't get their own docs. This PR updates the message to say "rustdoc does not generate documentation for <b>macro invocations</b>".

I observe that prior to rust-lang#69084 this used to say "rustdoc does not generate documentation for **macro expansions**", as implemented originally in rust-lang#57882. I don't have a preference between those but I made the commit before looking up the history.

r? @Manishearth
attn: @yaahc @euclio
…nishearth

More diagnostic items for Clippy usage

This adds a couple of more diagnostic items to be used in Clippy.
I chose these particular ones because they were the types which we seem
to check for the most in Clippy. I'm not sure if the `cfg_attr(not(test))`
is needed, but it was also used for `Vec` and a few other types.

cc rust-lang/rust-clippy#5393

r? @Manishearth
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Apr 22, 2020

📌 Commit 01fdc88 has been approved by Dylan-DPC

@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 Apr 22, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 22, 2020
@bors
Copy link
Contributor

bors commented Apr 22, 2020

⌛ Testing commit 01fdc88 with merge 00f677d...

@bors
Copy link
Contributor

bors commented Apr 22, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 00f677d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 22, 2020
@bors bors merged commit 00f677d into rust-lang:master Apr 22, 2020
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 22, 2023
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