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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Sep 5, 2020
Merged

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

merged 2 commits into from
Sep 5, 2020

Conversation

GuillaumeGomez
Copy link
Member

Fixes #73721.

r? @ollie27

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 24, 2020
@GuillaumeGomez GuillaumeGomez changed the title Trait impl assoc const doc alias Add check for doc alias on assoc const in trait impl Aug 24, 2020
@GuillaumeGomez
Copy link
Member Author

ping @ollie27

@bors
Copy link
Contributor

bors commented Aug 30, 2020

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

@jyn514 jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Aug 31, 2020
@GuillaumeGomez GuillaumeGomez force-pushed the trait-impl-assoc-const-doc-alias branch from dafc238 to dfb5b17 Compare August 31, 2020 19:37
@GuillaumeGomez
Copy link
Member Author

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

@GuillaumeGomez
Copy link
Member Author

Removed the special case as well.

@GuillaumeGomez
Copy link
Member Author

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

@ollie27 ollie27 mentioned this pull request Sep 3, 2020
Closed
@ollie27
Copy link
Member

ollie27 commented Sep 3, 2020

Thanks.

@bors r+

@bors
Copy link
Contributor

bors commented Sep 3, 2020

📌 Commit 2d88755cdd46bc1ce5c8f8b09d074f49b1e99e43 has been approved by ollie27

@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 Sep 3, 2020
@ollie27
Copy link
Member

ollie27 commented Sep 3, 2020

@bors r-

actually r=me when the commits have been squashed.

@bors bors 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
Copy link
Member Author

Squashed!

@bors: r=ollie27

@bors
Copy link
Contributor

bors commented Sep 3, 2020

📌 Commit b61eab5 has been approved by ollie27

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

bors commented Sep 4, 2020

⌛ Testing commit b61eab5 with merge 633762bf7474a946040507a8dddbd5c9b7c65c3a...

@rust-log-analyzer
Copy link
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
Member Author

Spurious failure...

@bors: retry

@bors
Copy link
Contributor

bors commented Sep 4, 2020

⌛ Testing commit b61eab5 with merge 21e91bea9278c68e503d78d057d8417a09342f49...

@rust-log-analyzer
Copy link
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
Member Author

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

@bors: retry

@bors
Copy link
Contributor

bors commented Sep 4, 2020

⌛ Testing commit b61eab5 with merge 7f9c16191ae06ed7140d884345d3ba4c0ce913a2...

@rust-log-analyzer
Copy link
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
Copy link
Contributor

bors commented Sep 4, 2020

💔 Test failed - checks-actions

@bors bors 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
Member Author

Maybe it's fixed now...

@bors: retry

@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 Sep 4, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 4, 2020
@Dylan-DPC
Rollup merge of rust-lang#75888 - GuillaumeGomez:trait-impl-assoc-con…
094ef1a 
…st-doc-alias, r=ollie27

Add check for doc alias on assoc const in trait impl

Fixes rust-lang#73721.

r? @ollie27
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Sep 4, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 4, 2020
@Dylan-DPC
Rollup merge of rust-lang#75888 - GuillaumeGomez:trait-impl-assoc-con…
6920100 
…st-doc-alias, r=ollie27

Add check for doc alias on assoc const in trait impl

Fixes rust-lang#73721.

r? @ollie27
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Sep 4, 2020
Closed
@bors
Copy link
Contributor

bors commented Sep 5, 2020

⌛ Testing commit b61eab5 with merge 02fe309...

@bors
Copy link
Contributor

bors commented Sep 5, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 5, 2020
@bors bors merged commit 02fe309 into rust-lang:master Sep 5, 2020
@rustbot rustbot 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
@jyn514 jyn514 added the A-doc-alias Area: #[doc(alias)] label Sep 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ollie27 ollie27 ollie27 left review comments

@tesuji tesuji tesuji left review comments

@jyn514 jyn514 jyn514 left review comments

Assignees

@ollie27 ollie27

Labels
A-doc-alias Area: #[doc(alias)] merged-by-bors This PR was explicitly merged by bors. 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
Milestone
1.48.0
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