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

Fix duplicated bounds printing in rustdoc #59033

Merged
merged 1 commit into from
Jun 3, 2019
Merged

Fix duplicated bounds printing in rustdoc #59033

merged 1 commit into from
Jun 3, 2019

Conversation

GuillaumeGomez
Copy link
Member

Fixes #56331.

Once again, I couldn't find out how to reproduce it with a small code so no test... :-/

r? @QuietMisdreavus

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 9, 2019
@GuillaumeGomez
Copy link
Member Author

@highfive: run-doc-ui

@bors: try

bors added a commit that referenced this pull request Mar 17, 2019
@bors
Auto merge of #59033 - GuillaumeGomez:duplicated-bounds, r=<try>
3510db4 
Fix duplicated bounds printing in rustdoc

Fixes #56331.

Once again, I couldn't find out how to reproduce it with a small code so no test... :-/

r? @QuietMisdreavus
@bors
Copy link
Contributor

bors commented Mar 17, 2019

⌛ Trying commit 140bb5d with merge 3510db4...

@bors
Copy link
Contributor

bors commented Mar 17, 2019

☀️ Try build successful - checks-travis
Build commit: 3510db4

@GuillaumeGomez
Copy link
Member Author

@highfive: run-doc-ui 3510db4

@QuietMisdreavus
Copy link
Member

What is the @highfive: run-doc-ui supposed to be doing?

Anyway, you can trigger the bug by using the following crate and then running docs on another crate that re-exports SomeStruct:

use std::marker::PhantomData;

pub struct SomeStruct<'a, T: 'a> {
    _marker: PhantomData<&'a T>,
}

The bug seems to be related to #58894 (comment), and the proposed fix in that comment seems like a better fix than the one in this PR.

@GuillaumeGomez
Copy link
Member Author

@highfive: run-doc-ui 140bb5d

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Mar 19, 2019 •
edited
Loading

@highfive: run-doc-ui 3510db4

@rust-lang rust-lang deleted a comment from rust-highfive Mar 20, 2019
@rust-lang rust-lang deleted a comment from rust-highfive Mar 20, 2019
@rust-highfive
Copy link
Collaborator

Rustdoc-UI tests ended successfully (and I know that through (not so dark) magic)!

Click to expand the log. 
=> Starting doc-ui tests...
basic... ok
<= doc-ui tests done: 1 succeeded, 0 failed

@rust-lang rust-lang deleted a comment from rust-highfive Mar 20, 2019
@Centril
Copy link
Contributor

Centril commented Mar 30, 2019

Ping from triage... @GuillaumeGomez @QuietMisdreavus

@QuietMisdreavus
Copy link
Member

The bug seems to be related to #58894 (comment), and the proposed fix in that comment seems like a better fix than the one in this PR.

This is still my opinion on this PR. It also does not include the test proposed in that comment.

@GuillaumeGomez
Copy link
Member Author

I didn't update this PR since then. However I intend to add the test into the other PR.

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Apr 3, 2019
@GuillaumeGomez
Add test from rust-lang#59033
c966c45
@GuillaumeGomez GuillaumeGomez mentioned this pull request Apr 3, 2019
Merged
@Dylan-DPC-zz
Copy link

ping from triage @QuietMisdreavus any updates?

@QuietMisdreavus
Copy link
Member

Did #58894 fix the issue this PR tried to fix? This PR may not be necessary any more since that other one was generalized.

@GuillaumeGomez
Copy link
Member Author

@highfive: run-doc-ui 3510db4

@Dylan-DPC-zz
Copy link

ping from triage @GuillaumeGomez @QuietMisdreavus any updates on this?

@Dylan-DPC-zz
Copy link

@bors: r+

@bors
Copy link
Contributor

bors commented Jun 3, 2019

📌 Commit 140bb5d has been approved by Dylan-DPC

@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 Jun 3, 2019
@bors
Copy link
Contributor

bors commented Jun 3, 2019

⌛ Testing commit 140bb5d with merge 61d286e...

bors added a commit that referenced this pull request Jun 3, 2019
@bors
Auto merge of #59033 - GuillaumeGomez:duplicated-bounds, r=Dylan-DPC
61d286e 
Fix duplicated bounds printing in rustdoc

Fixes #56331.

Once again, I couldn't find out how to reproduce it with a small code so no test... :-/

r? @QuietMisdreavus
@bors
Copy link
Contributor

bors commented Jun 3, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Dylan-DPC
Pushing 61d286e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 3, 2019
@bors bors merged commit 140bb5d into rust-lang:master Jun 3, 2019
@GuillaumeGomez GuillaumeGomez deleted the duplicated-bounds branch June 3, 2019 20:45
@alexcrichton alexcrichton mentioned this pull request Jun 3, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dylan-DPC-zz Dylan-DPC-zz Dylan-DPC-zz approved these changes

Assignees

@QuietMisdreavus QuietMisdreavus

Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rustdoc: duplicated lifetimes
6 participants
@GuillaumeGomez @bors @QuietMisdreavus @rust-highfive @Centril @Dylan-DPC-zz