Skip to content

Add check for doc alias on assoc const in trait impl - #75888

Merged
bors merged 2 commits into
rust-lang:masterfrom
GuillaumeGomez:trait-impl-assoc-const-doc-alias
Sep 5, 2020
Merged

Add check for doc alias on assoc const in trait impl#75888
bors merged 2 commits into
rust-lang:masterfrom
GuillaumeGomez:trait-impl-assoc-const-doc-alias

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 24, 2020
@GuillaumeGomezGuillaumeGomez changed the title Trait impl assoc const doc aliasAdd check for doc alias on assoc const in trait implAug 24, 2020
Comment threadsrc/librustc_passes/check_attr.rs Outdated
Comment threadsrc/test/rustdoc-ui/doc-alias-assoc-const.rs Outdated
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

ping @ollie27

@bors

bors commented Aug 30, 2020

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #74862) made this pull request unmergeable. Please resolve the merge conflicts.

Comment threadsrc/test/rustdoc-ui/doc-alias-assoc-const.rs Outdated
@jyn514jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Aug 31, 2020
@GuillaumeGomez
GuillaumeGomezforce-pushed the trait-impl-assoc-const-doc-alias branch from dafc238 to dfb5b17CompareAugust 31, 2020 19:37
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

Simplified the test (removed all non-compiling code too).

Comment threadcompiler/rustc_passes/src/check_attr.rs Outdated
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

Removed the special case as well.

@GuillaumeGomez
GuillaumeGomezforce-pushed the trait-impl-assoc-const-doc-alias branch from 825b730 to 2d88755CompareSeptember 1, 2020 08:40
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@ollie27 All comments have been resolved. Anything else? :)

@ollie27

Copy link
Copy Markdown
Contributor

Thanks.

@bors r+

@bors

bors commented Sep 3, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 2d88755cdd46bc1ce5c8f8b09d074f49b1e99e43 has been approved by ollie27

@borsbors 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 Sep 3, 2020
@ollie27

Copy link
Copy Markdown
Contributor

@bors r-

actually r=me when the commits have been squashed.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 3, 2020
@GuillaumeGomez
GuillaumeGomezforce-pushed the trait-impl-assoc-const-doc-alias branch from 2d88755 to b61eab5CompareSeptember 3, 2020 20:11
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

Squashed!

@bors: r=ollie27

@bors

bors commented Sep 3, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b61eab5 has been approved by ollie27

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 3, 2020
@bors

bors commented Sep 4, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b61eab5 with merge 633762bf7474a946040507a8dddbd5c9b7c65c3a...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

Spurious failure...

@bors: retry

@bors

bors commented Sep 4, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b61eab5 with merge 21e91bea9278c68e503d78d057d8417a09342f49...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

And another spurious failure. Is it normal @rust-lang/infra ?

@bors: retry

@bors

bors commented Sep 4, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b61eab5 with merge 7f9c16191ae06ed7140d884345d3ba4c0ce913a2...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job x86_64-gnu of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@bors

bors commented Sep 4, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 4, 2020
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

Maybe it's fixed now...

@bors: retry

@borsbors 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 Sep 4, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 4, 2020
…st-doc-alias, r=ollie27
Add check for doc alias on assoc const in trait impl
Fixesrust-lang#73721.
r? @ollie27
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 4, 2020
…st-doc-alias, r=ollie27
Add check for doc alias on assoc const in trait impl
Fixesrust-lang#73721.
r? @ollie27
@bors

bors commented Sep 5, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b61eab5 with merge 02fe309...

@bors

bors commented Sep 5, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: ollie27
Pushing 02fe309 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 5, 2020
@bors
bors merged commit 02fe309 into rust-lang:masterSep 5, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 5, 2020
@GuillaumeGomez
GuillaumeGomez deleted the trait-impl-assoc-const-doc-alias branch September 5, 2020 11:58
@jyn514jyn514 added the A-doc-alias Area: `#[doc(alias)]` label Sep 27, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-doc-aliasArea: `#[doc(alias)]`merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant 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.

Add missing checks for #[doc(alias = "")]

8 participants

@GuillaumeGomez@bors@ollie27@rust-log-analyzer@tesuji@jyn514@rust-highfive@rustbot